From de748f8c17db5d8ec99107707e123b42ecb20ae2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 12:26:59 +0200
Subject: [PATCH 02/63] Fixing commit  fbc722cecf removing wrong
 Security::remove_XSS

---
 main/forum/reply.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/forum/reply.php b/main/forum/reply.php
index 2764b35f0b..2a0e98dee8 100755
--- a/main/forum/reply.php
+++ b/main/forum/reply.php
@@ -165,7 +165,8 @@ echo '</table>';
 $my_action   = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : '';
 $my_post     = isset($_GET['post']) ?   Security::remove_XSS($_GET['post']) : '';
 $my_elements = isset($_SESSION['formelements']) ? $_SESSION['formelements'] : '';
-$values      = show_add_post_form(Security::remove_XSS($my_action,$my_post, $my_elements)); // note: this has to be cleaned first
+
+$values      = show_add_post_form($my_action,$my_post, $my_elements); // note: this has to be cleaned first
 
 if (!empty($values) AND isset($_POST['SubmitPost'])) {
 	store_reply($values);

From fe6fd104fee758b284ada42cf103f1068e08485d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 13:06:15 +0200
Subject: [PATCH 03/63] Cleaning code

---
 main/forum/index.php | 140 +++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 93 deletions(-)

diff --git a/main/forum/index.php b/main/forum/index.php
index 42cfd7b246..4667b24633 100755
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -1,28 +1,5 @@
-<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
-
-/*
-==============================================================================
-	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 */
 
 /**
 *	These files are a complete rework of the forum. The database structure is
@@ -42,14 +19,14 @@
 *	@Copyright Ghent University
 *	@Copyright Patrick Cool
 *
-* 	@package dokeos.forum
+* 	@package chamilo.forum
 */
 
 // name of the language file that needs to be included
 $language_file = 'forum';
 
 // including the global dokeos file
-require '../inc/global.inc.php';
+require_once '../inc/global.inc.php';
 $htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 	$(document).ready(function(){ $(\'.hide-me\').slideUp() });
@@ -74,29 +51,22 @@ $this_section=SECTION_COURSES;
 api_protect_course_script(true);
 
 // including additional library scripts
-require_once(api_get_path(LIBRARY_PATH).'/text.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
+require_once api_get_path(LIBRARY_PATH).'/text.lib.php';
+require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 $nameTools=get_lang('Forums');
 
 /*
------------------------------------------------------------
 	Including necessary files
------------------------------------------------------------
 */
-require 'forumconfig.inc.php';
+require_once 'forumconfig.inc.php';
 require_once 'forumfunction.inc.php';
 
-
 /*
-==============================================================================
 		MAIN DISPLAY SECTION
-==============================================================================
 */
 /*
------------------------------------------------------------
 	Header
------------------------------------------------------------
 */
 
 if (!empty($_GET['gradebook']) && $_GET['gradebook']=='view' ) {
@@ -138,9 +108,7 @@ $form_count=0;
 
 
 /*
-------------------------------------------------------------------------------------------------------
 	ACTIONS
-------------------------------------------------------------------------------------------------------
 */
 $get_actions=isset($_GET['action']) ? $_GET['action'] : '';
 if (api_is_allowed_to_edit(false,true)) {
@@ -160,17 +128,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 	$whatsnew_post_info = array();
 	$whatsnew_post_info = $_SESSION['whatsnew_post_info'];
 
-	/*
-	-----------------------------------------------------------
+	/*	
 	  			TRACKING
-	-----------------------------------------------------------
 	*/
 	event_access_tool(TOOL_FORUM);
 
 	/*
-	------------------------------------------------------------------------------------------------------
-		RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
-	------------------------------------------------------------------------------------------------------
+			RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
 	note: we do this here just after het handling of the actions to be sure that we already incorporate the
 	latest changes
 	*/
@@ -183,9 +147,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 	$forum_list=get_forums();
 
 	/*
-	------------------------------------------------------------------------------------------------------
-		RETRIEVING ALL GROUPS AND THOSE OF THE USER
-	------------------------------------------------------------------------------------------------------
+			RETRIEVING ALL GROUPS AND THOSE OF THE USER
+
 	*/
 	// the groups of the user
 	$groups_of_user=array();
@@ -200,20 +163,15 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 		}
 	}
 
-	/*
-	------------------------------------------------------------------------------------------------------
-		CLEAN GROUP ID FOR AJAXFILEMANAGER
-	------------------------------------------------------------------------------------------------------
+	/*	
+		CLEAN GROUP ID FOR AJAXFILEMANAGER	
 	*/
-	if(isset($_SESSION['_gid']))
-	{
+	if(isset($_SESSION['_gid'])) {
 		unset($_SESSION['_gid']);
     }
 
-	/*
-	------------------------------------------------------------------------------------------------------
-		ACTION LINKS
-	------------------------------------------------------------------------------------------------------
+	/*	
+		ACTION LINKS	
 	*/
 		$session_id=isset($_SESSION['id_session']) ? $_SESSION['id_session'] : false;
 		//if (api_is_allowed_to_edit() and !$_GET['action'])
@@ -228,12 +186,10 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 		}
 		echo '</div>';
 
-	/*
-	------------------------------------------------------------------------------------------------------
-		Display Forum Categories and the Forums in it
-	------------------------------------------------------------------------------------------------------
+	/*	
+		Display Forum Categories and the Forums in it	
 	*/ 
-	echo '<table class="data_table">'."\n";
+	echo '<table class="data_table">';
 	// Step 3: we display the forum_categories first
 	if(is_array($forum_categories_list)) {
 		foreach ($forum_categories_list as $forum_category_key => $forum_category) {
@@ -247,13 +203,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 				$session_displayed = '';
 			}
 
-			echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
+			echo "<tr><th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";			
 			echo '<a href="viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.prepare4display(Security::remove_XSS($forum_category['cat_id'])).'" '.class_visible_invisible(prepare4display($forum_category['visibility'])).'>'.prepare4display(Security::remove_XSS($forum_category['cat_title'])).$session_displayed.'</a>'. $session_img .'<br />';
 			
-			if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>'&nbsp;') {  
-				echo '<span class="forum_description">'.prepare4display(Security::remove_XSS($forum_category['cat_comment'],STUDENT)).'</span>';
+			if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>'&nbsp;') {				  
+				echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>';
 			}
-			echo "</th>\n";
+			echo '</th>';
 
 			echo '<th style="vertical-align: top;" align="center" >';
 			if (api_is_allowed_to_edit(false,true) && !($forum_category['session_id']==0 && intval($session_id)!=0)) {
@@ -264,19 +220,19 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 				display_up_down_icon('forumcategory',prepare4display($forum_category['cat_id']), $forum_categories_list);
 			}
 			echo '</th>';
-			echo "\t</tr>\n";
+			echo "</tr>";
 
 			// step 4: the interim headers (for the forum)
-			echo "\t<tr class=\"forum_header\">\n";
-			echo "\t\t<td colspan=\"2\">".get_lang('Forum')."</td>\n";
-			echo "\t\t<td>".get_lang('Topics')."</td>\n";
-			echo "\t\t<td>".get_lang('Posts')."</td>\n";
-			echo "\t\t<td>".get_lang('LastPosts')."</td>\n";
-			echo "\t\t<td>".get_lang('Actions')."</td>\n";
-			echo "\t</tr>\n";
+			echo "<tr class=\"forum_header\">";
+			echo "<td colspan=\"2\">".get_lang('Forum')."</td>";
+			echo "<td>".get_lang('Topics')."</td>";
+			echo "<td>".get_lang('Posts')."</td>";
+			echo "<td>".get_lang('LastPosts')."</td>";
+			echo "<td>".get_lang('Actions')."</td>";
+			echo "</tr>";
 
 			// the forums in this category
-		$forums_in_category=get_forums_in_category($forum_category['cat_id']);
+			$forums_in_category=get_forums_in_category($forum_category['cat_id']);
 
 			// step 5: we display all the forums in this category.
 			$forum_count=0;
@@ -348,7 +304,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 						if ($show_forum) {
 						$form_count++;
 						$mywhatsnew_post_info=isset($whatsnew_post_info[$forum['forum_id']]) ? $whatsnew_post_info[$forum['forum_id']]: null;
-						echo "\t<tr class=\"forum\">\n";
+						echo "<tr class=\"forum\">";
 
 						// Showing the image
 						if(!empty($forum['forum_image'])) {
@@ -365,8 +321,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 								echo "<img src=\"$image_path\" $img_attributes>";
 							}
 						}
-						echo "</td>\n";
-						echo "\t\t<td width=\"20\">";
+						echo "</td>";
+						echo "<td width=\"20\">";
 
 						if ($forum['forum_of_group']!=='0') {
 							if (is_array($mywhatsnew_post_info) and !empty($mywhatsnew_post_info)) {
@@ -383,7 +339,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 								}
 
 						}
-						echo "</td>\n";
+						echo "</td>";
 					
 						//validacion when belongs to a session
 						$session_img = api_get_session_image($forum['session_id'], $_user['status']);
@@ -404,13 +360,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 						}
 						$forum['forum_of_group']==0?$groupid='':$groupid=$forum['forum_of_group'];
 						
-						echo "\t\t<td><a href=\"viewforum.php?".api_get_cidreq()."&gidReq=".Security::remove_XSS($groupid)."&forum=".prepare4display($forum['forum_id'])."\" ".class_visible_invisible(prepare4display($forum['visibility'])).">".prepare4display(Security::remove_XSS($forum['forum_title'])).$session_displayed.'</a>'.$forum_title_group_addition.'<br />'.prepare4display(Security::remove_XSS($forum['forum_comment'],STUDENT))."</td>\n";
+						echo "<td><a href=\"viewforum.php?".api_get_cidreq()."&gidReq=".Security::remove_XSS($groupid)."&forum=".prepare4display($forum['forum_id'])."\" ".class_visible_invisible(prepare4display($forum['visibility'])).">".prepare4display(Security::remove_XSS($forum['forum_title'])).$session_displayed.'</a>'.$forum_title_group_addition.'<br />'.prepare4display(Security::remove_XSS($forum['forum_comment'],STUDENT))."</td>";
 						//$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
 						// the number of topics and posts
 						$number_threads=isset($forum['number_of_threads']) ? $forum['number_of_threads'] : null;
 						$number_posts  =isset($forum['number_of_posts']) ? $forum['number_of_posts'] : null;
-						echo "\t\t<td>".$number_threads."</td>\n";
-						echo "\t\t<td>".$number_posts."</td>\n";
+						echo "<td>".$number_threads."</td>";
+						echo "<td>".$number_posts."</td>";
 						// the last post in the forum
 						if ($forum['last_poster_name']<>'') {
 							$name=$forum['last_poster_name'];
@@ -419,13 +375,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 							$name = api_get_person_name($forum['last_poster_firstname'], $forum['last_poster_lastname']);
 							$poster_id=$forum['last_poster_id'];
 						}
-						echo "\t\t<td nowrap=\"nowrap\">";
+						echo "<td nowrap=\"nowrap\">";
 
 						if (!empty($forum['last_post_id'])) {
 							echo api_convert_and_format_date($forum['last_post_date'], null, date_default_timezone_get())."<br /> ".get_lang('By').' '.display_user_link($poster_id, $name);
 						}
-						echo "</td>\n";
-						echo "\t\t<td nowrap=\"nowrap\" align=\"center\">";
+						echo "</td>";
+						echo "<td nowrap=\"nowrap\" align=\"center\">";
 						if (api_is_allowed_to_edit(false,true) && !($forum['session_id']==0 && intval($session_id)!=0)) {
 							echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&gradebook=$gradebook&action=edit&amp;content=forum&amp;id=".$forum['forum_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 							echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&gradebook=$gradebook&action=delete&amp;content=forum&amp;id=".$forum['forum_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeleteForum"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
@@ -444,22 +400,20 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 						if (!api_is_anonymous()  && api_is_allowed_to_session_edit(false,true) ) {		
 							echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&gradebook=$gradebook&action=notify&amp;content=forum&amp;id=".$forum['forum_id']."\">".icon('../img/'.$iconnotify,get_lang('NotifyMe'))."</a>";
 						}
-						echo "</td>\n";
-						echo "\t</tr>";
+						echo "</td>";
+						echo "</tr>";
 					} 
 				}
 			}
 
 			if (count($forum_list)==0) {
-				echo "\t<tr><td>".get_lang('NoForumInThisCategory')."</td>".(api_is_allowed_to_edit(false,true)?'<td colspan="6"></td>':'<td colspan="6"></td>')."</tr>\n";
+				echo "<tr><td>".get_lang('NoForumInThisCategory')."</td>".(api_is_allowed_to_edit(false,true)?'<td colspan="6"></td>':'<td colspan="6"></td>')."</tr>";
 			}
 		}
 	} 
-	echo "</table>\n";
+	echo "</table>";
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
 Display :: display_footer();

From 01545a2ea0c03ccfa3e9ea31893f1f11fc4be755 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 17:01:15 +0200
Subject: [PATCH 04/63] Feature CT#1171 implemented requires testing need
 automatic email after approval

---
 main/admin/user_list.php            | 52 ++++++++++++++++++++++++++---
 main/inc/ajax/user_manager.ajax.php | 32 ++++++++++++++++++
 2 files changed, 80 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 main/inc/ajax/user_manager.ajax.php

diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index eec8238dd5..67a5fffd94 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -32,6 +32,43 @@ function load_course_list (div_course,my_user_id) {
 		}
 	});
 }
+		
+function active_user(element_div) {
+	id_image=$(element_div).attr("id");
+	image_clicked=$(element_div).attr("src");
+	image_clicked_info = image_clicked.split("/");
+	image_real_clicked = image_clicked_info[image_clicked_info.length-1];	
+	var status = 1;							
+	if (image_real_clicked == "right.gif") {
+		status = 0;
+	}		
+	user_id=id_image.split("_");
+	ident="#img_"+user_id[1]; 
+	if (confirm("'.get_lang('AreYouSureToEditTheUserStatus', '').'")) {
+		 $.ajax({
+			contentType: "application/x-www-form-urlencoded",
+			beforeSend: function(objeto) {
+			$(ident).attr("src","'.api_get_path(WEB_IMG_PATH).'loading1.gif'.'"); }, //candy eye stuff
+			type: "GET",
+			url: "'.api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=active_user",
+			data: "user_id="+user_id[1]+"&status="+status,
+			success: function(datos) {
+				
+				if (status == 1) {					
+					$(ident).attr("src","'.api_get_path(WEB_IMG_PATH).'right.gif'.'");
+					$(ident).attr("title","'.get_lang('Lock').'");
+					
+				} else {
+					$(ident).attr("src","'.api_get_path(WEB_IMG_PATH).'wrong.gif'.'");
+					$(ident).attr("title","'.get_lang('Unlock').'");
+					
+				}
+			}
+		});
+	}
+}
+	
+	
 function clear_course_list (div_course) {
 	$("div#"+div_course).html("&nbsp;");
 	$("div#"+div_course).hide("");
@@ -505,8 +542,10 @@ function modify_filter($user_id,$url_params,$row)
 		}
 
 		if ($row[0]<>$_user['user_id'] && $user_is_anonymous == false) {
+			
 			// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
 			$result .= '<a href="user_list.php?action=delete_user&amp;user_id='.$user_id.'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+			
 		} else {
 			$result .= Display::return_icon('delete_na.gif', get_lang('Delete'));
 		}
@@ -550,20 +589,25 @@ function active_filter($active, $url_params, $row) {
 	global $_user;
 
 	if ($active=='1') {
-		$action='lock';
+		$action='Lock';		
 		$image='right';
 	} elseif ($active=='-1') {
     	$action='edit';
         $image='expired';
     } elseif ($active=='0') {
-		$action='unlock';
+		$action='Unlock';
 		$image='wrong';
+		
 	}
 
     if ($action=='edit') {
         $result = Display::return_icon($image.'.gif', get_lang('AccountExpired'));
-    }elseif ($row['0']<>$_user['user_id']) { // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = '<a href="user_list.php?action='.$action.'&amp;user_id='.$row['0'].'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon($image.'.gif', get_lang(ucfirst($action))).'</a>';
+    } elseif ($row['0']<>$_user['user_id']) { 
+    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+		//$result = '<a href="user_list.php?action='.$action.'&amp;user_id='.$row['0'].'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon($image.'.gif', get_lang(ucfirst($action))).'</a>';
+		//$result = '<a href="'.api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?action=active_user&amp;user_id='.$row['0'].'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'">';		
+		$result .=Display::return_icon($image.'.gif', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0'])).'</a>';
+		//$result .= '<div>';
 	}
 	return $result;
 }
diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php
old mode 100644
new mode 100755
index 9b836e7bfa..0a8cd2d590
--- a/main/inc/ajax/user_manager.ajax.php
+++ b/main/inc/ajax/user_manager.ajax.php
@@ -3,6 +3,7 @@
 /**
  * Responses to AJAX calls 
  */
+$language_file = array('admin', 'registration');
 require_once '../global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 $action = $_GET['a'];
@@ -36,6 +37,37 @@ switch ($action) {
 			<?php			
 		}
 	break;
+	case 'active_user':
+		if (api_is_platform_admin()) {			
+			$user_id = intval($_GET['user_id']);
+			$status = intval($_GET['status']);
+			if (!empty($user_id)) {
+				$user_table = Database :: get_main_table(TABLE_MAIN_USER);
+				$sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".Database::escape_string($user_id)."'";
+				$result = Database::query($sql);
+				//Send and email if account is active
+				if ($status == 1) {
+					$user_info = api_get_user_info($user_id);					
+					$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
+					$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
+					$email_admin = api_get_setting('emailAdministrator');
+					$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
+					$emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";					
+					
+					$emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
+					$emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
+					$emailbody.=get_lang('HaveFun')."\n\n";
+					//$emailbody.=get_lang('Problem'). "\n\n". get_lang('Formula');
+					$emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
+					$result = api_mail($recipient_name, $user_info['mail'], $emailsubject, $emailbody, $sender_name, $email_admin);					
+				}
+				
+			}						
+		} else {
+			echo '';
+		}
+	break;
+	
 		
 	default:
 		echo '';

From 7ab05c41efb45f382a4687265b2b9e5f6e65c84c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 17:52:30 +0200
Subject: [PATCH 05/63] Ical import fix, checking the duration if enddate value
 is not provided see CT#1238

---
 main/calendar/agenda.inc.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index cd865d04ad..16be4d1c65 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -4599,17 +4599,36 @@ function agenda_import_ical($course_info,$file) {
 
     $ve = $ical->getComponent(VEVENT);
 
+
     $ttitle	= $ve->getProperty('summary');    
     $title	= api_convert_encoding($ttitle,$charset,'UTF-8');
     
     $tdesc	= $ve->getProperty('description');
     $desc	= api_convert_encoding($tdesc,$charset,'UTF-8');
     
-    $ts 	= $ve->getProperty('dtstart');
-    $start_date = $ts['year'].'-'.$ts['month'].'-'.$ts['day'].' '.$ts['hour'].':'.$ts['min'].':'.$ts['sec'];
+    $start_date	= $ve->getProperty('dtstart');
+    $start_date_string = $start_date['year'].'-'.$start_date['month'].'-'.$start_date['day'].' '.$start_date['hour'].':'.$start_date['min'].':'.$start_date['sec'];
+    
+    
+    $ts 	 = $ve->getProperty('dtend');
+    if ($ts != false) {
+    	$end_date_string = $ts['year'].'-'.$ts['month'].'-'.$ts['day'].' '.$ts['hour'].':'.$ts['min'].':'.$ts['sec'];	
+    } else {
+    	//Check duration if dtend does not exist
+    	$duration 	  = $ve->getProperty('duration');
+    	if ($duration != false) {
+    		$duration = $ve->getProperty('duration');
+    		$duration_string = $duration['year'].'-'.$duration['month'].'-'.$duration['day'].' '.$duration['hour'].':'.$duration['min'].':'.$duration['sec'];    		
+    		$start_date_tms = mktime(intval($start_date['hour']), intval($start_date['min']), intval($start_date['sec']), intval($start_date['month']), intval($start_date['day']), intval($start_date['year']));
+    		//$start_date_tms = mktime(($start_date['hour']), ($start_date['min']), ($start_date['sec']), ($start_date['month']), ($start_date['day']), ($start_date['year']));
+    		//echo date('d-m-Y - h:i:s', $start_date_tms);
+    		
+    		$end_date_string = mktime(intval($start_date['hour']) +$duration['hour'], intval($start_date['min']) + $duration['min'], intval($start_date['sec']) + $duration['sec'], intval($start_date['month']) + $duration['month'], intval($start_date['day'])+$duration['day'], intval($start_date['year']) + $duration['year']);
+    		$end_date_string = date('Y-m-d H:i:s', $end_date_string);
+    		//echo date('d-m-Y - h:i:s', $end_date_string);    		
+    	}    		
+    }
     
-    $ts 	  = $ve->getProperty('dtend');
-    $end_date = $ts['year'].'-'.$ts['month'].'-'.$ts['day'].' '.$ts['hour'].':'.$ts['min'].':'.$ts['sec'];
     
     //echo $start_date.' - '.$end_date;
     $organizer	= $ve->getProperty('organizer');
@@ -4617,7 +4636,7 @@ function agenda_import_ical($course_info,$file) {
     $course_name = $ve->getProperty('location');
     //insert the event in our database
     //var_dump($title,$desc,$start_date,$end_date);
-    $id = agenda_add_item($course_info,$title,$desc,$start_date,$end_date,$_POST['selectedform']);
+    $id = agenda_add_item($course_info,$title,$desc,$start_date_string,$end_date_string,$_POST['selectedform']);
 
     $repeat = $ve->getProperty('rrule');
     if(is_array($repeat) && !empty($repeat['FREQ'])) {

From 90b67e517de857e2a8329d9734d5bbcc69ba5ffe Mon Sep 17 00:00:00 2001
From: Guillaume Viguier <guillaume.viguier@beeznest.com>
Date: Mon, 17 May 2010 10:56:50 -0500
Subject: [PATCH 06/63] Changing default Learning path authoring tool from
 Dokeos to Chamilo - CT#1156

---
 main/newscorm/learnpath.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 1d99f0b6a8..4c31ce4acb 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -633,7 +633,7 @@ class learnpath {
 				"default_encoding,display_order,content_maker," .
 				"content_local,js_lib,session_id) " .
 				"VALUES ($type,'$name','$description','','embedded'," .
-				"'UTF-8','$dsp','Dokeos'," .
+				"'UTF-8','$dsp','Chamilo'," .
 				"'local','','".Database::escape_string($session_id)."')";
 				//if($this->debug>2){error_log('New LP - Inserting new lp '.$sql_insert,0);}
 				$res_insert = Database::query($sql_insert);

From 71ab29fcde86782a5092e4974846a13693bd9ba5 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 18:57:00 +0200
Subject: [PATCH 07/63] Improving gradebook export

---
 main/gradebook/gradebook_flatview.php         |  2 +
 main/gradebook/lib/fe/flatviewtable.class.php |  1 +
 .../lib/flatview_data_generator.class.php     | 44 ++++++++++++-------
 .../gradebook/lib/gradebook_functions.inc.php |  5 ++-
 main/gradebook/lib/scoredisplay.class.php     | 25 ++++++++---
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php
index ff6eb46d43..2ea1e7e23a 100755
--- a/main/gradebook/gradebook_flatview.php
+++ b/main/gradebook/gradebook_flatview.php
@@ -262,6 +262,8 @@ if (!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report
 
 		require_once 'gradebook_result.class.php';
 		$printable_data = get_printable_data($users, $alleval, $alllinks);
+		
+		//exit;
 
 		switch($_POST['export_format']) {
 			case 'xls':
diff --git a/main/gradebook/lib/fe/flatviewtable.class.php b/main/gradebook/lib/fe/flatviewtable.class.php
index c2bfb24a26..1793d67242 100755
--- a/main/gradebook/lib/fe/flatviewtable.class.php
+++ b/main/gradebook/lib/fe/flatviewtable.class.php
@@ -24,6 +24,7 @@ class FlatViewTable extends SortableTable
 	function FlatViewTable ($selectcat, $users= array (), $evals= array (), $links= array (), $limit_enabled = false, $offset = 0, $addparams = null) {
 		parent :: __construct ('flatviewlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 1 : 0);
 		$this->datagen = new FlatViewDataGenerator($users, $evals, $links);
+		
 		$this->selectcat = $selectcat;
 		$this->limit_enabled = $limit_enabled;
 		$this->offset = $offset;
diff --git a/main/gradebook/lib/flatview_data_generator.class.php b/main/gradebook/lib/flatview_data_generator.class.php
index 5188606cab..5314c4eba3 100755
--- a/main/gradebook/lib/flatview_data_generator.class.php
+++ b/main/gradebook/lib/flatview_data_generator.class.php
@@ -48,20 +48,25 @@ class FlatViewDataGenerator
 	/**
 	 * Get array containing column header names (incl user columns)
 	 */
-	public function get_header_names ($items_start = 0, $items_count = null) {
+	public function get_header_names ($items_start = 0, $items_count = null , $show_detail = false) {
 		$headers = array();
 		$headers[] = get_lang('LastName');
 		$headers[] = get_lang('FirstName');
 		if (!isset($items_count)) {
 			$items_count = count($this->evals_links) - $items_start;
 		}
-		for ($count=0;
-			 ($count < $items_count ) && ($items_start + $count < count($this->evals_links));
-			 $count++) {
+		for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
 			$item = $this->evals_links [$count + $items_start];
 			$headers[] = $item->get_name();
+			if ($show_detail == true) {
+				$headers[] = $item->get_name().' ('.get_lang('Detail').')';
+			}
 		}
+		
 		$headers[] = get_lang('GradebookQualificationTotal');
+		if ($show_detail == true) {
+			$headers[] = get_lang('GradebookQualificationTotal').' ('.get_lang('Detail').')';
+		}
 		return $headers;
 	}
 	
@@ -91,10 +96,9 @@ class FlatViewDataGenerator
 	 * 2: user firstname
 	 * 3+: evaluation/link scores
 	 */
-	public function get_data ($users_sorting = 0,
-							  $users_start = 0, $users_count = null,
+	public function get_data ($users_sorting = 0, $users_start = 0, $users_count = null,
 							  $items_start = 0, $items_count = null,
-							  $ignore_score_color = false) {
+							  $ignore_score_color = false, $show_all = false) {
 		// do some checks on users/items counts, redefine if invalid values
 		if (!isset($users_count)) {
 			$users_count = count ($this->users) - $users_start;
@@ -120,9 +124,11 @@ class FlatViewDataGenerator
 		} elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) {
 			usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name'));
 		}
+		
 		if ($users_sorting & self :: FVDG_SORT_DESC) {
 			$usertable = array_reverse($usertable);
 		}
+		
 		// select the requested users
 		$selected_users = array_slice($usertable, $users_start, $users_count);
 		// generate actual data array
@@ -144,22 +150,30 @@ class FlatViewDataGenerator
 			$item_value=0;
 			$item_total=0;
 
-			for ($count=0;
-				 ($count < $items_count ) && ($items_start + $count < count($this->evals_links));
-				 $count++) {
+			for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
 				$item = $this->evals_links [$count + $items_start];
 				$score = $item->calc_score($user[0]);
 				$divide=( ($score[1])==0 ) ? 1 : $score[1];
 				$item_value+=round($score[0]/$divide*$item->get_weight(),2);
 				$item_total+=$item->get_weight();
-				$row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT);
+				if ($show_all == false) {
+					$row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT);
+				} else {
+					$row[] = $scoredisplay->display_score($score, SCORE_DECIMAL);
+					$row[] = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);					
+				}
 			}
+			
 			$total_score=array($item_value,$item_total);
-			$row[] = $scoredisplay->display_score($total_score,SCORE_DIV_PERCENT);
-
+			if ($show_all == false) {
+				$row[] = $scoredisplay->display_score($total_score,SCORE_DIV_PERCENT);
+			} else {				
+				$row[] = $scoredisplay->display_score($total_score,SCORE_DECIMAL);
+				$row[] = $scoredisplay->display_score($total_score,SCORE_DIV_PERCENT);			
+			}
 			unset($score);
-			$data[] = $row;
-		}
+			$data[] = $row;			
+		}		
 		return $data;
 	}
 
diff --git a/main/gradebook/lib/gradebook_functions.inc.php b/main/gradebook/lib/gradebook_functions.inc.php
index c9d31a0416..15cecc950a 100755
--- a/main/gradebook/lib/gradebook_functions.inc.php
+++ b/main/gradebook/lib/gradebook_functions.inc.php
@@ -302,8 +302,9 @@ function get_printable_data($users,$alleval, $alllinks) {
 	$datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
 	$offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
 	$count = (($offset + 10) > $datagen->get_total_items_count()) ? ($datagen->get_total_items_count() - $offset) : 10;
-	$header_names = $datagen->get_header_names($offset, $count);
-	$data_array = $datagen->get_data(FlatViewDataGenerator :: FVDG_SORT_LASTNAME, 0, null, $offset, $count, true);
+	$header_names = $datagen->get_header_names($offset, $count, true);
+	$data_array = $datagen->get_data(FlatViewDataGenerator :: FVDG_SORT_LASTNAME, 0, null, $offset, $count, true,true);
+	
 	$newarray = array();
 	foreach ($data_array as $data) {
 		$newarray[] = array_slice($data, 1);
diff --git a/main/gradebook/lib/scoredisplay.class.php b/main/gradebook/lib/scoredisplay.class.php
index 6934a481c1..d4dca8a46d 100755
--- a/main/gradebook/lib/scoredisplay.class.php
+++ b/main/gradebook/lib/scoredisplay.class.php
@@ -5,6 +5,8 @@ define('SCORE_DIV',1);
 define('SCORE_PERCENT',2);
 define('SCORE_DIV_PERCENT',3);
 define('SCORE_AVERAGE',4);
+
+define('SCORE_DECIMAL',5);
 define('SCORE_IGNORE_SPLIT', 8);
 define('SCORE_BOTH',1);
 define('SCORE_ONLY_DEFAULT',2);
@@ -233,11 +235,14 @@ class ScoreDisplay
 	 * @param int $what one of the following constants: SCORE_BOTH, SCORE_ONLY_DEFAULT, SCORE_ONLY_CUSTOM (default: SCORE_BOTH)
 	 * (only taken into account if custom score display is enabled and for course/platform admin)
 	 */
-	public function display_score($score,$type,$what = SCORE_BOTH) {
-		$type2 = $type & 7;	// removes the 'SCORE_IGNORE_SPLIT' bit
+	public function display_score($score,$type, $what = SCORE_BOTH) {
+		
+		$type2 = $type & 7;	// removes the 'SCORE_IGNORE_SPLIT' bit		
 		$split_enabled = ($type2 == $type);
+		
 		$my_score=($score==0) ? 1 : $score;
-		if ($this->custom_enabled && isset($this->custom_display_conv)) {
+		
+		if ($this->custom_enabled && isset($this->custom_display_conv)) {			
 				// students only see the custom display
 				if (!api_is_allowed_to_create_course()) {
 					$display = $this->display_custom($my_score);
@@ -254,8 +259,8 @@ class ScoreDisplay
 						$display.= ' ('.$this->display_custom ($my_score).')';
 			}
 
-		} else {
-		// if no custom display set, use default display
+		} else {			
+			// if no custom display set, use default display			
 			$display = $this->display_default ($my_score, $type2);
 		}
 		return (($split_enabled ? $this->get_color_display_start_tag($my_score) : '')
@@ -278,9 +283,17 @@ class ScoreDisplay
 
 			case SCORE_AVERAGE :		// XX %
 				return $this->display_as_percent($score);
+			
+			case SCORE_DECIMAL :       // 0.50  (X/Y) 	
+				return $this->display_as_decimal($score);
+			
 		}
 	}
-
+	
+	private function display_as_decimal($score) {
+		$score_denom=($score[1]==0) ? 1 : $score[1];
+		return round(($score[0]/ $score_denom),2);
+	}
 	private function display_as_percent ($score) {
 		$score_denom=($score[1]==0) ? 1 : $score[1];
 		return round(($score[0] / $score_denom) * 100,2) . ' %';

From 0da3407ec4c2c219c0fbf0b0fe3254e12e02054a Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 18:57:46 +0200
Subject: [PATCH 08/63] minor - cleaning

---
 main/admin/user_edit.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 4780410a70..12103bf062 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -1,9 +1,7 @@
-<?php // $Id: user_edit.php 22233 2009-07-20 09:54:05Z ivantcholakov $
-/* For licensing terms, see /dokeos_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
 
 // Language files that should be included
@@ -11,7 +9,7 @@ $language_file = array('admin', 'registration');
 
 $cidReset = true;
 
-include '../inc/global.inc.php';
+require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 

From 0385710c8005e0ba2b0a37f317170e1747ad06cd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 20:27:33 +0200
Subject: [PATCH 09/63] Deleting document dir or document file when deleting a
 group document. Delete group actions has been fixed to delete or renamed the
 folder, now it depends in the same setting as the Document Tool.  see CT#579

---
 main/inc/lib/fileUpload.lib.php   |  7 +++--
 main/inc/lib/groupmanager.lib.php | 50 +++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 116f5a07c3..bf9438eb99 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -1017,13 +1017,13 @@ function search_img_from_html($html_file) {
  */
 function create_unexisting_directory($_course, $user_id, $to_group_id, $to_user_id, $base_work_dir, $desired_dir_name, $title = null, $visibility = '') {
 	$nb = '';
-	while (file_exists($base_work_dir.$desired_dir_name.$nb)) {
+	while (file_exists($base_work_dir.$desired_dir_name.$nb)) {		
 		$nb += 1;
 	}
 	if($title == null) {
 		$title = basename($desired_dir_name);
 	}
-
+	
 	if (mkdir($base_work_dir.$desired_dir_name.$nb, api_get_permissions_for_new_directories(), true)) {
 		// Check if pathname already exists inside document table
 		$tbl_document = Database::get_course_table(TABLE_DOCUMENT, $_course['dbName']);
@@ -1043,7 +1043,8 @@ function create_unexisting_directory($_course, $user_id, $to_group_id, $to_user_
 				return $desired_dir_name.$nb;
 			}
 		} else {
-			return false;
+			//This means the folder NOT exist in the filesystem (now this was created) but there is a record in the Database			 
+			return $desired_dir_name.$nb;
 		}
 	} else {
 		return false;
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 6699dd46c9..3d2c69c678 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -15,6 +15,8 @@ require_once 'course.lib.php';
 require_once 'tablesort.lib.php';
 require_once 'fileManage.lib.php';
 require_once 'fileUpload.lib.php';
+require_once 'document.lib.php';
+
 /**
  * infinite
  */
@@ -215,9 +217,12 @@ class GroupManager {
 		FileManager :: mkdirs(api_get_path(SYS_COURSE_PATH).$currentCourseRepository."/group/".$secret_directory, api_get_permissions_for_new_directories());
 		*/
 		$desired_dir_name= '/'.replace_dangerous_char($name,'strict').'_groupdocs';
-		$dir_name = create_unexisting_directory($_course,$_user['user_id'],$lastId,NULL,api_get_path(SYS_COURSE_PATH).$currentCourseRepository.'/document',$desired_dir_name);
+		
+		$my_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository.'/document';
+		$unique_name = create_unexisting_directory($_course,$_user['user_id'],$lastId,NULL,$my_path, $desired_dir_name);
 		/* Stores the directory path into the group table */
-		$sql = "UPDATE ".$table_group." SET   name = '".Database::escape_string($name)."', secret_directory = '".$dir_name."' WHERE id ='".$lastId."'";
+		$sql = "UPDATE ".$table_group." SET   name = '".Database::escape_string($name)."', secret_directory = '".$unique_name."' WHERE id ='".$lastId."'";
+		
 		Database::query($sql);
 
 		// create a forum if needed
@@ -356,14 +361,11 @@ class GroupManager {
 	 */
 	public static function delete_groups ($group_ids, $course_code = null) {
 		$course_db = '';
-		if ($course_code != null)
-		{
+		if ($course_code != null) {
 			$course = Database :: get_course_info($course_code);
 			$course['path'] = $course['directory'];
 			$course_db = $course['database'];
-		}
-		else
-		{
+		} else {
 			$course = api_get_course_info();
 		}
 
@@ -393,25 +395,43 @@ class GroupManager {
 
 
 		// define repository for deleted element
-		$group_garbage = api_get_path(SYS_ARCHIVE_PATH).$course['path']."/group/";
+		
+		/* Useless code
+		$group_garbage = api_get_path(SYS_ARCHIVE_PATH).$course['path']."/group";		
+		var_dump($group_garbage);
 		if (!file_exists($group_garbage))
 			FileManager :: mkdirs($group_garbage, api_get_permissions_for_new_directories());
+		*/
 		// Unsubscribe all users
 		self :: unsubscribe_all_users($group_ids);
 		$sql = 'SELECT id, secret_directory, session_id FROM '.$group_table.' WHERE id IN ('.implode(' , ', $group_ids).')';
 		$db_result = Database::query($sql);
 		$forum_ids = array ();
-		while ($group = Database::fetch_object($db_result))
-		{
+		
+		while ($group = Database::fetch_object($db_result)) {
 			// move group-documents to garbage
-			$source_directory = api_get_path(SYS_COURSE_PATH).$course['path']."/group/".$group->secret_directory;
-			$destination_directory = $group_garbage.$group->secret_directory;
-			if (file_exists($source_directory))
-			{
-				rename($source_directory, $destination_directory);
+			//$source_directory = api_get_path(SYS_COURSE_PATH).$course['path']."/group/".$group->secret_directory;
+			$source_directory = api_get_path(SYS_COURSE_PATH).$course['path']."/document".$group->secret_directory;
+			//File to renamed
+			$destination_dir = api_get_path(SYS_COURSE_PATH).$course['path']."/document".$group->secret_directory.'_DELETED_'.$group->id;
+
+			if (!empty($group->secret_directory)) {
+				//Deleting from document tool 
+				DocumentManager::delete_document($course, $group->secret_directory, $source_directory);
+				
+				if (file_exists($source_directory)) {				
+					if (api_get_setting('permanently_remove_deleted_files') == 'true') {
+						//Delete
+						 my_delete($source_directory);
+					} else {
+						//Rename				
+						rename($source_directory, $destination_dir);
+					}
+				}		
 			}
 			//$forum_ids[] = $group->forum_id;
 		}
+		
 		// delete the groups
 		$sql = "DELETE FROM ".$group_table." WHERE id IN ('".implode("' , '", $group_ids)."')";
 		Database::query($sql);

From 2eab1d1d09418b42dcfea84894ff7733878b534d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 20:31:08 +0200
Subject: [PATCH 10/63] Making Mkdirs deprecated

---
 main/inc/lib/fileManage.lib.php             | 47 ++++++++++++---------
 main/inc/lib/groupmanager.lib.php           |  8 +---
 tests/main/inc/lib/fileManage.lib.test.php  |  1 +
 tests/main/inc/lib/fileManager.lib.test.php |  1 +
 4 files changed, 29 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 tests/main/inc/lib/fileManager.lib.test.php

diff --git a/main/inc/lib/fileManage.lib.php b/main/inc/lib/fileManage.lib.php
index b7e7b55d0b..2c6a87d13d 100755
--- a/main/inc/lib/fileManage.lib.php
+++ b/main/inc/lib/fileManage.lib.php
@@ -579,33 +579,38 @@ class FileManager
 		Database::query($query);
 	}
 
-	/**
-	 * Like in Java, creates the directory named by this abstract pathname,
-	 * including any necessary but nonexistent parent directories.
-	 *
-	 * @author Hugues Peeters <peeters@ipm.ucl.ac.be>
-	 * @author Christophe Gesche <gesche@ipm.ucl.ac.be>
-	 *
-	 * @param  string $path - path to create
-	 * @param  string $mode - directory permission (default is '770')
-	 *
-	 * @return boolean TRUE if succeeds FALSE otherwise
-	 */
-	function mkdirs($path, $mode = '0770') {
-		if (file_exists($path)) {
-			return false;
-		} else {
-			FileManager :: mkdirs(dirname($path), $mode);
-		 	//mkdir($path, $mode);
-			return true;
-		}
-	}
+
 
 } //end class FileManager
 
 
+
+
+
 /*	DEPRECATED FUNCTIONS */
 
+/**
+ * Like in Java, creates the directory named by this abstract pathname,
+ * including any necessary but nonexistent parent directories.
+ *
+ * @author Hugues Peeters <peeters@ipm.ucl.ac.be>
+ * @author Christophe Gesche <gesche@ipm.ucl.ac.be>
+ *
+ * @param  string $path - path to create
+ * @param  string $mode - directory permission (default is '770')
+ *
+ * @return boolean TRUE if succeeds FALSE otherwise
+ */
+function mkdirs($path, $mode = '0770') {
+	if (file_exists($path)) {
+		return false;
+	} else {
+		FileManager :: mkdirs(dirname($path), $mode);
+	 	//mkdir($path, $mode);
+		return true;
+	}
+}
+
 /**
  * @deprecated 06-FEB-2010. The function mkdir() is able to create directories recursively.
  * @link http://php.net/manual/en/function.mkdir.php
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 3d2c69c678..bddc3288bc 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -209,13 +209,7 @@ class GroupManager {
 				calendar_state = '".$category['calendar_state']."', work_state = '".$category['work_state']."', announcements_state = '".$category['announcements_state']."', forum_state = '".$category['forum_state']."', wiki_state = '".$category['wiki_state']."', chat_state = '".$category['chat_state']."', self_registration_allowed = '".$category['self_reg_allowed']."',  self_unregistration_allowed = '".$category['self_unreg_allowed']."', session_id='".Database::escape_string($my_id_session)."'";
 		Database::query($sql);
 		$lastId = Database::insert_id();
-		/*$secret_directory = uniqid("")."_team_".$lastId;
-		while (is_dir(api_get_path(SYS_COURSE_PATH).$currentCourseRepository."/group/$secret_directory"))
-		{
-			$secret_directory = uniqid("")."_team_".$lastId;
-		}
-		FileManager :: mkdirs(api_get_path(SYS_COURSE_PATH).$currentCourseRepository."/group/".$secret_directory, api_get_permissions_for_new_directories());
-		*/
+
 		$desired_dir_name= '/'.replace_dangerous_char($name,'strict').'_groupdocs';
 		
 		$my_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository.'/document';
diff --git a/tests/main/inc/lib/fileManage.lib.test.php b/tests/main/inc/lib/fileManage.lib.test.php
index 037e626e79..3aab42180d 100755
--- a/tests/main/inc/lib/fileManage.lib.test.php
+++ b/tests/main/inc/lib/fileManage.lib.test.php
@@ -196,6 +196,7 @@ class TestFileManager extends UnitTestCase {
 	}
 
 	public function testMkdirs(){
+		//This function is deprecated
 		$path=api_get_path(SYS_COURSE_PATH).'document';
 		$res = $this->fmanager->mkdirs($path);
 		$this->assertFalse($res);
diff --git a/tests/main/inc/lib/fileManager.lib.test.php b/tests/main/inc/lib/fileManager.lib.test.php
old mode 100644
new mode 100755
index ae61782203..3d19b6753a
--- a/tests/main/inc/lib/fileManager.lib.test.php
+++ b/tests/main/inc/lib/fileManager.lib.test.php
@@ -191,6 +191,7 @@ class TestFileManager extends UnitTestCase {
 	}
 
 	public function testMkdirs(){
+		//This function is deprecated
 		$path='/var/www/path/ruta';
 		$res = $this->fmanager->mkdirs($path);
 		$this->assertFalse($res);

From cea6dccf9f21bab4cdc0e23a82b0d313dae0998e Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 20:47:29 +0200
Subject: [PATCH 11/63] Fixing header when chat is not a popup see CT#746

---
 main/chat/chat.php             | 14 +++++++++++---
 main/chat/chat_whoisonline.php |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 main/chat/chat_whoisonline.php

diff --git a/main/chat/chat.php b/main/chat/chat.php
index b1e10fe7bd..bb1bb871c0 100755
--- a/main/chat/chat.php
+++ b/main/chat/chat.php
@@ -56,8 +56,15 @@ if (!empty($mycourseid) && $mycourseid != -1) {
 }
 if (api_get_setting('show_navigation_menu') != 'false') {
 	$footer_size = 20;
-} else {
-	switch($my_style) {
+} else {	
+	$top_size = 135;
+	switch($my_style) {	
+		case 'chamilo_red' :
+		case 'chamilo_green' :	
+		case 'chamilo' :
+			$top_size = 185;
+			$footer_size = 48;
+		break;
 		case 'dokeos_classic' :
 		case 'chamilo_classic' :
 			$footer_size = 48;
@@ -79,6 +86,7 @@ if (api_get_setting('show_navigation_menu') != 'false') {
 			break;
 	}
 }
+
 $cidreq = Security::remove_XSS($_GET['cidReq']);
 
 ?>
@@ -92,7 +100,7 @@ $cidreq = Security::remove_XSS($_GET['cidReq']);
 echo'<title>'.get_lang('Chat').' - '.$mycourseid.' - '.api_get_setting('siteName').'</title>';
 
 if (empty($open_chat_window)) {
-	echo'<frameset rows="135,*,'.$footer_size.'" border="0" frameborder="0" framespacing="1">';
+	echo'<frameset rows="'.$top_size.',*,'.$footer_size.'" border="0" frameborder="0" framespacing="1">';
 	echo '<frame src="chat_banner.php?cidReq='.$cidreq.'" name="chat_banner" scrolling="no">';
 }
 
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
old mode 100644
new mode 100755
index f676fe8421..7564058d3a
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -90,6 +90,7 @@ if (!empty($course)) {
 
 	$user_id = $enreg['user_id'];
 	require 'header_frame.inc.php';
+	
 	?>
 	<table border="0" cellpadding="0" cellspacing="0" width="100%" class="data_table">
 	<tr><th colspan="2"><?php echo get_lang('Connected'); ?></th></tr>

From 6f99c72bed432313f83d3d3fe3010cec554bdd98 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 21:20:35 +0200
Subject: [PATCH 12/63] Minor  - Adding YouShouldCreateAGroup get_lang message

---
 main/social/groups.php | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/main/social/groups.php b/main/social/groups.php
index b5625ff9e5..b0f67d3171 100755
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -142,7 +142,7 @@ if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 	}
 } else {
 	$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-	$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MessageList'));
+	$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
 }
 
 Display :: display_header($tool_name, 'Groups');
@@ -431,31 +431,54 @@ if ($group_id != 0 ) {
 			}
 		}
 
+
+		
 		// display groups (newest, mygroups, pop)
 		echo '<div class="social-box-main1">';
 		   	if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 		   		$view_group = $_GET['view'];
+		   		
 		   		switch ($view_group) {
 		   			case 'mygroups' :
 		        		if (count($grid_my_groups) > 0) {
 		        			echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
-		        			Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+		        			Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));		        			
 		        		}
+		        		
+		       			if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+							if (empty($grid_my_groups)) {
+								echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+							}
+						}
+				
 		        		break;
 		        	case 'newest' :
 		        		if (count($grid_newest_groups) > 0) {
 							echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Newest')).'</div>';
 							Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 						}
+						
+						if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+							if (empty($grid_newest_groups)) {
+								echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+							}
+						}
 		        		break;
 		        	default :
 		        		if (count($grid_pop_groups) > 0) {
 							echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
 							Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 						}
+						
+						if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+							if (empty($grid_pop_groups)) {
+								echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+							}
+						}
+						
 		        		break;
 		   		}
-		   	} else {
+		   	} else {		   		
 		        if (count($grid_my_groups) > 0) {
 		        	echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
 		        	Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
@@ -468,6 +491,13 @@ if ($group_id != 0 ) {
 					echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
 					Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 				}
+				
+				if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+						if (empty($grid_my_groups)  && empty($grid_newest_groups)  && empty($grid_pop_groups) ) {
+							echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+						}
+				}
+				
 		   	}
 
 		echo '</div>';

From f73d4eeb70d77225b9fc2206450402d1563b967d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 17 May 2010 22:08:55 +0200
Subject: [PATCH 13/63] Fixes #1128 adding else condition

---
 main/gradebook/gradebook.php | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php
index 2c1bfd53e3..3cb84fe39b 100755
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@@ -402,38 +402,25 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
 			'name' => get_lang('ToolGradebook')
 		);
 		Display :: display_header(get_lang('FlatView'));
-	}
-	elseif (isset ($_GET['search'])) {
-			
+	} elseif (isset ($_GET['search'])) {		
 		if ($_SESSION['gradebook_dest'] == 'index.php') {
 			$gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']).'?cidReq='.Security::remove_XSS($_GET['course']).'&amp;';	
 		} else {
 			$gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']);
 		}	
 		
-		$interbreadcrumb[]= array (
-			'url' => $gradebook_dest,
-			'name' => get_lang('Gradebook')
-		);	
-			
+		$interbreadcrumb[]= array ('url' => $gradebook_dest,'name' => get_lang('Gradebook'));
 
-		if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {
-			
+		if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {			
 			if (!empty($_GET['course'])) {
-				$interbreadcrumb[]= array (
-					'url' => $gradebook_dest.'selectcat='.Security::remove_XSS($_GET['selectcat']),
-					'name' => get_lang('Details')
-				);	
+				$interbreadcrumb[]= array ('url' => $gradebook_dest.'selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));	
 			} else {
-				$interbreadcrumb[]= array (
-				'url' => $_SESSION['gradebook_dest'].'?selectcat=0',
-				'name' => get_lang('Details')
-				);
-			}
-	
-		}
-		
-	 Display :: display_header('');
+				$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=0','name' => get_lang('Details'));
+			}	
+		}		
+	 	Display :: display_header('');
+	} else { 
+		Display :: display_header(''); 
 	}
 }
 

From d5989e4de49e0bb330e2a6e2f304d65f032ea831 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 11:36:11 +0200
Subject: [PATCH 14/63] Fixing document labels if they are bigger than 80
 characters

---
 main/document/document.inc.php |  5 +++--
 main/document/document.php     | 11 ++++++++---
 main/document/showinframes.php |  7 ++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 7088966a43..99f8a18981 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -62,7 +62,7 @@ function build_directory_selector($folders, $curdirpath, $group_dir = '', $chang
 					$userinfo = Database::get_user_info_from_id(substr($folder_titles[$folder], 8));
 					$folder_titles[$folder] = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
 				}
-
+				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
 				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$folder_titles[$folder];
 				$parent_select -> addOption($label, $folder);
 				if ($selected != '') {
@@ -78,8 +78,9 @@ function build_directory_selector($folders, $curdirpath, $group_dir = '', $chang
 				$label = '/ ('.get_lang('HomeDirectory').')';
 			} else {
 				$path_parts = explode('/', str_replace($group_dir, '', $folder));
+				$label = cut($label, 80);
 				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
-			}
+			}			
 			$parent_select -> addOption($label, $folder);
 			if ($selected != '') {
 				$parent_select->setSelected($folder);
diff --git a/main/document/document.php b/main/document/document.php
index c67a6be04d..bebfb78be2 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -278,7 +278,7 @@ $image_files_only = '';
 if ($is_certificate_mode) {
 	$interbreadcrumb[]= array('url' => '../gradebook/index.php', 'name' => get_lang('Gradebook'));
 } else {
-	$interbreadcrumb[]= array('url' => '', 'name' => get_lang('Document'));
+	$interbreadcrumb[]= array('url' => '', 'name' => get_lang('Documents'));
 }
 
 // Interbreadcrumb for the current directory root path
@@ -305,10 +305,15 @@ for ($i = 0; $i < $array_len; $i++) {
 	}
 
 	$url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i];
+	
+	//Max char 80
+	$url_to_who = cut($dir_array[$i],80);
+	
 	if ($is_certificate_mode) {
-		$interbreadcrumb[] = array('url' => $url_dir.'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => $dir_array[$i]);
+		$interbreadcrumb[] = array('url' => $url_dir.'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => $url_to_who);
 	} else {
-		$interbreadcrumb[] = array('url' => $url_dir, 'name' => $dir_array[$i]);
+		
+		$interbreadcrumb[] = array('url' => $url_dir, 'name' => $url_to_who);
 	}
 
 	$dir_acum .= $dir_array[$i].'/';
diff --git a/main/document/showinframes.php b/main/document/showinframes.php
index 704a96fb0a..630285d30f 100755
--- a/main/document/showinframes.php
+++ b/main/document/showinframes.php
@@ -42,7 +42,9 @@ if (isset($_SESSION['_gid']) && $_SESSION['_gid'] != '') {
 }
 
 $interbreadcrumb[] = array('url' => './document.php?curdirpath='.dirname($header_file).$req_gid, 'name' => get_lang('Documents'));
-$interbreadcrumb[] = array('url' => 'showinframes.php?file='.$header_file, 'name' => $header_file);
+$name_to_show = cut($header_file, 80);
+$interbreadcrumb[] = array('url' => 'showinframes.php?file='.$header_file, 'name' => $name_to_show);
+
 $file_url_sys = api_get_path(SYS_COURSE_PATH).'document'.$header_file;
 $path_info = pathinfo($file_url_sys);
 $this_section = SECTION_COURSES;
@@ -60,7 +62,6 @@ if (!empty($_GET['nopages'])) {
 
 $_SESSION['whereami'] = 'document/view';
 
-$interbreadcrumb[] = array('url' => './document.php', 'name' => get_lang('Documents'));
 $nameTools = get_lang('Documents');
 $file = Security::remove_XSS(urldecode($_GET['file']));
 
@@ -138,7 +139,7 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 
 //Display::display_header($tool_name, 'User');
 
-Display::display_header(null, 'Doc');
+Display::display_header('');
 echo "<div align=\"center\">";
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
 echo '<a href="'.$file_url_web.'" target="_blank">'.get_lang('_cut_paste_link').'</a></div>';

From c0009d9bae1de29d1fafc269966c840c8c789080 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 11:46:18 +0200
Subject: [PATCH 15/63] Fixing column width see CT#905

---
 main/newscorm/lp_list.php | 41 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php
index 1f8ba69eca..5103554629 100755
--- a/main/newscorm/lp_list.php
+++ b/main/newscorm/lp_list.php
@@ -60,10 +60,8 @@ $current_session = api_get_session_id();
 //api_display_tool_title($nameTools);
 
 /*
------------------------------------------------------------
 	Introduction section
 	(editable by course admins)
------------------------------------------------------------
 */
 Display::display_introduction_section(TOOL_LEARNPATH, array(
 		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
@@ -74,16 +72,12 @@ Display::display_introduction_section(TOOL_LEARNPATH, array(
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null,true);
 
-if($is_allowed_to_edit)
-{
-
-
-  /*--------------------------------------
+if ($is_allowed_to_edit) {
+  /*
     DIALOG BOX SECTION
-    --------------------------------------*/
+    */
 
-  if (!empty($dialog_box))
-  {
+  if (!empty($dialog_box)) {
 	  switch ($_GET['dialogtype'])
 	  {
 	  	case 'confirmation':
@@ -100,8 +94,7 @@ if($is_allowed_to_edit)
 			break;
 	  }
   }
-  if (api_failure::get_last_failure())
-  {
+  if (api_failure::get_last_failure()) {
     Display::display_normal_message(api_failure::get_last_failure());
   }
 
@@ -157,8 +150,7 @@ if (!empty($curDirPath))
 echo	'<tr>';
 echo	'<th>'.get_lang('Title').'</th>'."\n" .
 		'<th>'.get_lang('Progress')."</th>\n";
-if ($is_allowed_to_edit)
-{
+if ($is_allowed_to_edit) {
   echo '<th>'.get_lang('CourseSettings')."</th>\n" .
   		//xport now is inside "Edit"
   		//'<th>'.get_lang('ExportShort')."</th>\n" .
@@ -180,12 +172,10 @@ $flat_list = $list->get_flat_list();
 $test_mode = api_get_setting('server_type');
 $max = count($flat_list);
 //var_dump($flat_list);
-if (is_array($flat_list))
-{
+if (is_array($flat_list)) {
 	$counter = 0;
 	$current = 0;
-	foreach ($flat_list as $id => $details)
-	{
+	foreach ($flat_list as $id => $details) {
 		//validacion when belongs to a session
 		$session_img = api_get_session_image($details['lp_session'], $_user['status']);
 
@@ -242,13 +232,10 @@ if (is_array($flat_list))
 		$lp_theme_css=$mystyle;
 
 
-	    if($display_progress_bar)
-	    {
-	    	$dsp_progress = '<td>'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id,api_get_user_id()),'').'</td>';
-	    }
-	    else
-	    {
-			$dsp_progress = '<td style="padding-top:1em;">'.learnpath::get_db_progress($id,api_get_user_id(),'both').'</td>';
+	    if($display_progress_bar) {
+	    	$dsp_progress = '<td width="140px">'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id,api_get_user_id()),'').'</td>';
+	    } else {
+			$dsp_progress = '<td width="140px" style="padding-top:1em;">'.learnpath::get_db_progress($id,api_get_user_id(),'both').'</td>';
 	    }
 	    if($is_allowed_to_edit) {
 	    	
@@ -524,9 +511,7 @@ echo "</table>";
 echo "<br/><br/>";
 
 /*
-==============================================================================
   FOOTER
-==============================================================================
 */
 Display::display_footer();
-?>
+?>
\ No newline at end of file

From 5d362b0e9e70b1af13b112102ef3de52bdb502d2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 12:17:47 +0200
Subject: [PATCH 16/63] Some Wiki fixes: Setting group_id = 0,  deleting echo
 in api_not_allowed, change lang variable

---
 main/wiki/index.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/wiki/index.php b/main/wiki/index.php
index e7555259ef..e4cd4984f0 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -93,6 +93,10 @@ event_access_tool(TOOL_WIKI);
 HEADER & TITLE
 */
 // If it is a group wiki then the breadcrumbs will be different.
+
+//Setting variable
+$_clean['group_id'] = 0;
+
 if ($_SESSION['_gid'] OR $_GET['group_id']) {
 
 	if (isset($_SESSION['_gid'])) {
@@ -111,10 +115,10 @@ if ($_SESSION['_gid'] OR $_GET['group_id']) {
 
 	//ensure this tool in groups whe it's private or deactivated
 	if 	($group_properties['wiki_state']==0) {
-		echo api_not_allowed();
+		api_not_allowed();
 	} elseif ($group_properties['wiki_state']==2) {
  		if (!api_is_allowed_to_edit(false,true) and !GroupManager :: is_user_in_group($_user['user_id'], $_SESSION['_gid'])) {
-			echo api_not_allowed();
+			api_not_allowed();
 		}
 	}
 } else {
@@ -1626,7 +1630,7 @@ if ($_GET['action']=='edit')
 				</select> %';
 				echo '<br/><br/>';
 				echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post
-				echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('langSave').'</button>';//for save button Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js
+				echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('Save').'</button>';//for save button Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js
 				echo '</div>';
 				echo '</form>';
 			}

From d28fb58ffe5334acf14dd7e3a421f4163b44f7c6 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 12:32:02 +0200
Subject: [PATCH 17/63] Replacing Chamilo logo

---
 .../images/logo_dokeos.png                    | Bin 6181 -> 5136 bytes
 main/install/update-db-1.8.5-1.8.6.inc.php    |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 main/default_course_document/images/logo_dokeos.png

diff --git a/main/default_course_document/images/logo_dokeos.png b/main/default_course_document/images/logo_dokeos.png
old mode 100644
new mode 100755
index ecce8cad1fee4d4717a6924478f3384f4bec9eaf..b5a87206dc29c873288121e7bf53ebd12c5ddc1c
GIT binary patch
literal 5136
zcmV+r6z}VaP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS-
z4jCpR1DtmN027c&L_t(|+U=ZMj3ifi$A9OXs_veiThDE0c6N5xJ9}Z*_>$PzV8F34
zAu%`@Ffvj|f&vi|dCKK2QG}AGNQrnPQ3z22aYO_PNJx+nW5AFYe8X#d?e$*0UhidQ
z=ic4Zm+Cs_%R`@<t!-ELjIW?*ODc7BSJl)x|MPwS?^>fogsWTkO<#rJDnM5Ox(d)$
zfUW{`6`-pCT?OdsmbC@R!8L#Nv#sAHpz?}fZw~T+1>kz%ruJDPK>1_*F&W1?^;>%H
z_B((98o-Z%Q*RkSuWC~uO(8xNVRnV6K?N~KfgEr*uoI{QEf13OJE`x<vGh3SQrD#S
ze&D0PY2XoH{+A1&PLOs4=y4MxJc;8u;CA2+4_I?U#;%+sT_)e{x=v65_5wSABfw)o
z?U#jvb^_O;+QYVIW9&<DTV4Vhz=OaS{lIe_3(*aP4kdoYby@c}{TyxvJ^@_!M)T@x
z{bSbx_X59#VgwCt$r7K8kVV&K3C%^|0pQ<(RiMzpKXd^>HUX>iob#MC2)rNo7%=mT
zRIviE%X7>DFXD&M9G0du<Cj|KHI1GMPzB`>4g)8F_W<wk_cwY-#b$ueMe<_*xdZqx
z@B(lcSb3`fngRwq0moj2-VN+S@d%0+-LeB>%xsvjPZjtc@PuFGy(!{OPu6V#EVBt%
zk^g=jFbh28RXuvE0D4=83AY}o5^xW29L?h>R#0q1u^XZ8uW$Lm_ItM==kL#wrmV>~
zfs6hg-Gi?Zeloyqz&^h?FLvR)Hw>Tv*q##S^nhajxgX7pE4#<loL$fp=5`GCVhMnC
zKe+}F0%O2XN=4FAWmCs4wZ9A;0~S3<oAFxHFWv{dTkw>>_e}w4!cWL{G0({=D;&RO
z&&B6l+5L;z9z3K5)Ta@y$87*v11esc#(_TncWnnCo%^)E{-mGqdWPC{0+l>-kLRf8
z{JyDMppu;Q7Cq@ZfnW6?q<JIx%y|oU3RnU{916t|J!YOYlfms2_#G@G2<v{}i8DFk
z7a;Jz*$nAPOPKN8b__V{|5i7(OZ!mD-@ERm=|sv;1K`ActFOt-Yi~Z|)NknrTR+KZ
z;8x%upwKi>T;~?;M_R|D<8HzJDZ+yov{y6lO)=*!&(g-?sZ2*Q*;@{Bb?dHcio8=4
zV<`#jW$mmd?8LZy(9_22R<RLaxMO8Id1x|qelM`iukb}Qnpp0%XX6WQ*?q-K2R~8+
z>UR-#;iv)1BK4M)7X*fkR@;@(2RJ8K5wSU=(SE`LZYVUt%~L}|3(a`&$V#o`;3d<R
z-pUrNo%3TI^ZaxQc*fuRnpEsI;GHS;>fDX@b@C~Y5&~WDKrI8IALemAYL1)j!Mp0p
z-Gh*u><jg^!^NR%OMOFQ`LGx$MrzjO*IL$|EH^68uB@+KYQ)VzD`{D0|KPyn?vL#n
z-Cm1b{P<#Z<sVPXzf@`2N~qKs&reYbDA&U=6)!AJKh7g3?puvttpx4tLCzK!?Eoju
zAEVw$JO`Xa(FEQWEyUB&QtR<Q`S9-LJrjjLAI${^#&SWB(@F#^3hM+LS=WE()X>Ok
zGoE^Kd41(uXP3{PtJxMHjo8`9I(OT|;Aklqm@hnc;dmvs2Ta>vJLcVjbY?&@EMJ;K
zZv^)2|7Ph3aC)l}Gy&Y-5n<C|;;;80wmJYzJA)diARLcH&gVlDe)gSHw|)B7soBY)
zT)iCI{OM|QchkC@_TXxz96&6RkDLsKig3Oe*S>gk?o_Ci`imQ84mPZF3Zxhq^VIVC
z^4}gg{{mptmE5-GpPzOiY|4*IKI4>ouw{U5@r2gs;*=?`g2fC8;tC6-2wPAX%A2Ln
ze_;3YZF`6JRGYCC!Ila^xtKT2bB$<6xn+kmIEBJMD{oZIIx$U=eg%DXEAf|(%^$mW
z*XZ=#f&4%$Sgmjaf!5zRyL{}Qj?W)18l6Z?!<+S=ddsK%c;XBTd4(0*s*3GMAxnmO
zjd*ZehWe#{YsF4(9v%vB`rLb`Wn?6$p1M?Z(zd0_RZvFZlu_dJ26xb&xLGcR=3>9m
ztFe>y!GckrJ2*MG7TNj!K(}lgAhd@2uNfVEe4)~KeyzTkQz}ud9X<u~b8p(c-ie=(
zdd<;%$*Y*{;bTmuRwYZl93V~zL#<|i|Heu74i;3k7Go{i#c1b8Xaya|Vx%RAmp?1$
z)yR&YueT1aMs~_*Wvxgwk_(Ev`txH=Cpa*%U?PXkDb@eU*@;`4*5#xf94GF?ByhJv
z?or6N5=T@l(kKnn7#^ZNGE9AB_*I+v-97?ub^*tD39>zW7J#_rWbC6iOqAZfy`Oqy
zH{?qN>M}#6UA<Tk1Ij3rf><P6XvRCMu^k;RgfEZhgE_5mfHG~qvPLTxDBOo<O5w%Y
z^qDW8n19BBQc6WhfNf2n1nM@IqgBX*Qe7SCV2kSIx|qhqj~K`R=n83yti%Vm6?eUF
ze~Ct%a$KDtk)Vu%KwW8X0F@GbMSCuFEB)td(E$VDp;Gaw{y;B!DbaxPq}cy^`?d{#
zd8v7(Vr4MUO8dnOL~G+IVG0q0NODdCdivo#8Zf26>CFJ@_hK1mMA(ut;X1`puK>ph
zE+44y<2Q~U&~24@WeU*>I6;L9w7Q(S&mw`g*yxkB*4}ebW#>#^?$k&=nA1wdu}J8}
z+LUAY)Vs#|cYSZM_JUIcD)HJc_xz|X`EM5}OiruHW&rK-Aa!#N^%m4iA}g)m+&?lq
zJKi^1i)_zoi8KWaR|0i~&?`jijl@vXN$y0oaj00=d$#rE&J5*(C4k6@E*h2p%h}P7
zj0Sr2YZt4}X?=x^S|8SA7779->?^ibHUns;i+Uy2X($!lXI3HvTp>{0K0ACUirtoq
z0a!ttpwJLr2FZEpNppr)3XRZ&!prsOV6kN@!?|ESr&L|6Q%1pOW(GfWp=nDGFW1ku
zqZRO(#)XXZEr1j>?%s*@vff0!W;)D!XK*^|7g91Zgd5y*!}P%Dj#7Sm?6#Pz^7EI5
z!&Mws8*E^3VSqCMqBTzIjZbF`;`g$Z!KQV63Y_xlEe`wX9Ycrm1|^p>p(~wgmCP|v
znDNl9e`<QQ8EleTEqLZ9BREwl_3Bo?aw51p_m!>@D0K7jd+D4QjSEdTjlA-^2sy3d
zqS0%#jibsLZH$5ojaDU=4K8f}<y7c#h4E3KcK5ZGfxci9_39SbId8d2y`uZbihcW3
zaq#--{@Jxgyk&5dYO4+oT%SRdLPV}$)J|tERPEqxDA4ucKugm)y%f9J$#S&(@Jjvc
zqif9zB8XBx+-Wbo&M-Rk8EM_SZG9OS4>qY>#65!35${JuUA$(og8ks3(VbdRa?+-c
zt$@>r9M#AY1R8XX0TFbYkkJbAN^OXO0cut_T#G0e&5%(i|7W#v`pI&%aAG}LS&dx{
z!D`*c+>d=VW4y@%tGtr6`zOm0PzZVir^SrGla%$E=w-bkEAjQ)i^I3=8QwEjZsxPV
zQGnL%kUj1GL{50%(Rp6VE9Aye-aDA*x2O7vfQObE+&q+HN8S(#G@S6*T9a?gSMh4|
zJ*1sqQVNVhd(lhAR!^l`v*xD8a_)l1KGZ#&L)D{D*VmCedxali1$+0w(HX56vKfJn
zH&!fEqK%Vn|432l3;682r})Gzli-9OEY<nZN`ui*bL()P?=RMQs@kHU6$P!xX~=6(
zilbVwZZv_>Xul|~V|<k^ab>bM?%h^hPExbFOP2APE|rVKdJTDmGs(H-#O@m}48CV}
zcxtsC7djtcv?3p9zI|koZ$7(3XxjdAwP|_e#WF_0&_Kxh_Y85@XdeJyo2&BO#X36+
zhWn=ad2q4DSI$>xI^mv)A|Ks0fC$g4%M0r=R4A=pSt_Q1wLjjq(oE)_1<<%J<June
z^YLDmt7XOBv9GkfFVy|@mMf~1cUA~Bm4@Z3kI(ba@l{SP)LB@MF<LQPF#POHnQuP5
zhzbocaN|G@?enZ(pR4kf3sp*?=3|rn{A8uU-<(<He^;9XiWQ$6(^+Hk<F5N%b;&#k
za6S!a76<L=Fn^uFY2N!knf&7fH&P68zcxEOS!vo_%ZkyuEj3Pr|9ozlhflAvv>uZ)
ziuK6yvomYlcf$l$gtu=m@*huLVs)ax{iShgRuE~Ew^Hz<r8+Au%SX2LGZbp(8kWC5
zyN1?0V-!`N6?7RjHI?#xRF~9E-KT{UO^Jdol?&UY!fAaXKI|ayjlsksZe}<?IMyE)
zV<(l-{@_xzX(uX8s~&i4j;Aly2o2;-TdYE@c<_Z4rib#}v2U2&r943~;HNl_pIX6L
zX@j$&p73-f;%q&p;T%RM4i_(|SEgLjK*he)(^;xYhfOOaJu2<%8$m|pVxUXuB>BF*
zSKQ?sZnPNYbAi@2vaM3y%njv(@?Ssr(#X%xRmTSM1`D*Dpq0X?_QU@5iFr;h)mbjL
zFk^Wr1}r!2Mg)HahbdUKF5QN9$){FzMlCHFcda8Mnne*8Qs*L|t}}8!K}Ot__MU60
z<ILDAAF2)7F-8Y-<!Judx!OM$bLQbjEb&0j@V0G5#s@-LPC&pq;lX389KKLRO&1ZQ
zGwkY>={uYnmvl+Hto2CxB>=8=RAXyt2^#j!q0OitrMIJAPiMVD*|8EL2|P+6q1NW-
z=PHZkdaIfX^nd@x!I8#?4vpR!8kKLf948m+eCPRPE|i-T0+3ulJe&i!<sJj;lkz%4
zt<vgM?O0Sgs<iVR0LGmXH0jBAvz9pJnf`Gvk}7Q#6iVum^L~axX;`ks4Y4A-M+)PA
zbjQrtwcCrwhWmoKT&Ufx*9`H=o3{~ag~Wmk=a9U9H9Z(7{Wwe)aFX_$s7E2uW;8T7
zpqU2ftk3#4JqdSfPDl`M0MGhrK_iLkwSu*JtI@Jzy&%b8!5D=2?n5KH`vO&rt+;Ii
z;e}#oo?CC&^7L??vHq|f^-lG@+IE~5I^w~sdVaY}zMK?*<qUwXuwo6bJ{NtFZzfe1
z$#NKzoZtDB%8hA_zEo|k*CN*{=5!ESaW~BjP8R!u+;!Ur#;p@qZrFxGF*y*%Ef*YZ
z#BNtksZq(BJlX1%^cFQdS0tSwWj|(<(d>|nGfG*nta4PMUM}OAnSRhJ@O|GX^()@5
zX!Ve&M4FBOlSZlC3+pZW+}!%&duNBI>n$4}m?(_CZ+~g#$c5^{byNN0gL(2+#2KTs
zQp)U~=zH|8eWkzqhm$LR7Up$;l}3t-FZl`9yr0talWzG*1zj9J*P&jjOF7E=1<vHR
zUJ0{fz<0fV2i<Zf>9`ZPsNg9P=D+j&(itahAExER{^5JJ-?ZAWwI82aJyUPFD9}oY
zAR-bLbLRQa+&cB(;7I;1C%hl{Jn(hkQD4J4?|qbdDkRAHogS*?JV4STWnAuTSV&9J
zW_7U&@DT8%SGQo3wl@tl^F|$e;^oRuzVrOj(ZPc06G8HU(Vx0y>iV&Pu&>s#k$5#7
zDh6>e)ZZQ$&C|Dc5OFf<ozb016~ce23=dy2NI5M%iAt&-{B!Az=rB9#SMeQw@Nth-
zQGgDNn*Y)x7ar&f^~Znxz{pKnA+aOgKi)SgmrFSLr_WcvQLVNf{n~nyMJE`=v=4^+
zQflP7m~hvHoYU4T?vdJvQvFD;yFaK5{LnW<UYF_w%XA40nAlSP!Vk}V^#><bpSb7H
z*j)!E`=*MaRwBr9J+6K0nZ*<T_5AX`MNZ(h3Cv)a!^yDEHDyVP>yiJ?>Ox!Z5;7%g
zwCdIN4eL=9&k6Is6>nQ=m0z(+MxzCI>}=)fCtt1{FBO9QLj^Nsg?PCZ*Q!mskXO8z
zpU4vrhTvqxXA*|HG!}FNDl4>Tbo3y0s-WpX&abMn+D)2%?4{{YhcwZV0H<J74v5MP
zdt|i{UsN!omFh19>VmQo#p8u`KGw;U2Pn5$tu4cvcJ}|Qr}`FMhV(QxQ?J(pP+FQU
zd6i2`Q`Q8u(TG7Uc=Epn;j|cqjO4*dKGi7E*%78PGMp~eZ`kzDj#7=GwH}sNd-d9^
zxm>><fRb&^d*FM#?_@fpsS_;iC-e*=r)4CM>kks?DfvBVXlkYWp2YV_1CidlEsX0D
zy>I0e1@%S%lsx>Dk7us+8OIjcuNoxI<*E`|ZZK@;FJh_CZW7<-#XpgRxC<#~`C^Lf
z*QQ(tX!R}d5478j-q3B0_Iq1LQ!yJEg-3uT0jR}EXtC_CFMIxIbTmz9Uin5M8RhU^
zT;)>ME8fb4-i&uvt&gxD^(5H&u2@2#O9;qtE=l@?zMAVYq%+G3Nte_`w|sQk@?F~M
zWZuk|dRJ+`Kyo}49$fZ6gqTnv<Arvbt=)j$pOMY%<+*Qm-gSViy?RxC830Oi)01BP
zl5FK1B1kEZ8we5=o2GkjquYWCsgAf%`{(J@;zXV&x0-E|fVXB_^B~Roq+D4ExKb|h
zf08$U;tWzvr+0ORlq4h`rz~C6Vf~Wt&8>3JMyCgF-R3+u<v^?y40f`RNY4)MAhtSI
zJZtjJ)L!-ePOHP>y-}OIl>jAMgax~Q02v6O-BdN=typ5c8veMFaspc!=K4)vRCV=V
ybY*Qn+;9}H{%eX&RO~81zhE<e6`=p`+y4P$Nb!TUA}L7#0000<MNUMnLSTYIED&!1

literal 6181
zcmV+=7~1EFP)<h;3K|Lk000e1NJLTq003kF002w~1^@s6n;jAl0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}$4Nv%RCwC#TzQZjS9$;5>tl|c*;~7-
z-PLM!SS26Gk}V5^Fg90!GK3h2ajFdYC-*^;e^R893JH`Ugi29BLPBf;DUMKq1S*xp
zG2qx-p#+u>$rid+$LiX9XLj!C?)UP2ufLw{9j|10wbE)~TYB3)efM|$zN=ektzm7t
zekQTTkTr&^O=}GK8E42t-`lpVH{s(gY)jbCA_XXb1g=WaYB0Bke}oX>y@E7LxC~kg
zn&E$1PkWeW5rX$H8_nSsF6D8lM5odszOi}I3$}#kgZa}nHitB8NtEF`&)*GS+jk#i
z62-=G2R{Dbl4)UIFOngNw!%ECi+_7?)Ny!B0?8vzM=M77XrK7+XkP~h@)^nvN?ym4
zeZ4Sa!Vh5Bv1wT=4MRw|9mpVLj;P>r5Go4(rGJLp%svwONb17{&4Nrn6lw&WvV=bm
z;qT{hRM!~tQVhW{9T24h*zDRRq~No@)*cdeFH&{8&`?8zR1V2($gP+e(L6o^F>ilV
zXlO(mF0aGGhjIQKjuAd~jUkIn86?y;v@4^tftotu`P$MjHSAj74FFzHTJJ{D-;Mia
zL$f0yGZtq;L|hd!O99*bXdmMHMnR0hIhlGK6F(aa5zA?c1rg}gICj|rev%8+Atah#
zt7}LKm>RV0Zy}WrBS~L_#Jv&cHqI|*b|TnSG2|9(<~+tE!l;{Z#{t~@Q(S(*0REbW
zG^X`TBpP>Fq4YjoQ2HF%9@G$JNpUIwaT?ceMNGI$grM&?nJg8;N5c)8*9_4BdCkrO
zp$%!=?Kp;5TaI53W^9QJ5zBS`Br}9gSm8MVdN<maBlzQKTy}82hlyFl<w=|q7W7A$
zF;9HKm@X8%!bJQFIObwrS!CLx<48kai(@m6XK{@EJZlIMqccXFfZ6ThxTT_?f7A;O
z_t{n^Dd7R!(vOtP2_xk?g-3Mb&d5}OF^g8n0%ev7*hQ#4I>e1*xID@sj}!|vD8eMv
zOwq%d^4v<9F}cDF>81FJiK1iDOR+;YQm#9%)$YS}Z{nOEd^phh-%-qcX<`*oL<W$z
zbPf+i#G&|5BSXn+ZfJnVrfDaRJzD!+$fuwQ{EfNOp(!H)y&1>7IJUDH{khSQ1e+a;
zV}nRyNy7VZ=~kriISjK$5I1g`3iRw;5Ioi{<^FD4yfp!0D^gV=CC?*0Clv%;NahTO
zC4mwGAxH*NSe%eh$b7p)DgPvhU_=V1w1^Q7Sc_Uj=x7YbyfOc}Wymt+zq-)Kuj2=8
zc3->rH{nY=66XYx)%HNYa@6-m3R-@l*S2=0!QTVgYn3ulN?09b*Y4<%((S_#CgBCe
zs^{mco~rmt*Zua?4XOT)H*YL?7uHYYzS~m|<_=pTG0xZ(T8sIJ(&Ipr1g0Brh0NFy
z9Qmsa{PqgtN0z-F9m9|WF0~<5e8vMZUpGPs^e3~@va3pWKU11{c5BPP;oG|Qyt~C6
zxFeg|+L285Nn0cmK~PK8{aL$EJyDq|?4KUXeRndQ+>l=1{R=%5xM!1_QYXf~n5lWQ
zXQh=KMZb80&8E$aQ5?Snq1h6*vNuL<@=0<ot}BL!EBCSzG4IN6!jE>|u2^CteCZ&(
z!Ih`{py>6d2KMe4_}#9Z>+kP(gm7y9jOzu3B&x6PSXL>O=yO|JwrAG0zPde=*qF{&
zj^v8vkzy(_knU@{s{?879XtQ9uaws+q<z*z?*dJeHcXIwFCH@`2p?Oc10pCVRzb`P
z9Ls~GQ#JXS6%Guq__}TQ;Jy67Dh93;!gX@Qpkh(B3QY@gCn((6p6uQGnhn2`*xdfg
zt-10sWlMWn=s@^>E{lgb1TB_yOSYAoa_qLm=Dr6z$7i2J#qy^RQ`!_dWBna(O4aHU
z-ifiV97TpC@RF@~A=DOlUWeIXbPojj5$4)Fj6Jiok~*EJz<9m~_MhB|OsPRE&RLZv
z3+*zr;_cUC%ni+zFd7oiQ<*u6r&kNgZrbj+c~{?ihPu-mVWx^sma5ZE8!TZdfntlE
znaME<Uk2zc&pLMNxNEmf^|imwsRudAHP*sdQOlvOxAjfrfAnm=e00XOyAlZe+wfco
zrNlGIgn!m`e65?LAAbgp^kE|31&=)bARHOn0^QjesWo}iq1%4#8FFQE;375FlcY7d
zpFYPVDNc37v_oiL*FBW(-tFCQ?d;9&gpx<)4Idn78T*2V$nYQ%VPpL)FUWWMs*?5n
z(sVkx{!GT*l-Jr=A7YGdaW_~u4*r3B_SA>|Q^Ty2aFXbbDZ~)rxo#knNiSINyxL?d
zt+ZPeht6;J_n+JWgWcyXWSY&|zA8bz1s|->V1s6ch{j`g;a}P0dC_ixuRIuTyR&yw
z$KDJPHDFUuB(o%i^U~x)8u=0-*(3B4h%f!R>ZLO2Eia_qzSBaWKqJ&3^f>*UclAz}
zZn4JZzB-#t4W$(^1auqa*icg>yXDc`h>22i)Rw{d6fy=i1J9!Zy-eQMN+cJ%I34bB
z+Aq=$*I<ii*zCw$DL<%rS+}QUYv(<KuGIqdpxAIM$fEd)LUV0$EVdAh9EnMyAWba`
z*{AazbLE3~)as|VB;4+^wrt5Gqb=0Bp26<>K3G?WpDfjm=N-E}8A6%K7T4p!BQvCi
z8ge9)ESX}OEdm=Qs=BhEzI0S~P&5aSW;U1_hdGsEhL9JPj-^oyGth*X9OFRd73<ff
zxAgm}y6ElD&UF<Ei%mch7PL@P6iCTQU*#q0!PI)cl3Qon*(t}$PT?)7l(X%Q4V~}r
zJvI5UeYIe+YRNR3Eqw+LDaEqKMsyt8n;sb-n*I1Uf6H!bDI`$Y%6b{StZSV*Ng?9)
zHnd}5wzk6vh&JwSV|}1KKk2mF1FbtZSkiXz_r*m7|I|#_ufTNz9EdSEx1=&=&9YGv
zEJP10umhFvRZz$K!B}4_)t0(#urqV_kWw{rtg6h6C=Fv$F|_Ph{zRpoL=S77ov`aD
zU}9M#_-l<JT}*g?K_Q8PKaJj1#3T{rmo%k3g6`Djj_&l<{(4ZkWDF$CKZ!uEknjPi
z7t5S(FpUhF0e+dN+9E?9mke~VQmP)AEL49wDWpSZnZqNhoU@PIae?Qoj_124{`5;9
zfX<d2B8;vqr*>RxhS;3DqItO~Iw$N%$C+Wm0PXt;D<d{_yk?_oWxC4Vw84ak_`1pE
ztNI0GVHL6tdCwWMiC{nqx8XUUNrFI?kYVlTD&FWwvG&tksd`|%SRctD&}&P!L}`B2
zFjt}1M^~Q36=g55WYX0b?}*xJPMtU$o%{Tdf;}wF(Yf6Szzn8_+R>BU-nyaf_Tf4b
zJL+p7Ef6B~nknl}bR(kAR?oxv!heC6EyMcOdm)p!9ZI#Mh$&e}xtma9JeVvz3UlSB
zYf`#T1iErcp>>kN!I3~^Nm!f~DMd_(7rQLWA2(?R$FopdTvWjFYEHj*FyXz1fD5A?
zHm{!#tPtoGy1Hmq;D*lE4LLH^=>=6Lyp66+3(S;H!gTqBd4vFi!?HI8{n;I`v-dt)
z17~Nyg6l?*5yMcbABBA7DMQyx@)k5wiBV+61!SsYTWyXc5EqTWu4wXWqG3)IFIN!h
zr(GN251m~c0bGT)qHDzvy3PR1_eiOjxoY8Iz?@SRMmxGv!|8$6T^q{v=_Hvd2N^_~
zF<v?fPhI#D9G!W>#2duj<1<e}u6i1V+Fk{{t?w|V>CDXEL$!Ve+ETk=rt~C?<-ZOo
zdk8(H-XnNRwa`H}HI%4ELMEv2qI6CuEK@b#^`1Ju12xXH$oN;wu3sDc&?Y($U|}PI
zGWY?SGO7WUEd+#a4;7mRTW{-1S*@8uZCu#WMTyVB$n5vw#Ox0-QlElKFb7kW6EK*$
z4JhgK+}Oh~)bcABEEd7B+Mw=F!|3ckKwsPaNW@l{Dn15<>T?wZ{t1juM3ajx7~9HC
z%z&^0smF4aR{fdB-UnTo914!`Rx?8gv^zM^(i{+msdb?#P?Rv=v_Qas;OfYA=^Hww
zv`g7U-}%|fsdZ0Z_=<ZvADSN5N+H3EaA5qKDCaJ?G7Yvq4QFRQi&S=v)*x`B%2nV(
z{;Np-6#mX)P&qw<rf`}}6nB=Yn73Eta)69!F)d>dNp*Q{EftMI+Nv$#Mx7-=%m-DW
z4{Gv2R_Iy^Vg^|*<;o-^?N$d(Rgkh<Cohy<`2LC951x@i`0dF-NIRY8@Ch_uKRWv`
zoGt8w{+29iN(KBN-*9&&GJ-5ppu-psgFa)fAZ(%wOTD_$jZ$nXmPOI|B<>xgohm%A
z_die&T!5?8mU=BTB*mrBpy8>`OJ0qOKEoyh95Sd*T_XtJl5$Q`Sh5&Qsj<TI2QA^w
z?&^C$_h)at%~v&;EFFQP(~m=;J_Q}F4Q;M4t-(@?1sOphoakOi%1^{HD`972cwc3h
z?|g|TJ;^jp)9-{+hc~?9`|yo@Zvm=>Tt5tXd9vYfX4j4teB#mEY)B}hMH_V(B>KLt
zD=#Pq=vB!esQG1Y#vf|k-MVMseKl8Rj?Y$3cXp;WcHnw(Y~}~hlg5i64EcKTvIGMc
zm0@QiqKmNRLeV&-XNr7(GFB|3d!7OAKp_qmsu`%%Q_zwu!*U0O*UDtkgMJUfRvfDl
zZ|DZqBK)96xaZJDPhz|w(alxG`c#Qx4$E?7TXG;hkli(qwA<Tis)+7q=2(l<b-FD%
z7)Yt1BM~%$zt|LYz2|U@;{^}ud8`VeM5Z8Y(=RetQE)$P%E_i_&w_Pr)A0U#AAwRe
z4Xf2;DOUL(LfEu+3nvk4@hF%XlQRqyq7U8PzOmAw*_-vfUeanyY;C`Lu;S;+HNQ|t
zhGG1WK%3rK=tyn(n~d%ErY&nQ2sz?H*u^r(%qVi?T}Db*M0lMbh7pQ2pwi_1NnSTI
zUk1RFV;nNneI8>UYt=F&ng}!xL)cQY10Q|BB<zIgor*U^<8N^q4barNxo7L+r6ZgA
zGB<S(weK06EFT{qFCV?oogVIzU?(vG@wauo>B~=_f9S9U^>z&obs+9yg4Wr}L|yPo
z%nQiE6u&S`Yt+)&`=Z_RFyEEJz=P_7%&;vV9fV-niF9q=pn9>XwehlBgfQJCNtmy#
zH}Y7hI6g+;Vz~XzTkqNUNAE~Eo$bD=*F06OVoZXtEjw+Q`nuA=hmMWiS3=L~1}PG6
zg0MHZ#tA_ci+zHaX2hH2Xx~wu$2Ejh;3$|zyk<P2RKmrr{p+_MUsV;us31iEJ8rZk
z>|hiy-@!=L49gOZe=4`{$KMV<I(|#<JKorx-n_|`Ep|Pqs5AMW9306#_s<*L@01dj
zkB(JhfJ?wSCiyQab~Ocqn$1<U*<7)C%P%fp`l@Khk{P0#yqGI!3(7IJY~_)N096=l
zk<t>jb9Qe3$hpFSQ*FuhH>B;(4K;txnW>&Ulug_`I-E>ntWjx4JF^atNOIfI0<**>
zC{_|~{0=x(0?nxsyng-?uRUDVl=#aRZ><(E!xC4-7|JD~wumVR`)RxQRHkM^%?OUw
zl0ehs=PGAkn9(Ok(G}h%WMWk7!&M5Ml@>in#vTgJ2|Kv+z2W_G<8{EA=?k8-X2eq^
zk=FR^j$d{(E=4$29MnmWJ$gOXWMZQt(UK<e#C`(iwE#U7YKveKMiIBPq)fUXQbfSR
z<p7S{+M)cErR`c^-WSO-0N0qAMASOWzdRbvqvar$u7RdhNvTP5E;+e)#7tdafO_Rj
zSr!ZtF~(S?V7}z=CiKL#Am4uzp0%5Lr}5lg*lcA)fXv!7YUPZlj7wy4O}K4}`@B3c
zPxuJD{U$7F&g7abvzS-&Ik=3ML+RiIUcG=<IxvGORSOw%|MlYbN`5lGQ9__D5V@43
z&txc}Vi4yW@MI}wmSRfet<W?PLqf^dh(}^UpRnfWn%d!I475d4wUQh08r$e)(>%OH
z(;E>!h18oxw(XyiP(-G**jJw5T6Qlh(iR=V8(YYwWL`)@so!=Mg?89zOPCd|A@yb}
zUf2w!L-%wb7F<G%n0i6}OgA#k)Q-F08v;6nLONF-Rq~SN%Eqgp$%I3AXGPRK8dPgs
zj%?#qcY7%mk2?X8Rgjm5G}>T`NoxoqI=yyQt1BpN?+7645@n66n`sn`MEn&uV}?XS
zfd!|4MMEQ04Co_VnZWIpi``HX317k^o}MNXCBTuP*;=mD?=^`-)Qf^o9SS=eiOT>&
z3fiLA0H|%GzAmYZRMrC+G{L24v~tFigC3iph~QNoHRFxZ9M2`fW1~)(Mbo%MczToP
z|0bmA2b%Lj<}7y}e#PDoQJO7?7R)fJRa{bUG^brmVF?)lfiflGwpfZIN}(IV6T!Jv
z%UcB4_2tkqa%cBVhHa|_KU6tKTphZs7(;ZUiD%x#2P#1OeCebenk#)%yMpedHj;|d
zK?eL9EdFJOC1W9J#Z%J~=ITZh&B-irb?I{5e0(NS0Z#=B?0_l7E^rD2xRy4ALHvk{
zM;Fzs=IY4B_9Ny>COCCD9z-|xLS?=ST!>|S8GN-c<YJl>m^Yq9__-v65Rz8KL~4Lc
zusDNB%B`3?RSOoreoOk8Lk-x6*sv+9VP}^%%or_&fPE<@{#-I7^3*`jzeaLkCL~i=
zA~ajHg$UYgpD1wL(yC!&Mw<?Ka#x?in4#<~WF}2%q{J9%#G_|~+2*X!3*)PTA<Ywc
zS1;tmf)XkbP%N_F>7sy>1+gH8u;j(fn-DAeY^#zXVFuvxY>B}Hv5KDS3Xi9h#v390
zQUaOvALDqE-ORT@Sm*c`_JU~N`ygyGcr<p7dmyZd{11c$q3FKe17SIqYVkjSu#mNv
zGs09$d7Q63)W{IeCkDUG=eV7hn~O~M@iAQy-ykdn{5OtM5Oz|&k*`JPq-L=H<-m~w
z(Fb_HM;VH!V)q8V*7;Zlc}eM~r5;BF{$m^;$8i&m*W>saj=$u6K8WKBCW;OxdiXEn
z_(1GD6x2P0<C8f4kO=`{rWd}1<DYPRjMq^m@S`~Xme1kvH6Fon2ZXiy9ZW<b+PiUl
z9><-F-2dO<_(vSC;6d-9N7YL@?_c5g6pmLx_~DyR^Zn5@%*Q{%LPyivaeM~CkJxmr
zgofP7lKB@n-p@Bo4?<smY~_9C;KlEO<eG%w9%d#@@5J%fF#pk)JO_Q9JYUbmi1J)f
zaf!6?H(2xH)7yEz*hggYd|!)wt&*7idpLfRnHH`4FpmAP>(KrDK5NPJ%TLuUuZEEH
z-OuLai;+{q68XspXPa(rvG&WiGI2f&VF&!~ct`?at-FIw&lW!C^i{+@GO=%iur3of
ztDj(DdN0hU?|n8?zXUI%c5<~eWPnG3Z}ehup2N02`jT6Bj4AZhox9oYKE&$&UM58J
z(Dd!9EZckq;kOb6pSSrM(Puc0uyp$`5rg(H<{7V-?}N-_AB5eMg{E8@rDQh6gzOkE
z|9b2^E5?v0N!NB6!S_d)X+(g}#kBHvX6m<aoZ*LhCu_ts@0Vwwe-|egp8=|mg!mN?
z#6Q9WjKI146520#|38n>;WW&5rX(&xn{v#zBlGodIKIJ74Zy+{)N9I+gZx16Vo*GI
zk%tagdS}_@R#<Y0Sa0V2KFyB6AQPIrtB3jcBAbr~`Pk3La0Fu5^!Oqe@>1rw!k*oN
z(1o9cOecLDXNuSFVeLK?V+axcF$lXdUmIh{6-`UUkk7HFp%_qsLH-E{yGUAC&E+E3
zt1%OQ8OOh}hqIR*1#%gGmCc*QOn-uponSNJ#)uL{BUWtQoWinV^Z54Y<IGlU)ELM~
zOaF{50GZ4`fv}4CiP$rxn5mzIW&C8*QW-MKcJ>$9T_n?TnB$FKW6vh?g5s&8=<TH4
zZ0{fA7=a%40Q>u!*@Z1Kfu?vn;m7mP_z+FQgwS>9%c2(;bEv!hw_~x#7kJw_zONhE
ztYujM&M~u(u#kL<fqf%i^EA`xU3?xLGut$My~(k;BIc}pjQ={D))=zJkhN)zA!`g-
zo7Nbz#*npXjUj6cS)0}vvc`}#hO9AUZMx|6{{jpEDS3xWFL%tV00000NkvXXu0mjf
D3q$Yq

diff --git a/main/install/update-db-1.8.5-1.8.6.inc.php b/main/install/update-db-1.8.5-1.8.6.inc.php
index 6ac02d93d2..95c260f584 100755
--- a/main/install/update-db-1.8.5-1.8.6.inc.php
+++ b/main/install/update-db-1.8.5-1.8.6.inc.php
@@ -196,7 +196,7 @@ if (defined('SYSTEM_INSTALLATION')) {
 						</h1>
 					</td>
 					<td style="width: 50%;">
-						<img style="width: 100px; height: 100px;" alt="dokeos logo" src="{COURSE_DIR}images/logo_dokeos.png"></td>
+						<img alt="Chamilo logo" src="{COURSE_DIR}images/logo_dokeos.png"></td>
 					</tr>
 					</tbody>
 					</table>

From 46b3f46fb0acee34d3f31f9b0152676b41f5b906 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 14:11:59 +0200
Subject: [PATCH 18/63] Cleaning code

---
 main/newscorm/lp_add_item.php | 282 +++++++++++-----------------------
 1 file changed, 90 insertions(+), 192 deletions(-)

diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php
index 185d27b658..f2adecb776 100755
--- a/main/newscorm/lp_add_item.php
+++ b/main/newscorm/lp_add_item.php
@@ -1,28 +1,8 @@
-<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 Ghent University (UGent)
-
-	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 Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 
 
 /**
-==============================================================================
 * This is a learning path creation and player tool in Dokeos - previously
 * learnpath_handler.php
 *
@@ -31,23 +11,17 @@
 * @author Roan Embrechts, refactoring and code cleaning
 * @author Yannick Warnier <ywarnier@beeznest.org> - cleaning and update
 * @author Julio Montoya  - Improving the list of templates
-* @package dokeos.learnpath
-==============================================================================
+* @package chamilo.learnpath
 */
 
 /*
-==============================================================================
 		INIT SECTION
-==============================================================================
 */
 $this_section=SECTION_COURSES;
 
 api_protect_course_script();
-
 /*
------------------------------------------------------------
 	Libraries
------------------------------------------------------------
 */
 //the main_api.lib.php, database.lib.php and display.lib.php
 //libraries are included by default
@@ -57,12 +31,10 @@ include('learnpath_functions.inc.php');
 include('resourcelinker.inc.php');
 //rewrite the language file, sadly overwritten by resourcelinker.inc.php
 // name of the language file that needs to be included
-$language_file = "learnpath";
+$language_file = 'learnpath';
 
 /*
------------------------------------------------------------
 	Header and action code
------------------------------------------------------------
 */
 $htmlHeadXtra[] = '
 <script type="text/javascript">
@@ -72,15 +44,13 @@ var temp2=false;
 var use_document_title='.api_get_setting('use_document_title').';
 var load_default_template = '. ((isset($_POST['submit']) || empty($_SERVER['QUERY_STRING'])) ? 'false' : 'true' ) .';
 
-function FCKeditor_OnComplete( editorInstance )
-{
+function FCKeditor_OnComplete( editorInstance ) {
 	editorInstance.Events.AttachEvent( \'OnSelectionChange\', check_for_title ) ;
 	document.getElementById(\'frmModel\').innerHTML = "<iframe height=890px width=230px; frameborder=0 src=\''.api_get_path(WEB_LIBRARY_PATH).'fckeditor/editor/fckdialogframe.html \'>";
 }
 
-function check_for_title()
-	{
-		if(temp==true){
+function check_for_title() {
+		if (temp==true) {
 			// This functions shows that you can interact directly with the editor area
 			// DOM. In this way you have the freedom to do anything you want with it.
 
@@ -133,15 +103,11 @@ function check_for_title()
 		temp=true;
 	}
 
-function InnerDialogLoaded()
-{
-	if (document.all)
-	{
+function InnerDialogLoaded() {
+	if (document.all) {
 		// if is iexplorer
 		var B=new window.frames.content_lp___Frame.FCKToolbarButton(\'Templates\',window.content_lp___Frame.FCKLang.Templates);
-	}
-	else
-	{
+	} else {
 		var B=new window.frames[0].FCKToolbarButton(\'Templates\',window.frames[0].FCKLang.Templates);
 	}
 
@@ -152,9 +118,7 @@ function InnerDialogLoaded()
 
 $htmlHeadXtra[] = $_SESSION['oLP']->create_js();
 /*
------------------------------------------------------------
 	Constants and variables
------------------------------------------------------------
 */ 
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null,true);
@@ -180,19 +144,16 @@ $prereq         = $_REQUEST['prereq'];
 $type           = $_REQUEST['type'];
 */
 /*
-==============================================================================
 		MAIN CODE
-==============================================================================
 */
 // using the resource linker as a tool for adding resources to the learning path
-if ($action=="add" and $type=="learnpathitem")
-{
+if ($action=="add" and $type=="learnpathitem") {
 	 $htmlHeadXtra[] = "<script language='JavaScript' type='text/javascript'> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
 }
-if ( (! $is_allowed_to_edit) or ($isStudentView) )
-{
+if ( (! $is_allowed_to_edit) or ($isStudentView) ) {
 	error_log('New LP - User not authorized in lp_add_item.php');
 	header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
+	exit;
 }
 //from here on, we are admin because of the previous condition, so don't check anymore
 
@@ -202,14 +163,12 @@ $therow=Database::fetch_array($result);
 
 //$admin_output = '';
 /*
------------------------------------------------------------
 	Course admin section
 	- all the functions not available for students - always available in this case (page only shown to admin)
------------------------------------------------------------
 */
-/*==================================================
+/*
 			SHOWING THE ADMIN TOOLS
- ==================================================*/
+ */
 if (isset($_SESSION['gradebook'])){
 	$gradebook=	$_SESSION['gradebook'];
 }
@@ -224,7 +183,7 @@ if (!empty($gradebook) && $gradebook=='view') {
 $interbreadcrumb[]= array ("url"=>"lp_controller.php?action=list", "name"=> get_lang("_learning_path"));
 $interbreadcrumb[]= array ("url"=>api_get_self()."?action=build&lp_id=$learnpath_id", "name" => stripslashes("{$therow['name']}"));
 
-switch($_GET['type']){
+switch($_GET['type']) {
 	case 'chapter':
 		$interbreadcrumb[]= array ("url"=>"#", "name" => get_lang("NewChapter"));
 	break;
@@ -270,19 +229,14 @@ function confirmation(name)
 //echo $admin_output;
 
 /*
------------------------------------------------------------
 	DISPLAY SECTION
------------------------------------------------------------
 */
 echo $_SESSION['oLP']->build_action_menu();
 echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
-
 	echo '<tr>';
-
 		echo '<td class="tree">';
 			// show the template list
-			if (isset($_GET['type']) && $_GET['type']=='document' && !isset($_GET['file']))
-			{
+			if (isset($_GET['type']) && $_GET['type']=='document' && !isset($_GET['file'])) {
 				$count_items = count($_SESSION['oLP']->ordered_items);
 				$style = ($count_items > 12)?' style="height:250px;width:230px;overflow-x : auto; overflow-y : scroll;" ':' class="lp_tree" ';
 				echo '<div  '.$style.'>';
@@ -300,146 +254,90 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 				echo '</div>';
 			}
 
-
 		echo '</td>';
 		echo '<td class="workspace">';
 
-			if(isset($new_item_id) && is_numeric($new_item_id))
-			{
-				switch($_GET['type'])
-				{
-
-					case 'chapter':
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewChapterCreated'));
-						break;
-
-					case TOOL_LINK:
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewLinksCreated'));
-						break;
-
-					case TOOL_STUDENTPUBLICATION:
-
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewStudentPublicationCreated'));
-						break;
-
-					case 'module':
-
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewModuleCreated'));
-						break;
-
-					case TOOL_QUIZ:
-
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewExerciseCreated'));
-						break;
-
-
-					case TOOL_DOCUMENT:
-						Display::display_confirmation_message(get_lang('NewDocumentCreated'));
-						echo $_SESSION['oLP']->display_item($new_item_id, true, $msg);
-						break;
-
-
-					case TOOL_FORUM:
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewForumCreated'));
-						break;
-
-
-					case 'thread':
-						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						Display::display_confirmation_message(get_lang('NewThreadCreated'));
-						break;
-
-				}
+		if(isset($new_item_id) && is_numeric($new_item_id)) {
+			switch($_GET['type']) {
+				case 'chapter':
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewChapterCreated'));
+					break;
+				case TOOL_LINK:
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewLinksCreated'));
+					break;
+				case TOOL_STUDENTPUBLICATION:
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewStudentPublicationCreated'));
+					break;
+				case 'module':
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewModuleCreated'));
+					break;
+				case TOOL_QUIZ:
+
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewExerciseCreated'));
+					break;
+
+				case TOOL_DOCUMENT:
+					Display::display_confirmation_message(get_lang('NewDocumentCreated'));
+					echo $_SESSION['oLP']->display_item($new_item_id, true, $msg);
+					break;
+				case TOOL_FORUM:
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewForumCreated'));
+					break;
+				case 'thread':
+					echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
+					Display::display_confirmation_message(get_lang('NewThreadCreated'));
+					break;
 			}
-			else
-			{
-				switch($_GET['type'])
-				{
-					case 'chapter':
-
-						echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang("EnterDataNewChapter"));
-
-						break;
-
-					case 'module':
-
-						echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang("EnterDataNewModule"));
-
-						break;
-
-					case 'document':
-
-						if(isset($_GET['file']) && is_numeric($_GET['file']))
-						{
-							echo $_SESSION['oLP']->display_document_form('add', 0, $_GET['file']);
-						}
-						else
-						{
-							echo $_SESSION['oLP']->display_document_form('add', 0);
-						}
-
-						break;
-
-					case 'hotpotatoes':
-
-						echo $_SESSION['oLP']->display_hotpotatoes_form('add', 0, $_GET['file']);
-
-						break;
-
-					case 'quiz':
-
-						echo $_SESSION['oLP']->display_quiz_form('add', 0, $_GET['file']);
-
-						break;
-
-					case 'forum':
-
-						echo $_SESSION['oLP']->display_forum_form('add', 0, $_GET['forum_id']);
-
-						break;
-
-					case 'thread':
-
-						echo $_SESSION['oLP']->display_thread_form('add', 0, $_GET['thread_id']);
-
-						break;
-
-					case 'link':
-
-						echo $_SESSION['oLP']->display_link_form('add', 0, $_GET['file']);
-
-						break;
-
-					case 'student_publication':
-
-						echo $_SESSION['oLP']->display_student_publication_form('add', 0, $_GET['file']);
-
-						break;
-
-					case 'step':
-
-						echo $_SESSION['oLP']->display_resources();
-
-						break;
-				}
+		} else {
+			switch($_GET['type']) {
+				case 'chapter':
+					echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang("EnterDataNewChapter"));
+					break;
+				case 'module':
+					echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang("EnterDataNewModule"));
+					break;
+				case 'document':
+					if(isset($_GET['file']) && is_numeric($_GET['file'])) {
+						echo $_SESSION['oLP']->display_document_form('add', 0, $_GET['file']);
+					} else {
+						echo $_SESSION['oLP']->display_document_form('add', 0);
+					}
+					break;
+				case 'hotpotatoes':
+					echo $_SESSION['oLP']->display_hotpotatoes_form('add', 0, $_GET['file']);
+					break;
+				case 'quiz':
+					echo $_SESSION['oLP']->display_quiz_form('add', 0, $_GET['file']);
+					break;
+				case 'forum':
+					echo $_SESSION['oLP']->display_forum_form('add', 0, $_GET['forum_id']);
+					break;
+				case 'thread':
+					echo $_SESSION['oLP']->display_thread_form('add', 0, $_GET['thread_id']);
+					break;
+				case 'link':
+					echo $_SESSION['oLP']->display_link_form('add', 0, $_GET['file']);
+					break;
+				case 'student_publication':
+					echo $_SESSION['oLP']->display_student_publication_form('add', 0, $_GET['file']);
+					break;
+				case 'step':
+					echo $_SESSION['oLP']->display_resources();
+					break;
 			}
-
+		}
 		echo '</td>';
-
 	echo '</tr>';
-
 echo '</table>';
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
 Display::display_footer();
 ?>
\ No newline at end of file

From 70fd63cf0a5004a412da9ec52f48278e0b2f7188 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 14:38:22 +0200
Subject: [PATCH 19/63] Prevents wrong parent selection for document CT#1251

---
 main/newscorm/learnpath.class.php | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 4c31ce4acb..7c33eea476 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -4710,12 +4710,17 @@ class learnpath {
 		if (is_numeric($item_id)) {
 			$tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
 			$tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-			$sql = "SELECT lp.*
-								FROM " . $tbl_lp_item . " as lp
-								WHERE lp.id = " . Database :: escape_string($item_id);
+			$sql = "SELECT lp.* FROM " . $tbl_lp_item . " as lp
+					WHERE lp.id = " . Database :: escape_string($item_id);
 			$result = Database::query($sql);
-			while ($row = Database :: fetch_array($result)) {
+			while ($row = Database :: fetch_array($result)) {				
 				$_SESSION['parent_item_id'] = ($row['item_type'] == 'dokeos_chapter' || $row['item_type'] == 'dokeos_module' || $row['item_type'] == 'dir') ? $item_id : 0;
+				
+				//Prevents wrong parent selection for document see Bug#1251 
+				if ($row['item_type'] != 'dokeos_chapter' || $row['item_type'] != 'dokeos_module') {
+					$_SESSION['parent_item_id'] = $row['parent_item_id'];					
+				}
+				
 				$return .= $this->display_manipulate($item_id, $row['item_type']);
 				$return .= '<div style="padding:10px;">';
 				if ($msg != '')
@@ -5032,10 +5037,10 @@ class learnpath {
 			reset($arrLP);
 		}
 
-		$return .= "\t\t\t\t" . '</select>';
-		$return .= "\t\t\t" . '</td>' . "\n";
-		$return .= "\t\t" . '</tr>' . "\n";
-		$return .= "\t\t" . '<tr>' . "\n";
+		$return .= '</select>';
+		$return .= '</td>';
+		$return .= '</tr>';
+		$return .= '<tr>';
 
 		$return .= "\t\t\t" . '<td class="label"><label for="idPosition">' . get_lang('Position') . '</label></td>' . "\n";
 		$return .= "\t\t\t" . '<td class="input">' . "\n";
@@ -5991,14 +5996,12 @@ class learnpath {
 				$path_parts = pathinfo($extra_info['path']);
 				$item_title = stripslashes($path_parts['filename']);
 			}
-		}
-		elseif (is_numeric($extra_info)) {
-			$sql_doc = "SELECT path, title
-									FROM " . $tbl_doc . "
-									WHERE id = " . Database :: escape_string($extra_info);
+		} elseif (is_numeric($extra_info)) {
+			$sql_doc = "SELECT path, title FROM " . $tbl_doc . "
+						WHERE id = " . Database :: escape_string($extra_info);
 
 			$result = Database::query($sql_doc);
-			$row = Database :: fetch_array($result);
+			$row 	= Database :: fetch_array($result);
 
 			$explode = explode('.', $row['title']);
 
@@ -6028,32 +6031,26 @@ class learnpath {
 		else
 			$parent = 0;
 
-		$sql = "
-						SELECT *
-						FROM " . $tbl_lp_item . "
-						WHERE
-							lp_id = " . $this->lp_id;
-
+		$sql = "SELECT * FROM " . $tbl_lp_item . "
+				WHERE lp_id = " . $this->lp_id;
 		$result = Database::query($sql);
-
 		$arrLP = array ();
-
 		while ($row = Database :: fetch_array($result)) {
 			$arrLP[] = array (
-				'id' => $row['id'],
-				'item_type' => $row['item_type'],
-				'title' => $row['title'],
-				'path' => $row['path'],
-				'description' => $row['description'],
-				'parent_item_id' => $row['parent_item_id'],
-				'previous_item_id' => $row['previous_item_id'],
-				'next_item_id' => $row['next_item_id'],
-				'display_order' => $row['display_order'],
-				'max_score' => $row['max_score'],
-				'min_score' => $row['min_score'],
-				'mastery_score' => $row['mastery_score'],
-				'prerequisite' => $row['prerequisite']
-			);
+				'id' 				=> $row['id'],
+				'item_type' 		=> $row['item_type'],
+				'title' 			=> $row['title'],
+				'path' 				=> $row['path'],
+				'description' 		=> $row['description'],
+				'parent_item_id' 	=> $row['parent_item_id'],
+				'previous_item_id'	=> $row['previous_item_id'],
+				'next_item_id' 		=> $row['next_item_id'],
+				'display_order' 	=> $row['display_order'],
+				'max_score' 		=> $row['max_score'],
+				'min_score' 		=> $row['min_score'],
+				'mastery_score' 	=> $row['mastery_score'],
+				'prerequisite' 		=> $row['prerequisite']
+			);			
 		}
 
 		$this->tree_array($arrLP);
@@ -6069,8 +6066,8 @@ class learnpath {
 			$return .= get_lang("EditTheCurrentDocument") . "\n";
 		}
 
-		$return .= '	</div>
-								</div>';
+		$return .= '</div>
+						</div>';
 
 		if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
 			$return .= Display :: return_warning_message('<strong>' . get_lang("Warning") . ' !</strong><br />' . get_lang("WarningEditingDocument"), false);
@@ -6112,6 +6109,7 @@ class learnpath {
 				}
 			}
 		}
+		
 		$parent_select = & $form->addElement('select', 'parent', get_lang('Parent'), '', 'class="learnpath_item_form" style="width:40%;" onchange="load_cbo(this.value);"');
 		$my_count=0;
 		foreach ($arrHide as $key => $value) {
@@ -6125,13 +6123,15 @@ class learnpath {
 			}
 			$my_count++;
 		}
-
+		
 		if (!empty ($id)) {
 			$parent_select->setSelected($parent);
-		} else {
+		} else {			
 			$parent_item_id = $_SESSION['parent_item_id'];
 			$parent_select->setSelected($parent_item_id);
 		}
+		
+		
 
 		if (is_array($arrLP)) {
 			reset($arrLP);

From 8b5a33ad76c381a65372bfb3a8923adfb4f9126a Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 14:46:19 +0200
Subject: [PATCH 20/63] Fixes user id variable definition see CT#1299

---
 main/exercice/savescores.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/main/exercice/savescores.php b/main/exercice/savescores.php
index 0b35e619a0..79d3c2131e 100755
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
@@ -3,7 +3,7 @@
 
 /**
 *	Saving the scores.
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author
 * 	@version $Id: savescores.php 15602 2008-06-18 08:52:24Z pcool $
 */
@@ -11,8 +11,7 @@
 // name of the language file that needs to be included
 $language_file = 'learnpath';
 
-if($_GET['origin']=='learnpath')
-{
+if($_GET['origin']=='learnpath') {
 	require_once ('../newscorm/learnpath.class.php');
 	require_once ('../newscorm/learnpathItem.class.php');
 	require_once ('../newscorm/scorm.class.php');
@@ -21,18 +20,16 @@ if($_GET['origin']=='learnpath')
 	require_once ('../newscorm/aiccItem.class.php');
 }
 
-include ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 $this_section=SECTION_COURSES;
 
-include_once (api_get_path(LIBRARY_PATH).'fileManage.lib.php');
+require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 
 $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path']."/document";
 $full_file_path = $documentPath.$test;
 
 my_delete($full_file_path.$_user['user_id'].".t.html");
 
-
-
 $TABLETRACK_HOTPOTATOES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 $tbl_learnpath_user 	= Database::get_course_table(TABLE_LEARNPATH_USER);
 $TABLE_LP_ITEM_VIEW 	= Database::get_course_table(TABLE_LP_ITEM_VIEW);
@@ -62,17 +59,14 @@ function save_scores($file, $score)
 	$reallyNow = time();
 	$date = date("Y-m-d H:i:s", $reallyNow);
 
-	if (!$_configuration['tracking_enabled'])
-	{
+	if (!$_configuration['tracking_enabled']) {
 		return 0;
 	}
 
-	if ($_user['user_id'])
-	{
-		$user_id = "'".$_user['user_id']."'";
-	}
-	else // anonymous
-		{
+	if ($_user['user_id']) {
+		$user_id = $_user['user_id'];
+	} else {
+		// anonymous
 		$user_id = "NULL";
 	}
 	$sql = "INSERT INTO $TABLETRACK_HOTPOTATOES ".

From 72813b674980c4718327ed350fc35951ce9c5f35 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 14:47:04 +0200
Subject: [PATCH 21/63] Cleaning code

---
 main/exercice/savescores.php | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/main/exercice/savescores.php b/main/exercice/savescores.php
index 79d3c2131e..cd900bed0b 100755
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
@@ -49,8 +49,7 @@ $jscript2run = '';
  * @param	integer	Score to save inside the tracking tables (HP and learnpath)
  * @return	void
  */
-function save_scores($file, $score)
-{
+function save_scores($file, $score) {
 	global $_configuration, $origin,
 		$_user, $_cid,
 		$TABLETRACK_HOTPOTATOES;
@@ -70,41 +69,36 @@ function save_scores($file, $score)
 		$user_id = "NULL";
 	}
 	$sql = "INSERT INTO $TABLETRACK_HOTPOTATOES ".
-	"(exe_name, exe_user_id, exe_date,exe_cours_id,exe_result,exe_weighting)" .
-	"VALUES" .
-	"(
-	'".Database::escape_string($file)."',
-	'".Database::escape_string($user_id)."',
-	'".Database::escape_string($date)."',
-	'".Database::escape_string($_cid)."',
-	'".Database::escape_string($score)."',
-	'".Database::escape_string($weighting)."')";
+			"(exe_name, exe_user_id, exe_date,exe_cours_id,exe_result,exe_weighting)" .
+			"VALUES" .
+			"(
+			'".Database::escape_string($file)."',
+			'".Database::escape_string($user_id)."',
+			'".Database::escape_string($date)."',
+			'".Database::escape_string($_cid)."',
+			'".Database::escape_string($score)."',
+			'".Database::escape_string($weighting)."')";
 	$res = Database::query($sql);
 
-	if ($origin == 'learnpath')
-	{
+	if ($origin == 'learnpath') {
 		//if we are in a learning path, save the score in the corresponding
 		//table to get tracking in there as well
 	    global $jscript2run;
 		//record the results in the learning path, using the SCORM interface (API)
 	    $jscript2run .= '<script language="javascript" type="text/javascript">window.parent.API.void_save_asset('.$score.','.$weighting.');</script>';
 	}
-
 }
 
 // Save the Scores
 save_scores($test, $score);
 
 // Back
-if ($origin != 'learnpath')
-{
+if ($origin != 'learnpath') {
 	// $url = "Hpdownload.php?doc_url=".$test."&cid=".$cid; // back to the test
 	$url = "exercice.php"; // back to exercices
 	$jscript2run .= '<script language="javascript" type="text/javascript">'."window.open('$url', '_top', '')".'</script>';
 	echo $jscript2run;
-}
-else
-{
+} else {
 ?>
 <html>
 <head>

From e8984d22975a3710eab9101030d6d075e8e3f1f2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 15:08:12 +0200
Subject: [PATCH 22/63] Cleaning code

---
 main/calendar/agenda.php   | 101 +++++++++++++++----------------------
 main/calendar/calendar.php |   2 +-
 2 files changed, 43 insertions(+), 60 deletions(-)

diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index 7f7dbe76f9..59d24702a9 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -52,78 +52,65 @@ if (!empty($_GET['view'])) {
 }
 
 /*
------------------------------------------------------------
 	Libraries
------------------------------------------------------------
 */
 // containing the functions for the agenda tool
-include "agenda.inc.php";
+require_once 'agenda.inc.php';
 // some debug functions
-include($includePath."/lib/debug.lib.inc.php");
+require_once $includePath."/lib/debug.lib.inc.php";
 
-/*==============================================================================
+/*
   			TREATING THE PARAMETERS
 			1. viewing month only or everything
 			2. sort ascending or descending
 			3. showing or hiding the send-to-specific-groups-or-users form
 			4. filter user or group
-  ============================================================================== */
+*/
 // 1. show all or show current month?
-if (!$_SESSION['show'])
-{
+if (!$_SESSION['show']) {
 	$_SESSION['show']="showall";
 }
-if (!empty($_GET['action']) and $_GET['action']=="showcurrent")
-{
+if (!empty($_GET['action']) and $_GET['action']=="showcurrent") {
 	$_SESSION['show']="showcurrent";
 }
-if (!empty($_GET['action']) and $_GET['action']=="showall")
-{
+if (!empty($_GET['action']) and $_GET['action']=="showall") {
 	$_SESSION['show']="showall";
 }
 //echo $_SESSION['show'];
 
 // 2. sorting order (ASC or DESC)
-if (empty($_GET['sort']) and empty($_SESSION['sort']))
-{
+if (empty($_GET['sort']) and empty($_SESSION['sort'])) {
 	$_SESSION['sort']="DESC";
 }
-if (!empty($_GET['sort']) and $_GET['sort']=="asc")
-{
+if (!empty($_GET['sort']) and $_GET['sort']=="asc") {
 	$_SESSION['sort']="ASC";
 }
-if (!empty($_GET['sort']) and $_GET['sort']=="desc")
-{
+if (!empty($_GET['sort']) and $_GET['sort']=="desc") {
 	$_SESSION['sort']="DESC";
 }
 
 // 3. showing or hiding the send-to-specific-groups-or-users form
 $setting_allow_individual_calendar=true;
-if (empty($_POST['To']) and empty($_SESSION['allow_individual_calendar']))
-{
+if (empty($_POST['To']) and empty($_SESSION['allow_individual_calendar'])) {
 	$_SESSION['allow_individual_calendar']="hide";
 }
 $allow_individual_calendar_status=$_SESSION['allow_individual_calendar'];
-if (!empty($_POST['To']) and ($allow_individual_calendar_status=="hide"))
-{
+if (!empty($_POST['To']) and ($allow_individual_calendar_status=="hide")) {
 	$_SESSION['allow_individual_calendar']="show";
 }
-if (!empty($_GET['sort']) and ($allow_individual_calendar_status=="show"))
-{
+if (!empty($_GET['sort']) and ($allow_individual_calendar_status=="show")) {
 	$_SESSION['allow_individual_calendar']="hide";
 }
 
 // 4. filter user or group
-if (!empty($_GET['user']) or !empty($_GET['group']))
-{
+if (!empty($_GET['user']) or !empty($_GET['group'])) {
 	$_SESSION['user']=(int)$_GET['user'];
 	$_SESSION['group']=(int)$_GET['group'];
 }
-if ((!empty($_GET['user']) and $_GET['user']=="none") or (!empty($_GET['group']) and $_GET['group']=="none"))
-{
+if ((!empty($_GET['user']) and $_GET['user']=="none") or (!empty($_GET['group']) and $_GET['group']=="none")) {
 	api_session_unregister("user");
 	api_session_unregister("group");
-	}
+}
 if (!$is_courseAdmin){
 	if (!empty($_GET['toolgroup'])){
 		//$_SESSION['toolgroup']=$_GET['toolgroup'];
@@ -132,8 +119,7 @@ if (!$is_courseAdmin){
 	}
 }
 	//It comes from the group tools. If it's define it overwrites $_SESSION['group']
-if (!empty($_GET['isStudentView']) and $_GET['isStudentView']=="false")
-{
+if (!empty($_GET['isStudentView']) and $_GET['isStudentView']=="false") {
 	api_session_unregister("user");
 	api_session_unregister("group");
 }
@@ -314,8 +300,8 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	}
 }
 
-echo '<table width="100%" border="0" cellspacing="0" cellpadding="0">'
-		. '<tr>';
+echo '<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	  	<tr>';
 
 // THE LEFT PART
 if (empty($_GET['origin']) or $_GET['origin']!='learnpath') {
@@ -323,8 +309,7 @@ if (empty($_GET['origin']) or $_GET['origin']!='learnpath') {
 	// the small calendar
 	$MonthName = $MonthsLong[$select_month -1];
 	$agenda_items=get_calendar_items($select_month,$select_year);
-	if (api_get_setting('display_mini_month_calendar') == 'true')
-	{
+	if (api_get_setting('display_mini_month_calendar') == 'true') {
 		display_minimonthcalendar($agenda_items, $select_month,$select_year, $MonthName);
 	}
 	echo '<br />';
@@ -357,34 +342,34 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		    }
 		    break;
 		case 'add' :
+			if ($_POST['submit_event']) {
+				display_agenda_items();
+			} else {
+				show_add_form();
+			}
+			break;
+		case 'edit' :
+			if ( !(api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, intval($_REQUEST['id'])))) {
 				if ($_POST['submit_event']) {
 					display_agenda_items();
 				} else {
-					show_add_form();
+					$id=(int)$_GET['id'];
+					show_add_form($id);
 				}
-				break;
-		case 'edit' :
-				if ( !(api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, intval($_REQUEST['id'])))) {
-					if ($_POST['submit_event']) {
-						display_agenda_items();
-					} else {
-						$id=(int)$_GET['id'];
-						show_add_form($id);
-					}
-				} else {
-					display_agenda_items();
-				}
-				break;
-		case 'delete':
+			} else {
 				display_agenda_items();
-				break;
+			}
+			break;
+		case 'delete':
+			display_agenda_items();
+			break;
 		case 'showhide':
-				if(!empty($_GET['agenda_id'])) {
-					 display_one_agenda_item((int)$_GET['agenda_id']);
-				} else {
-					display_agenda_items();
-				}
-				break;
+			if(!empty($_GET['agenda_id'])) {
+				 display_one_agenda_item((int)$_GET['agenda_id']);
+			} else {
+				display_agenda_items();
+			}
+			break;
 		case 'announce': 		
 			display_agenda_items();
 			break;
@@ -413,9 +398,7 @@ if (!$_GET['action'] || $_GET['action']=="showall"  || $_GET['action']=="showcur
 echo '&nbsp;</td></tr></table>';
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
 // The footer is displayed only if we are not in the learnpath
 if ($_GET['origin'] != 'learnpath')
diff --git a/main/calendar/calendar.php b/main/calendar/calendar.php
index fa60b3634a..dce17214c3 100755
--- a/main/calendar/calendar.php
+++ b/main/calendar/calendar.php
@@ -1,4 +1,4 @@
-<?php //$Id: calendar.php 21101 2009-05-30 14:56:54Z iflorespaz $
+<?php
 /* For licensing terms, see /license.txt */
 
 $language_file = 'agenda';

From 166834c201dff9bb877ced374d28c7b00895ea4b Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 16:30:01 +0200
Subject: [PATCH 23/63] Cleaning code

---
 main/calendar/myagenda.inc.php | 99 +++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index 6d428c14e2..bfd3345b6e 100755
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -123,7 +123,6 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 			$items[$agendaday][$item['start_date']] .= '<br />'."<a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a>  ".Security::remove_XSS($item['title'])."<br /> ";
 			$items[$agendaday][$item['start_date']] .= '<br/>';
 		}
-
 	}
 	// sorting by hour for every day
 	$agendaitems = array ();
@@ -136,6 +135,8 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 			$agendaitems[$agendaday] .= $val;
 		}
 	}
+	
+	
 	//print_r($agendaitems);
 	return $agendaitems;
 }
@@ -162,19 +163,18 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
 	$backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;action=view&amp;view=month&amp;month=". ($month == 1 ? 12 : $month -1)."&amp;year=". ($month == 1 ? $year -1 : $year);
 	$forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;action=view&amp;view=month&amp;month=". ($month == 12 ? 1 : $month +1)."&amp;year=". ($month == 12 ? $year +1 : $year);
 
-	echo "<table class=\"data_table\">\n", "<tr>\n", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>";
-	echo "<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n", "<th width=\"10%\"><a href=\"", $forewardsURL, "\">".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
+	echo "<table class=\"data_table\">", "<tr>", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>";
+	echo "<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>", "<th width=\"10%\"><a href=\"", $forewardsURL, "\">".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
 
-	echo "<tr>\n";
-	for ($ii = 1; $ii < 8; $ii ++)
-	{
-		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>\n";
+	echo "<tr>";
+	for ($ii = 1; $ii < 8; $ii ++) {
+		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 	}
-	echo "</tr>\n";
+	echo "</tr>";
 	$curday = -1;
 	$today = getdate();
 	while ($curday <= $numberofdays[$month]) {
-		echo "<tr>\n";
+		echo "<tr>";
 		for ($ii = 0; $ii < 7; $ii ++) {
 			if (($curday == -1) && ($ii == $startdayofweek)) {
 				$curday = 1;
@@ -183,22 +183,22 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
 				$bgcolor = $ii < 5 ? $class = "class=\"days_week\" style=\"width:10%;\"" : $class = "class=\"days_weekend\" style=\"width:10%;\"";
 				$dayheader = "<b>$curday</b><br />";
 				if (($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
-					$dayheader = "<b>$curday - ".get_lang("Today")."</b><br />";
+					$dayheader = "<b>$curday - ".get_lang('Today')."</b><br />";
 					$class = "class=\"days_today\" style=\"width:10%;\"";
 				}
 				echo "<td ".$class.">", "".$dayheader;
 				if (!empty($agendaitems[$curday])) {
 					echo "<span class=\"agendaitem\">".$agendaitems[$curday]."</span>";
 				}
-				echo "</td>\n";
+				echo "</td>";
 				$curday ++;
 			} else {
-				echo "<td>&nbsp;</td>\n";
+				echo "<td>&nbsp;</td>";
 			}
 		}
-		echo "</tr>\n";
+		echo "</tr>";
 	}
-	echo "</table>\n";
+	echo "</table>";
 }
 /**
  * Show the mini calender of the given month
@@ -217,20 +217,20 @@ function display_myminimonthcalendar($agendaitems, $month, $year, $monthName) {
 	$backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;month=". ($month == 1 ? 12 : $month -1)."&amp;year=". ($month == 1 ? $year -1 : $year);
 	$forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;month=". ($month == 12 ? 1 : $month +1)."&amp;year=". ($month == 12 ? $year +1 : $year);
 
-	echo "<table class=\"data_table\">\n", "<tr>\n", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>";
-	echo "<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n", "<th width=\"10%\"><a href=\"", $forewardsURL, "\">".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
+	echo "<table class=\"data_table\">", "<tr>", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>";
+	echo "<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>", "<th width=\"10%\"><a href=\"", $forewardsURL, "\">".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
 
-	echo "<tr>\n";
+	echo "<tr>";
 	for ($ii = 1; $ii < 8; $ii ++)
 	{
-		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>\n";
+		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 	}
-	echo "</tr>\n";
+	echo "</tr>";
 	$curday = -1;
 	$today = getdate();
 	while ($curday <= $numberofdays[$month])
 	{
-		echo "<tr>\n";
+		echo "<tr>";
 		for ($ii = 0; $ii < 7; $ii ++) {
 			if (($curday == -1) && ($ii == $startdayofweek))
 			{
@@ -245,7 +245,7 @@ function display_myminimonthcalendar($agendaitems, $month, $year, $monthName) {
 					$dayheader = "$curday";
 					$class = "class=\"days_today\"";
 				}
-				echo "\t<td ".$class.">";
+				echo "<td ".$class.">";
 				if (!empty($agendaitems[$curday]))
 				{
 					echo "<a href=\"".api_get_self()."?action=view&amp;view=day&amp;day=".$curday."&amp;month=".$month."&amp;year=".$year."\">".$dayheader."</a>";
@@ -254,18 +254,18 @@ function display_myminimonthcalendar($agendaitems, $month, $year, $monthName) {
 				{
 					echo $dayheader;
 				}
-				// "a".$dayheader." <span class=\"agendaitem\">".$agendaitems[$curday]."</span>\n";
-				echo "</td>\n";
+				// "a".$dayheader." <span class=\"agendaitem\">".$agendaitems[$curday]."</span>";
+				echo "</td>";
 				$curday ++;
 			}
 			else
 			{
-				echo "<td>&nbsp;</td>\n";
+				echo "<td>&nbsp;</td>";
 			}
 		}
-		echo "</tr>\n";
+		echo "</tr>";
 	}
-	echo "</table>\n";
+	echo "</table>";
 }
 
 /**
@@ -612,12 +612,11 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
 			$root_url = $url['url'];
 		}
 	}
-
+	
 	$result = Database::query($sql);
-	while ($item = Database::fetch_array($result))
-	{
+	while ($item = Database::fetch_array($result)) {
 		// we break the date field in the database into a date and a time part
-		$agenda_db_date = explode(" ", $item[date]);
+		$agenda_db_date = explode(" ", $item['date']);
 		$date = $agenda_db_date[0];
 		$time = $agenda_db_date[1];
 		// we divide the date part into a day, a month and a year
@@ -631,31 +630,29 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
 		$minute = $agendatime[1];
 		$second = $agendatime[2];
 		// if the student has specified a course we a add a link to that course
-		if ($item['course'] <> "")
-		{
+		if ($item['course'] <> "") {
 			$url = $root_url."main/calendar/agenda.php?cidReq=".urlencode($item['course'])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$course_link = "<a href=\"$url\" title=\"".$item['course']."\">".$item['course']."</a>";
-		}
-		else
-		{
+		} else {
 			$course_link = "";
 		}
 		// Creating the array that will be returned. If we have week or month view we have an array with the date as the key
 		// if we have a day_view we use a half hour as index => key 33 = 16h30
-		if ($type !== "day_view") // This is the array construction for the WEEK or MONTH view
-		{
+		if ($type !== "day_view") {
+			// This is the array construction for the WEEK or MONTH view
+			
 			//Display events in agenda
 			$agendaitems[$day] .= "<div><i>$hour:$minute</i> $course_link  <a href=\"myagenda.php?action=view&amp;view=personal&amp;day=$day&amp;month=$month&amp;year=$year&amp;id=".$item['id']."#".$item['id']."\" class=\"personal_agenda\">".$item['title']."</a></div><br />";
-		}
-		else // this is the array construction for the DAY view
-			{
+			
+		} else {
+			// this is the array construction for the DAY view
 			$halfhour = 2 * $agendatime['0'];
-			if ($agendatime['1'] >= '30')
-			{
+			if ($agendatime['1'] >= '30') {
 				$halfhour = $halfhour +1;
 			}
 			//Display events by list
 			$agendaitems[$halfhour] .= "<div><i>$hour:$minute</i> $course_link  <a href=\"myagenda.php?action=view&amp;view=personal&amp;day=$day&amp;month=$month&amp;year=$year&amp;id=".$item['id']."#".$item['id']."\" class=\"personal_agenda\">".$item['title']."</a></div>";
+			
 		}
 	}
 	//print_r($agendaitems);
@@ -711,7 +708,7 @@ function show_personal_agenda() {
 	$export_icon_high = 'export_high_fade.png';
 
 	// starting the table output
-	echo "<table class=\"data_table\">\n";
+	echo "<table class=\"data_table\">";
 
 	if (Database::num_rows($result) > 0)
 	{
@@ -723,7 +720,7 @@ function show_personal_agenda() {
 			if ($month_bar != date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"])))
 			{
 				$month_bar = date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]));
-				echo "<tr><th class=\"title\" colspan=\"2\" class=\"month\" valign=\"top\">".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))."</th></tr>\n";
+				echo "<tr><th class=\"title\" colspan=\"2\" class=\"month\" valign=\"top\">".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))."</th></tr>";
 			}
 			// highlight: if a date in the small calendar is clicked we highlight the relevant items
 			$db_date = (int) date("d", strtotime($myrow["date"])).date("n", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]));
@@ -740,7 +737,7 @@ function show_personal_agenda() {
 			/*--------------------------------------------------
 			 			display: date and time
 			  --------------------------------------------------*/
-			echo "\t<tr>\n\t\t";
+			echo "<tr>";
 			echo '<td class="'.$style.'">';
 			// adding an internal anchor
 			echo "<a name=\"".$myrow["id"]."\"></a>";
@@ -752,7 +749,7 @@ function show_personal_agenda() {
 			//echo '<a class="ical_export" href="ical_export.php?type=personal&id='.$myrow['id'].'&class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a>';
 			//echo '<a class="ical_export" href="ical_export.php?type=personal&id='.$myrow['id'].'&class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a>';
 			//echo '<a class="ical_export" href="ical_export.php?type=personal&id='.$myrow['id'].'&class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a>';
-			//echo "\n\t\t</td>\n\t";
+			//echo "</td>";
 			echo "</tr>";
 			/*--------------------------------------------------
 			 			display: the title
@@ -760,21 +757,21 @@ function show_personal_agenda() {
 			echo "<tr>";
 			echo '<td class="'.$style.'" colspan="2">';
 			echo $myrow['title'];
-			echo "\n\t\t</td>\n\t";
-			echo "</tr>\n";
+			echo "</td>";
+			echo "</tr>";
 			/*--------------------------------------------------
 			 			display: the content
 			  --------------------------------------------------*/
 			$content = $myrow['text'];
 			$content = make_clickable($content);
 			$content = text_filter($content);
-			echo "\t<tr>\n\t\t<td class=\"".$text_style."\" colspan='2'>";
+			echo "<tr><td class=\"".$text_style."\" colspan='2'>";
 			echo $content;
 			echo "</td></tr>";
 			/*--------------------------------------------------
 			 			display: the edit / delete icons
 			  --------------------------------------------------*/
-			echo "\t<tr>\n\t\t<td class=\"".$text_style."\" colspan='2'>";
+			echo "<tr><td class=\"".$text_style."\" colspan='2'>";
 			echo "<a href=\"myagenda.php?action=edit_personal_agenda_item&amp;id=".$myrow['id']."\">".Display::return_icon('edit.gif', get_lang('Edit'))."</a>";
 			echo "<a href=\"".api_get_self()."?action=delete&amp;id=".$myrow['id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".Display::return_icon('delete.gif', get_lang('Delete'))."</a>";
 			echo "</td></tr>";
@@ -784,7 +781,7 @@ function show_personal_agenda() {
 	{
 		echo '<tr><td colspan="2">'.get_lang('NoAgendaItems').'</td></tr>';
 	}
-	echo "</table>\n";
+	echo "</table>";
 }
 
 /**

From 206d0ccc18f43529890b7db6223fc145e1df8a39 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 16:51:19 +0200
Subject: [PATCH 24/63] Cleaning code

---
 main/calendar/myagenda.php | 109 +++++++++++--------------------------
 1 file changed, 31 insertions(+), 78 deletions(-)

diff --git a/main/calendar/myagenda.php b/main/calendar/myagenda.php
index aad567e51f..320497a135 100755
--- a/main/calendar/myagenda.php
+++ b/main/calendar/myagenda.php
@@ -1,46 +1,5 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
-	@author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
-	@author: Toon Van Hoecke <toon.vanhoecke@ugent.be>, Ghent University
-	@author: Eric Remy (initial version)
-	@version: 2.2 alpha
-	@description: 	this file generates a general agenda of all items of the
-					courses the user is registered for
-
-	version info:
-	-------------
-	-> version 2.3 : Yannick Warnier, yannick.warnier@dokeos.com 2008
-	Added repeated events
-	-> version 2.2 : Patrick Cool, patrick.cool@ugent.be, november 2004
-	Personal Agenda added. The user can add personal agenda items. The items
-	are stored in a chamilo_user database because it is not course or platform
-	based. A personal agenda view was also added. This lists all the personal
-	agenda items of that user.
-
-	-> version 2.1 : Patrick Cool, patrick.cool@ugent.be, , oktober 2004
-	This is the version that works with the Group based Agenda tool.
-
-	-> version 2.0 (alpha): Patrick Cool, patrick.cool@ugent.be, , oktober 2004
-	The 2.0 version introduces besides the month view also a week- and day view.
-	In the 2.5 (final) version it will be possible for the student to add his/her
-	own agenda items. The platform administrator can however decide if the students
-	are allowed to do this or not.
-	The alpha version only contains the three views. The personal agenda feature is
-	not yet completely finished. There are however already some parts of the code
-	for adding a personal agenda item present.
-	this code was not released in an official dokeos but was only used in the offical
-	server of the Ghent University where it underwent serious testing
-
-	-> version 1.5: Toon Van Hoecke, toon.vanhoecke@ugent.be, december 2003
-
-	-> version 1.0: Eric Remy, eremy@rmwc.edu, 6 Oct 2003
-	The tool was initially called master-calendar as it collects all the calendar
-	items of all the courses one is subscribed to. It was very soon integrated in
-	Dokeos as this was a really basic and very usefull tool.
-**/
-
-//	HEADER
 
 // name of the language file that needs to be included
 $language_file = 'agenda';
@@ -76,11 +35,11 @@ Display::display_header(get_lang('MyAgenda'));
 //	SETTING SOME VARIABLES
 
 // setting the database variables
-$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
-$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-$TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA);
+$TABLECOURS 		= Database :: get_main_table(TABLE_MAIN_COURSE);
+$TABLECOURSUSER 	= Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+$TABLEAGENDA 		= Database :: get_course_table(TABLE_AGENDA);
 $TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
+$tbl_personal_agenda= Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
 
 // the variables for the days and the months
 // Defining the shorts for the days
@@ -91,17 +50,17 @@ $DaysLong = api_get_week_days_long();
 $MonthsLong = api_get_months_long();
 
 /*
-  			TREATING THE URL PARAMETERS
-			1. The default values
-			2. storing it in the session
-			3. possible view
-				3.a Month view
-				3.b Week view
-				3.c day view
-				3.d personal view (only the personal agenda items)
-			4. add personal agenda
-			5. edit personal agenda
-			6. delete personal agenda
+	TREATING THE URL PARAMETERS
+	1. The default values
+	2. storing it in the session
+	3. possible view
+		3.a Month view
+		3.b Week view
+		3.c day view
+		3.d personal view (only the personal agenda items)
+	4. add personal agenda
+	5. edit personal agenda
+	6. delete personal agenda
 */
 
 // 1. The default values. if there is no session yet, we have by default the month view
@@ -118,51 +77,47 @@ if ($_SESSION['view']) {
 	switch ($_SESSION['view']) {
 		// 3.a Month view
 		case "month" :
-			$process = "month_view";
+			$process = 'month_view';
 			break;
 			// 3.a Week view
 		case "week" :
-			$process = "week_view";
+			$process = 'week_view';
 			break;
 			// 3.a Day view
 		case "day" :
-			$process = "day_view";
+			$process = 'day_view';
 			break;
 			// 3.a Personal view
 		case "personal" :
-			$process = "personal_view";
+			$process = 'personal_view';
 			break;
 	}
 }
 // 4. add personal agenda
-if (!empty($_GET['action']) && $_GET['action'] == "add_personal_agenda_item" and !$_POST['Submit'])
-{
+if (!empty($_GET['action']) && $_GET['action'] == 'add_personal_agenda_item' and !$_POST['Submit']) {
 	$process = "add_personal_agenda_item";
 }
-if (!empty($_GET['action']) && $_GET['action'] == "add_personal_agenda_item" and $_POST['Submit'])
-{
+if (!empty($_GET['action']) && $_GET['action'] == "add_personal_agenda_item" and $_POST['Submit']) {
 	$process = "store_personal_agenda_item";
 }
 // 5. edit personal agenda
-if (!empty($_GET['action']) && $_GET['action'] == "edit_personal_agenda_item" and !$_POST['Submit'])
-{
+if (!empty($_GET['action']) && $_GET['action'] == 'edit_personal_agenda_item' and !$_POST['Submit']) {
 	$process = "edit_personal_agenda_item";
 }
-if (!empty($_GET['action']) && $_GET['action'] == "edit_personal_agenda_item" and $_POST['Submit'])
-{
+if (!empty($_GET['action']) && $_GET['action'] == 'edit_personal_agenda_item'  and $_POST['Submit']) {
 	$process = "store_personal_agenda_item";
 }
 // 6. delete personal agenda
-if (!empty($_GET['action']) && $_GET['action'] == "delete" AND $_GET['id'])
-{
+if (!empty($_GET['action']) && $_GET['action'] == "delete" AND $_GET['id']) {
 	$process = "delete_personal_agenda_item";
 }
+
 // OUTPUT
 if (isset ($_user['user_id'])) {
 	// getting all the courses that this user is subscribed to
 	$courses_dbs = get_all_courses_of_user();
-	if (!is_array($courses_dbs)) // this is for the special case if the user has no courses (otherwise you get an error)
-	{
+	if (!is_array($courses_dbs)) {
+		// this is for the special case if the user has no courses (otherwise you get an error)
 		$courses_dbs = array ();
 	}
 	// setting and/or getting the year, month, day, week
@@ -173,13 +128,11 @@ if (isset ($_user['user_id'])) {
 		$year = $today['year'];
 	}
 	$month = (!empty($_GET['month'])? (int)$_GET['month']:NULL);
-	if ($month == NULL)
-	{
+	if ($month == NULL) {
 		$month = $today['mon'];
 	}
 	$day = (!empty($_GET['day']) ? (int)$_GET['day']:NULL);
-	if ($day == NULL)
-	{
+	if ($day == NULL) {
 		$day = $today['mday'];
 	}
 	$week = (!empty($_GET['week']) ?(int)$_GET['week']:NULL);
@@ -207,8 +160,7 @@ if (isset ($_user['user_id'])) {
 	echo "<td width=\"220\" valign=\"top\">";
 	$agendaitems = get_myagendaitems($courses_dbs, $month, $year);
 	$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
-	if (api_get_setting('allow_personal_agenda') == 'true')
-	{
+	if (api_get_setting('allow_personal_agenda') == 'true') {
 		$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
 	}
 	display_myminimonthcalendar($agendaitems, $month, $year, $monthName);
@@ -224,6 +176,7 @@ if (isset ($_user['user_id'])) {
 		case 'month_view' :
 			$agendaitems = get_myagendaitems($courses_dbs, $month, $year);
 			$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
+			
 			if (api_get_setting("allow_personal_agenda") == "true")
 			{
 				$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");

From 1a6a80ff9b616474733ca2dcbc7afbb79a7017fd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 16:52:33 +0200
Subject: [PATCH 25/63] Personal agenda events loaded in course agenda
 (partial) see CT#325

---
 main/calendar/agenda.inc.php | 240 ++++++++++++++++-------------------
 1 file changed, 111 insertions(+), 129 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 16be4d1c65..c48bbc3033 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -4,7 +4,7 @@
 
 /**
 	@author: Patrick Cool, patrick.cool@UGent.be
-	@author: Julio Montoya Lots of fixes
+	@author: Julio Montoya Lots of fixes - UI improvements
 	@version: 1.1
 	@todo: synchronisation with the function in myagenda.php (for instance: using one function for the mini_calendar
 
@@ -15,6 +15,8 @@
 	Reabability is also the reason why I use the if ($is_allowed_to_edit)
 	check for each part of the code. I'm aware that is duplication, but
 	it makes the code much easier to read.
+	
+	@todo this code should be clean as well as the myagenda.inc.php lots of function
 
 */
 
@@ -57,6 +59,7 @@ $(document).ready(function () {
 * @return array
 */
 function get_calendar_items($month, $year) {
+	
 	global $_user, $_course;
 	global $is_allowed_to_edit;
 	global $select_month, $select_year;
@@ -78,9 +81,7 @@ function get_calendar_items($month, $year) {
 
 	//$session_condition = intval($_SESSION['id_session'])==0 ? '' : ' AND agenda.session_id IN (0,'.intval($_SESSION['id_session']).') ';
 
-
-	/*		CONSTRUCT THE SQL STATEMENT
-	*/
+	/*		CONSTRUCT THE SQL STATEMENT */
 
     $start = 0;
     $stop = 0;
@@ -240,13 +241,28 @@ function get_calendar_items($month, $year) {
 	
 	$result=Database::query($sql) or die(Database::error());
 
-	/////////////////
 	$data=array();
-	while ($row=Database::fetch_array($result))
-	{
-		$datum_item=(int)substr($row["start_date"],8,2);
+	while ($row=Database::fetch_array($result, 'ASSOC')) {
+		$datum_item=(int)substr($row['start_date'],8,2);
+		$row['calendar_type'] = 'course';
 		$data[$datum_item][intval($datum_item)][] = $row;
-	}
+	}	
+	
+	//Check my personal calendar items	
+	if (api_get_setting('allow_personal_agenda') == 'true') {
+		$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);		
+		// 1. creating the SQL statement for getting the personal agenda items in MONTH view
+		$sql = "SELECT id, title, text as content , date as start_date, enddate as end_date, parent_event_id FROM ".$tbl_personal_agenda."
+					 WHERE user='".api_get_user_id()."' and MONTH(date)='".$month."' AND YEAR(date) = '".$year."'  ORDER BY date ASC";		
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result, 'ASSOC')) {			
+			$datum_item=intval(substr($row["start_date"],8,2));	
+			$row['calendar_type'] = 'personal';		
+			$data[$datum_item][$datum_item][] = $row;
+		}
+	}	
+	
+	
 	return $data;
 }
 
@@ -352,16 +368,14 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName)
 * @param integer $year: the 4-digit year indication e.g. 2005
 * @return html code
 */
-function display_monthcalendar($month, $year)
-{
+function display_monthcalendar($month, $year) {
 	global $MonthsLong;
 	global $DaysShort;
 	global $origin;
 
-	// grabbing all the calendar items for this year and storing it in a array
+	// Grabbing all the calendar items for this year and storing it in a array + my personal calendar events if exist and if enabled 
 	$data = get_calendar_items($month,$year);
-//	$data_global=get_global_calendar_items($month,$year);
-//	$data_global=get_global_agenda_items($agendaitems, $day, $month, $year, $week, $type);
+
 	//Handle leap year
 	$numberofdays = array(0,31,28,31,30,31,30,31,31,30,31,30,31);
 	if (($year%400 == 0) or ($year%4==0 and $year%100<>0)) $numberofdays[2] = 29;
@@ -376,50 +390,55 @@ function display_monthcalendar($month, $year)
 
 	   $maand_array_maandnummer=$month-1;
 
-	echo "<table class=\"data_table\">",
-		"<tr>",
-		"<th width=\"10%\"><a href=\"",$backwardsURL,"\"> ".Display::return_icon('action_prev.png',get_lang('Previous'))." </a></th>",
-		"<th width=\"80%\" colspan=\"5\">",$MonthsLong[$maand_array_maandnummer]," ",$year,"</th>",
-		"<th width=\"10%\"><a href=\"",$forewardsURL,"\"> ".Display::return_icon('action_next.png',get_lang('Next'))." </a></th>",
-		"</tr>";
+	echo '<table id="agenda_list">';
+	echo '<tr>';
+	echo '<th width="10%"><a href="'.$backwardsURL.'">'.Display::return_icon('action_prev.png',get_lang('Previous')).'</a></th>';
+	echo '<th width="80%" colspan="5">'.$MonthsLong[$maand_array_maandnummer].$year.'</th>';
+	echo '<th width="10%"><a href="'.$forewardsURL.'"> '.Display::return_icon('action_next.png',get_lang('Next')).'</a></th>';
+	echo '</tr>';
 
-	echo "<tr>";
+	echo '<tr>';
 	for ($ii=1;$ii<8; $ii++) {
-		echo "<td class=\"weekdays\" width=\"14%\">",$DaysShort[$ii%7],"</td>";
+		echo '<td class="weekdays" width="14%">'.$DaysShort[$ii%7].'</td>';
 	}
 
-	echo "</tr>";
+	echo '</tr>';
 	$curday = -1;
 	$today = getdate();
-	echo '<pre>';
-	//print_r($data);
+		
 	while ($curday <= $numberofdays[$month]) {
 		echo '<tr>';
 			//week
 	    	for ($ii=0; $ii<7; $ii++) {	    		
-		  		if (($curday == -1)&&($ii==$startdayofweek)) {
+		  		if (($curday == -1) && ($ii==$startdayofweek)) {
 		    		$curday = 1;
 				}
 				
 				if (($curday>0)&&($curday<=$numberofdays[$month])) {
 					
-					$bgcolor = $ii<5 ? "class=\"row_odd\"" : "class=\"row_even\"";
+					$bgcolor = $ii<5 ? 'class="row_odd"' : 'class="row_even"';
 					$dayheader = "$curday";
 					
 					if (key_exists($curday, $data)) {					
-						foreach ($data[$curday] as $key=>$agenda_item) {							
-							foreach ($agenda_item as $key=>$value) {							
+						foreach ($data[$curday] as $key=>$agenda_item) {						
+							foreach ($agenda_item as $key=>$value) {						
 								$month_start_date = (int)substr($value['start_date'],5,2);	
 								$start_time = api_convert_and_format_date($value['start_date']);												
 								if ($month == $month_start_date) {
 									
 									$start_time = api_convert_and_format_date($value['start_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
-									$end_time = api_convert_and_format_date($value['end_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
+									$end_time 	= api_convert_and_format_date($value['end_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
+									
+									$personal_start =  $personal_end = '';
 									
-									$dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
+									if ($value['calendar_type'] == 'personal') {
+										$personal_start = '<div style="color:green;">';
+										$personal_end	= '</div>';	
+									}
+									$dayheader = $personal_start;
+									$dayheader.="<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
 									
-									if ($value['end_date']=='0000-00-00 00:00:00'){
-										
+									if ($value['end_date']=='0000-00-00 00:00:00') {										
 										$dayheader .= '<br />'.get_lang('Work').'<br />';
 										$dayheader .= $value['title'];
 										$dayheader .= '<br/>';
@@ -428,31 +447,31 @@ function display_monthcalendar($month, $year)
 										$dayheader .= '<br />';
 										$dayheader .= $value['title'];
 										$dayheader .= '<br/>';
-									}								
+									}
+									$dayheader .= $personal_end;								
 								} else {
 									//$dayheader=$curday;
 								}
-									//$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view");
-									//echo $agendaitems['title'];
+								//$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view");
+								//echo $agendaitems['title'];
 							}
 						}
 					}
 					
 					if (($curday==$today['mday']) && ($year ==$today['year'])&&($month == $today['mon'])) {
-						echo "<td id=\"today\" ",$bgcolor,"\">".$dayheader;
+						echo '<td class="days_today"'.$bgcolor.'" style="width:10%">'.$dayheader;
 	      			} else {
-						echo "<td id=\"days\" ",$bgcolor,"\">".$dayheader;
-					}
-					
-					echo "</td>";
+						echo '<td class="days_week"'.$bgcolor.'" style="width:10%">'.$dayheader;
+					}					
+					echo '</td>';
 		      		$curday++;
 			} else {
-				echo "<td>&nbsp;</td>";
+				echo '<td>&nbsp;</td>';
 			}
 		}
-	echo "</tr>";
+	echo '</tr>';
     } // end while
-	echo "</table>";
+	echo '</table>';
 }
 
 
@@ -1723,11 +1742,13 @@ function showhide_agenda_item($id)
 * Displays all the agenda items
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @author Yannick Warnier <yannick.warnier@dokeos.com> - cleanup
+* @author Julio Montoya <gugli100@gmail.com> - More cleanup
 */
-function display_agenda_items()
-{ 
-	global $TABLEAGENDA;
-	global $TABLE_ITEM_PROPERTY;
+function display_agenda_items() {
+	 
+	$TABLEAGENDA		 = Database::get_course_table(TABLE_AGENDA);
+	$TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
+	
 	global $select_month, $select_year;
 	global $DaysShort, $DaysLong, $MonthsLong;
 	global $is_courseAdmin;
@@ -1739,32 +1760,26 @@ function display_agenda_items()
 	// getting the name of the groups
 	$group_names = get_course_groups();
 
-	/*--------------------------------------------------
+	/*
 			CONSTRUCT THE SQL STATEMENT
-	  --------------------------------------------------*/
+	 */
 
     $start = 0;
     $stop = 0;
 	// this is to make a difference between showing everything (all months) or only the current month)
 	// $show_all_current is a part of the sql statement
-	if ($_SESSION['show']!=="showall")
-	{
+	if ($_SESSION['show']!=="showall") {
 		$show_all_current=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
         $start = mktime(0,0,0,$select_month,1,$select_year);
         $stop = 0;
         if(empty($select_year)){$select_year = date('Y');}
         if(empty($select_month)){$select_month = date('m');}
-        if($select_month==12)
-        {
+        if($select_month==12) {
             $stop = mktime(0,0,0,1,1,$select_year+1)-1;
-        }
-        else
-        {
+        } else {
             $stop = mktime(0,0,0,$select_month+1,1,$select_year)-1;
         }
-	}
-	else
-	{
+	} else {
 		$show_all_current="";
         $start = time();
         $stop = mktime(0,0,0,1,1,2038);//by default, set year to maximum for mktime()
@@ -1772,16 +1787,13 @@ function display_agenda_items()
 
 	// by default we use the id of the current user. The course administrator can see the agenda of other users by using the user / group filter
 	$user_id=$_user['user_id'];
-	if ($_SESSION['user']!==null)
-	{
+	if ($_SESSION['user']!==null) {
 		$user_id=intval($_SESSION['user']);
 	}
-	if ($_SESSION['group']!==null)
-	{
+	if ($_SESSION['group']!==null) {
 		$group_id=intval($_SESSION['group']);
 	}
-	if ($_SESSION['toolgroup']!==null)
-	{
+	if ($_SESSION['toolgroup']!==null) {
 		$group_id=intval($_SESSION['toolgroup']);
 	}
 
@@ -1795,31 +1807,25 @@ function display_agenda_items()
 	$session_id = api_get_session_id();
 	$session_condition = api_get_session_condition($session_id);
 
-	if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))
-	{
+	if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) {
 		// A.1. you are a course admin with a USER filter
 		// => see only the messages of this specific user + the messages of the group (s)he is member of.
-		if (!empty($_SESSION['user']))
-		{
+		if (!empty($_SESSION['user'])) {
 			$group_memberships=GroupManager::get_group_ids($_course['dbName'],$_SESSION['user']);
 
 			$show_user =true;
 			$new_group_memberships=array();
-			foreach($group_memberships as $id)
-			{
+			foreach($group_memberships as $id) {
 				// did i have access to the same
 				$has_access = GroupManager::user_has_access(api_get_user_id(),$id,GROUP_TOOL_CALENDAR);
 				$result = GroupManager::get_group_properties($id);
-
-				if ($has_access && $result['calendar_state']!='0' )
-				{
+				if ($has_access && $result['calendar_state']!='0' ) {
 					$new_group_memberships[]=$id;
 				}
 			}
 			$group_memberships = $new_group_memberships;
 
-			if (is_array($group_memberships) && count($group_memberships)>0)
-			{
+			if (is_array($group_memberships) && count($group_memberships)>0) {
 				$sql="SELECT
 					agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1829,9 +1835,7 @@ function display_agenda_items()
 					AND ip.visibility='1'
 					$session_condition
 					ORDER BY start_date ".$_SESSION['sort'];
-			}
-			else
-			{
+			} else {
 					$sql="SELECT
 					agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1845,23 +1849,19 @@ function display_agenda_items()
 		}
 		// A.2. you are a course admin with a GROUP filter
 		// => see only the messages of this specific group
-		elseif (!empty($_SESSION['group']))
-		{
-
+		elseif (!empty($_SESSION['group'])) {
 			if (!empty($group_id)) {
 				$result = GroupManager::get_group_properties($group_id);
 				$has_access = GroupManager::user_has_access(api_get_user_id(),$group_id,GROUP_TOOL_CALENDAR);
 				//echo '<pre>';print_R($result);
 
 				// lastedit
-				if (!$has_access || $result['calendar_state']=='0' )
-				{
+				if (!$has_access || $result['calendar_state']=='0' ) {
 					$group_id=0;
 				}
 			}
 
-			$sql="SELECT
-				agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
+			$sql="SELECT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 				FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
 				WHERE agenda.id = ip.ref  ".$show_all_current."
 				AND ip.tool='".TOOL_CALENDAR_EVENT."'
@@ -1873,13 +1873,10 @@ function display_agenda_items()
 				//removed 	- > AND toolitemproperties.visibility='1'
 		}
 		// A.3 you are a course admin without any group or user filter
-		else
-		{
-
+		else {
 			// A.3.a you are a course admin without user or group filter but WITH studentview
 			// => see all the messages of all the users and groups without editing possibilities
-			if ($_GET['isStudentView']=='true')
-			{
+			if ($_GET['isStudentView']=='true') {
 				$sql="SELECT
 					agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1892,13 +1889,11 @@ function display_agenda_items()
 
 			}
 			// A.3.b you are a course admin or a student
-			else
-			{
+			else {
 				// A.3.b.1 you are a course admin without user or group filter and WITHOUT studentview (= the normal course admin view)
 				// 	=> see all the messages of all the users and groups with editing possibilities
 
-				 if (api_is_course_admin())
-				 {
+				 if (api_is_course_admin()) {
 					 $sql="SELECT
 						agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 						FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1908,9 +1903,7 @@ function display_agenda_items()
 						$session_condition
 						GROUP BY ip.ref
 						ORDER BY start_date ".$_SESSION['sort'];
-				 }
-				 else
-				 {
+				 } else {
 				 	// A.3.b.2 you are a student with no group filter possibly showall
 				 	//when showing all the events we do not show the group events
 				 	//todo showing ALL events including the groups events that are available
@@ -1924,7 +1917,6 @@ function display_agenda_items()
 						GROUP BY ip.ref
 						ORDER BY start_date ".$_SESSION['sort'];
 
-
 					/*
 				 	if (is_array($group_memberships) && count($group_memberships)>0)
 				 	{
@@ -1959,10 +1951,8 @@ function display_agenda_items()
 	} //if (is_allowed_to_edit() OR( api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))
 
 	// B. you are a student
-	else
-	{
-		if (is_array($group_memberships) and count($group_memberships)>0)
-		{
+	else {
+		if (is_array($group_memberships) and count($group_memberships)>0) {
 			$sql="SELECT
 				agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 				FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1972,11 +1962,8 @@ function display_agenda_items()
 				AND ip.visibility='1'
 				$session_condition
 				ORDER BY start_date ".$_SESSION['sort'];
-		}
-		else
-		{
-			if ($_user['user_id'])
-			{
+		} else {
+			if ($_user['user_id']) {
 				$sql="SELECT
 					agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -1986,9 +1973,7 @@ function display_agenda_items()
 					AND ip.visibility='1'
 					$session_condition
 					ORDER BY start_date ".$_SESSION['sort'];
-			}
-			else
-			{
+			} else {
 				$sql="SELECT
 					agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." ip
@@ -2005,36 +1990,34 @@ function display_agenda_items()
 	//echo "<pre>".$sql."</pre>";
 	$result=Database::query($sql) or die(Database::error());
 	$number_items=Database::num_rows($result);
-
-	/*--------------------------------------------------
+			
+	/*
 			DISPLAY: NO ITEMS
-	  --------------------------------------------------*/
-	if ($number_items==0)
-	{
+	*/
+	if ($number_items==0) {
         echo "<table class=\"data_table\" ><tr><td>".get_lang("NoAgendaItems")."</td></tr></table>";
 	}
 
-	/*--------------------------------------------------
+	/*
 			DISPLAY: THE ITEMS
-	  --------------------------------------------------*/
+	 */
 
     $month_bar="";
     $event_list="";
     $counter=0;
-    $export_icon = 'export.png';
-    $export_icon_low = 'export_low_fade.png';
+    $export_icon 	  = 'export.png';
+    $export_icon_low  = 'export_low_fade.png';
     $export_icon_high = 'export_high_fade.png';
 
     while($myrow=Database::fetch_array($result)) {
     	$is_repeated = !empty($myrow['parent_event_id']);
 	    echo '<table class="data_table">';
-        /*--------------------------------------------------
+        /*
         		display: the month bar
-         --------------------------------------------------*/
+         */
         // Make the month bar appear only once.
         $myrow["start_date"] = api_get_local_time($myrow["start_date"], null, date_default_timezone_get());
-        if ($month_bar != api_format_date($myrow["start_date"], "%m%Y"))
-		{
+        if ($month_bar != api_format_date($myrow["start_date"], "%m%Y")) {
             $month_bar = api_format_date($myrow["start_date"], "%m%Y");
 			echo "<tr><td class=\"agenda_month_divider\" colspan=\"3\" valign=\"top\">".
 			api_format_date($myrow["start_date"], "%B %Y").
@@ -2048,8 +2031,7 @@ function display_agenda_items()
 
     	// highlight: if a date in the small calendar is clicked we highlight the relevant items
     	$db_date = (int)api_format_date($myrow["start_date"], "%d").intval(api_format_date($myrow["start_date"], "%m")).api_format_date($myrow["start_date"], "%Y");
-    	if ($_GET["day"].$_GET["month"].$_GET["year"] <>$db_date)
-    	{
+    	if ($_GET["day"].$_GET["month"].$_GET["year"] <>$db_date) {
     		if ($myrow['visibility']=='0')
     		{
     			$style="data_hidden";
@@ -4705,8 +4687,8 @@ function get_global_agenda_items($agendaitems, $day = "", $month = "", $year = "
 		$sql = " SELECT * FROM ".$tbl_global_agenda." WHERE start_date>='".$start_filter."' AND start_date<='".$end_filter."'";
 	}
 	$result = Database::query($sql);
-	while ($item = Database::fetch_array($result))
-	{
+	
+	while ($item = Database::fetch_array($result)) {
 		// we break the date field in the database into a date and a time part
 		$agenda_db_date = explode(" ", $item['start_date']);
 		$date = $agenda_db_date[0];

From 3994cc4814fdf9f451572ccaf4fa72ea601b04fd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 16:53:06 +0200
Subject: [PATCH 26/63] Cleaning code

---
 main/calendar/agenda.php       | 13 +++++--------
 main/calendar/myagenda.inc.php | 13 ++++++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index 59d24702a9..399a106301 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -198,16 +198,13 @@ echo '<a name="top"></a>';
 //setting the default year and month
 $select_year = '';
 $select_month = '';
-if(!empty($_GET['year']))
-{
+if(!empty($_GET['year'])) {
 	$select_year = (int)$_GET['year'];
 }
-if(!empty($_GET['month']))
-{
+if(!empty($_GET['month'])) {
 	$select_month = (int)$_GET['month'];
 }
-if (empty($select_year) && empty($select_month))
-{
+if (empty($select_year) && empty($select_month)) {
 	$today = getdate();
 	$select_year = $today['year'];
 	$select_month = $today['mon'];
@@ -384,7 +381,7 @@ if (!$_GET['action'] || $_GET['action']=="showall"  || $_GET['action']=="showcur
 	if ($_GET['origin'] != 'learnpath') {
 		if (!$_SESSION['view'] || $_SESSION['view'] <> 'month') {
             if(!empty($_GET['agenda_id'])) {
-                display_one_agenda_item((int)$_GET['agenda_id']);
+                display_one_agenda_item($_GET['agenda_id']);
             } else {
 			   display_agenda_items();
             }
@@ -405,4 +402,4 @@ if ($_GET['origin'] != 'learnpath')
 {
 	Display::display_footer();
 }
-?>
+?>
\ No newline at end of file
diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index bfd3345b6e..d4e981008f 100755
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -163,14 +163,17 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
 	$backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;action=view&amp;view=month&amp;month=". ($month == 1 ? 12 : $month -1)."&amp;year=". ($month == 1 ? $year -1 : $year);
 	$forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&amp;courseCode=".Security::remove_XSS($g_cc)."&amp;action=view&amp;view=month&amp;month=". ($month == 12 ? 1 : $month +1)."&amp;year=". ($month == 12 ? $year +1 : $year);
 
-	echo "<table class=\"data_table\">", "<tr>", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>";
-	echo "<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>", "<th width=\"10%\"><a href=\"", $forewardsURL, "\">".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
+	echo '<table id="agenda_list">'.'<tr>';
+	echo '<th width="10%"><a href="'.$backwardsURL.'">'.Display::return_icon('action_prev.png',get_lang('Previous')).'</a></th>';
+	echo '<th width="80%" colspan="5">'.$monthName." ".$year.'</th>';
+	echo '<th width="10%"><a href="'.$forewardsURL.'">'.Display::return_icon('action_next.png',get_lang('Next')).'</a></th>';
+	echo '</tr>';
 
-	echo "<tr>";
+	echo '<tr>';
 	for ($ii = 1; $ii < 8; $ii ++) {
-		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+		echo '<td class="weekdays">'.$DaysShort[$ii % 7].'</td>';
 	}
-	echo "</tr>";
+	echo '</tr>';
 	$curday = -1;
 	$today = getdate();
 	while ($curday <= $numberofdays[$month]) {

From 9fc755e1d79fc8123bd830a18b6d28692537356d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 17:03:12 +0200
Subject: [PATCH 27/63] Updating CSS stylesheet

---
 main/css/academica/default.css          |  35 +++
 main/css/baby_orange/default.css        |  35 +++
 main/css/blue_lagoon/default.css        |  17 +-
 main/css/chamilo/default.css            |  19 +-
 main/css/chamilo_green/default.css      |  17 +-
 main/css/chamilo_red/default.css        |  17 +-
 main/css/cool_blue/default.css          |  16 +-
 main/css/corporate/default.css          |  36 +--
 main/css/cosmic_campus/default.css      |  33 +++
 main/css/delicious_bordeaux/default.css |  17 +-
 main/css/dokeos_blue/default.css        |  17 +-
 main/css/dokeos_classic/default.css     |  18 +-
 main/css/dokeos_classic_2D/default.css  |  39 ++--
 main/css/empire_green/default.css       |  17 +-
 main/css/fruity_orange/default.css      |  17 +-
 main/css/medical/default.css            |  17 +-
 main/css/public_admin/default.css       |  17 +-
 main/css/royal_purple/default.css       |  17 +-
 main/css/silver_line/default.css        | 295 +++++++++++++++++-------
 main/css/sober_brown/default.css        |  40 +---
 main/css/steel_grey/default.css         |  17 +-
 main/css/tasty_olive/default.css        |  17 +-
 22 files changed, 535 insertions(+), 235 deletions(-)

diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index 87da2ee522..3cc0712d2b 100755
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -643,6 +643,41 @@ form span.form_error {
 	padding: 2px 10px;
 	text-align: center;
 }
+/* The cells for the days (1->31) */
+#agenda_list .days_week {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #f5f5f5;
+}
+#agenda_list .days_weekend {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #e6e6e6;
+}
+#agenda_list .days_today {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 6023f82366..0bb1a0b4fb 100755
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -613,6 +613,41 @@ form span.form_error {
 	text-align: center;
 	border:1px solid #EE4C03;
 }
+/* The cells for the days (1->31) */
+#agenda_list .days_week {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #f5f5f5;
+}
+#agenda_list .days_weekend {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #e6e6e6;
+}
+#agenda_list .days_today {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /*The caption of the calendar (displays the month and the << and >> links*/
 #agenda_list .title {
 	background-color: #680157;
diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 958f5e161c..d59cf15a0c 100755
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -701,7 +701,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -710,7 +710,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -719,12 +719,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index 407a1bc887..3e893087f6 100755
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -1014,7 +1014,7 @@ input.liteoption {
 	text-align: center;
 }
 /* The cells with the name of the days of the weeks (mon->sun)*/
-#agenda_list .weekdays {
+#agenda_list .weekdays, .data_table .weekdays {
 	background-color: #dcdcdc;
 	text-align: center;
 	font-weight: bold;
@@ -1027,7 +1027,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -1036,7 +1036,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -1045,12 +1045,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css
index 9aa4baa29c..6746d7bf04 100755
--- a/main/css/chamilo_green/default.css
+++ b/main/css/chamilo_green/default.css
@@ -1031,7 +1031,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -1040,7 +1040,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -1049,12 +1049,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css
index d1fd6bee98..80483bbbc6 100755
--- a/main/css/chamilo_red/default.css
+++ b/main/css/chamilo_red/default.css
@@ -1025,7 +1025,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -1034,7 +1034,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -1043,12 +1043,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css
index b11a8b8df5..550a6f227e 100755
--- a/main/css/cool_blue/default.css
+++ b/main/css/cool_blue/default.css
@@ -680,7 +680,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -689,7 +689,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -698,11 +698,15 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
 }
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index 6c07e210b4..535b77333e 100755
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -607,34 +607,40 @@ form span.form_error {
 	border: 1px solid #CCCCCC;
 	border-collapse: collapse;
 }
+
 /* The cells for the days (1->31) */
-.days_week {
+#agenda_list .days_week {
 	height: 40px;
 	width: 12%;
-	border: 1px solid #CCCCCC;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #f9f9f9;
+	background-color: #f5f5f5;
 }
-.days_weekend {
+#agenda_list .days_weekend {
 	height: 40px;
 	width: 12%;
-	border: 1px solid #CCCCCC;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #eaeaea;
+	background-color: #e6e6e6;
 }
-.days_today {
+#agenda_list .days_today {
 	height: 40px;
 	width: 12%;
-	border: 1px solid #CCCCCC;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
-.agenda_month_divider {
-	background-color: #666;
-	color: #fff;
-	text-align: center;
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
 }
 /*The caption of the calendar (displays the month and the << and >> links*/
 #agenda_list .title {
diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css
index 23bb73c43a..48d9c71564 100755
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@@ -692,6 +692,39 @@ form span.form_error {
 	padding: 2px 10px;
 	text-align: center;
 }
+#agenda_list .days_week {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #f5f5f5;
+}
+#agenda_list .days_weekend {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #e6e6e6;
+}
+#agenda_list .days_today {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css
index ca46463de8..fb17a3a1c9 100755
--- a/main/css/delicious_bordeaux/default.css
+++ b/main/css/delicious_bordeaux/default.css
@@ -699,7 +699,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -708,7 +708,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -717,12 +717,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css
index 253250ba4a..6f89dc9386 100755
--- a/main/css/dokeos_blue/default.css
+++ b/main/css/dokeos_blue/default.css
@@ -685,7 +685,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -694,7 +694,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -703,12 +703,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index 4c11a63fe8..ae6a60abfe 100755
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -743,13 +743,14 @@ input.liteoption {
 	border: 1px solid #264269;
 	border-collapse: collapse;
 }
+
 /* The cells for the days (1->31) */
 #agenda_list .days_week {
 	height: 40px;
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -758,7 +759,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -767,12 +768,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css
index baf6ff8dea..157c27dcb5 100755
--- a/main/css/dokeos_classic_2D/default.css
+++ b/main/css/dokeos_classic_2D/default.css
@@ -699,32 +699,41 @@ input.liteoption {
 	font-weight: bold;
 	text-align: center;
 }
-#agenda_list .days_week, #agenda_list .days_weekend, #agenda_list .days_today {
-	border: 1px solid #264269;
-	border-collapse: collapse;
+/* The cells for the days (1->31) */
+#agenda_list .days_week {
 	height: 40px;
+	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	width: 12%;
-}
-/* The cells for the days (1->31) */
-#agenda_list .days_week {
+	border: 1px solid #ccc;
+	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
 #agenda_list .days_weekend {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
 #agenda_list .days_today {
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
-}
-#agenda_list .data, #agenda_list .datanotbold, #agenda_list .text, #agenda_list .data_hidden, #agenda_list .datanotbold_hidden, #agenda_list .text_hidden, #agenda_list .datanow, #agenda_list .datanotboldnow, #agenda_list .textnow {
-	border: 0px solid #4171B5;
-	border-collapse: collapse;
-	padding: 2px 10px;
+	height: 40px;
+	width: 12%;
 	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
 }
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css
index 09bfe6d5cd..1c25405afa 100755
--- a/main/css/empire_green/default.css
+++ b/main/css/empire_green/default.css
@@ -696,7 +696,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -705,7 +705,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -714,12 +714,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css
index 96924df2a9..5be0fb7068 100755
--- a/main/css/fruity_orange/default.css
+++ b/main/css/fruity_orange/default.css
@@ -695,7 +695,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -704,7 +704,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -713,12 +713,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/medical/default.css b/main/css/medical/default.css
index 9abdbcd2e9..e352e86216 100755
--- a/main/css/medical/default.css
+++ b/main/css/medical/default.css
@@ -782,7 +782,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -791,7 +791,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -800,12 +800,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index 578f9bca72..155abe0d66 100755
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -793,7 +793,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -802,7 +802,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -811,12 +811,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css
index eb652660d8..e2e8b9d74d 100755
--- a/main/css/royal_purple/default.css
+++ b/main/css/royal_purple/default.css
@@ -693,7 +693,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -702,7 +702,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -711,12 +711,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css
index 753ebf31d5..e658f8d8d0 100755
--- a/main/css/silver_line/default.css
+++ b/main/css/silver_line/default.css
@@ -830,124 +830,251 @@ div.row div.label {
     AGENDA
 ==============================================================================
 */
-
-#agenda_list {
+#agenda {
+	width: 100%;
 	margin: 0 auto;
-	width: 95%;
+	border: 1px solid #bbb;
+	border-collapse: collapse;
 }
-#agenda_list .datanow {
-	background: #ddd url('images/headertables.jpg') repeat-x top center;
-	border: 1px solid #ddd;
-	vertical-align: top;
+.agenda_month_divider {
+	background-color: #dcdcdc;
+	font-weight: bold;
+	color: #666;
+	text-align: center;
 }
-#agenda_list img {
-	margin-right: .8em;
+#agenda .title a {
+	color: #fff;
 }
-#agenda_list td.data img, #agenda_list td.datanow img {
-	margin-bottom: -.6em;
-	margin-top: -.3em;
+#agenda .agendaitem {
 }
-#agenda_list td.textnow {
-	border: 1px solid #bbb;
-	background-color: #eee;
-	padding: .5em;
+#smallcalendar .title {
+	background-color: #dcdcdc;
+	font-weight: bold;
+	padding: 2px;
+	color: #666;
+	text-align: center;
+	font-size: 11px;
 }
-#agenda_list tr, #agenda_list td {
-	width: auto;
-	border: none;
+#smallcalendar .title a {
+	color: #666;
 }
-#agenda_list tr.data, #agenda_list td.data, .data {
-	background: transparent url('images/headertables.jpg') repeat-x top  center;
-	vertical-align: top;
-	border: 1px solid #ddd;
+#agenda_select {
+	list-style: none;
+	border: 0px solid green;
+	margin: 30px 0 0 0;
+	padding: 0 0 0 10px;
 }
-#agenda_list tr.text, #agenda_list td.text, .text {
-	border: 1px solid #ddd;
+/* ---------------------------------------------------
+	styles for the agenda (day, week, month view)
+-----------------------------------------------------*/
+#agenda_list {
+	width: 100%;
+	margin: 0 auto;
+	border: 1px solid #fff;
+	border-collapse: collapse;
 }
-.agenda_month_divider {
+/*The caption of the calendar (displays the month and the << and >> links*/
+#agenda_list .title {
+	background-color: #dcdcdc;
+	font-weight: bold;
+	color: #666;
+	text-align: left;
+	padding: 2px 10px;
 	text-align: center;
-	background: #fff url("images/divider2.jpg") no-repeat 50% 1.3em;
-	height: 2.8em;
+	border: 1px solid #bbb;
 }
-.agenda_month_divider, .title {
-	font: bold 1.2em Arial, sans-serif, sans;
-	color: #4170b4;
+#agenda_list .title a:link, #agenda_list #title a:visited {
+	background-color: #dcdcdc;
+	font-weight: bold;
+	font-size: 11px;
+	color: #666;
+	padding: 2px 10px;
 	text-align: center;
 }
-#agenda_select img {
-	margin-right: .2em;
+#agenda_list .title a:hover {
+	background-color: #dcdcdc;
+	font-weight: bold;
+	font-size: 11px;
+	color: #f3840d;
+	padding: 2px 10px;
+	text-align: center;
 }
-#agenda_select li {
-	margin-bottom: .6em;
-	font: bold 1em Arial, sans-serif, sans;
+/* The cells with the name of the days of the weeks (mon->sun)*/
+#agenda_list .weekdays {
+	background-color: #dcdcdc;
+	text-align: center;
+	font-weight: bold;
+	border: 1px solid #264269;
+	border-collapse: collapse;
 }
-#agenda_select li a {
-	font: bold 1em Arial, sans-serif, sans;
-	text-decoration: none;
+/* The cells for the days (1->31) */
+#agenda_list .days_week {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #f5f5f5;
 }
-.alternativeBgLight {
-	background-color: #ccc;
+#agenda_list .days_weekend {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #e6e6e6;
 }
-.announcements_datum {
-	color: #888;
-	border: 1px solid #ddd;
+#agenda_list .days_today {
+	height: 40px;
+	width: 12%;
+	text-align: left;
+	vertical-align: top;
+	border: 1px solid #ccc;
+	border-collapse: collapse;
+	background-color: #FFFFC0;	
+}
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
+/* text in the cells: display of agenda items (visible)*/
+#agenda_list .data {
 	background-color: #eee;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: bold;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-.data, .announcements_datum, .datanow {
-	font: bold 1em Arial, sans-serif, sans;
+#agenda_list .datanotbold {
+	background-color: #eee;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-.datanotbold {
+#agenda_list .text {
+	background-color: #fff;
+	text-align: left;
+	padding: 2px 10px;
 	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-span.agendaitem {
-	text-align: center;
-	display: block;
-	font-size: 95%;
-	width: 90%;
-	margin: 0 auto;
-	font-size: .9em;
+/*text in the cells: display of agenda items (invisible)*/
+#agenda_list .data_hidden {
+	background-color: #eee;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: bold;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
+	color: #999999;
 }
-span.agendaitem i {
-	font: bold 97% Arial, sans-serif, sans;
-	color: #a9a;
+#agenda_list .datanotbold_hidden {
+	background-color: #eee;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
+	color: #999999;
 }
-/* Calendar */
-.days_today {
-	font: bold 1em Arial, sans-serif, sans;
-	text-decoration: none;
-	color: #667;
+#agenda_list .text_hidden {
+	background-color: #fff;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
+	color: #999999;
 }
-.days_week {
-	background-color: #ccc;
+/*text in the cells: display of agenda items (highlighted)*/
+#agenda_list .datanow {
+	background-color: #FFCC00;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: bold;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-.days_week, .days_weekend, .days_today {
-	text-align: center;
+#agenda_list .datanotboldnow {
+	background-color: #FFCC00;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-.days_week a, .days_weekend a {
-	font: bold 1em Arial, sans-serif, sans;
+#agenda_list .textnow {
+	background-color: #fff;
+	text-align: left;
+	padding: 2px 10px;
+	font-weight: normal;
+	border: 0px solid #dcdcdc;
+	border-collapse: collapse;
 }
-.days_weekend {
-	background-color: #aaa;
+/* ---------------------------------------------------
+	styles for the mini agenda
+-----------------------------------------------------*/
+#smallcalendar {
+	width: 100%;
+	margin: 0 auto;
+	border: 1px solid #fff;
+	border-collapse: collapse;
 }
-.days_weekend .agendaitem i {
-	color: #444;
+#smallcalendar .weekdays {
+	background-color: #dcdcdc;
+	text-align: center;
+	font-size: 11px;
+	font-weight: bold;
+	border: 1px solid #fff;
+	border-collapse: collapse;
 }
-#newedit_form tr.title {
-	background:none;
-	text-align:left;
+#smallcalendar .days_week {
+	background-color: #f5f5f5;
+	text-align: center;
+	font-size: 11px;
+	border-collapse: collapse;
 }
-.title {
-	background: #ddd url('images/headertables.jpg') repeat-x top center;
+#smallcalendar .days_weekend {
+	background-color: #e6e6e6;
+	text-align: center;
+	font-size: 11px;
+	border: 1px solid #fff;
+	border-collapse: collapse;
 }
-.weekdays {
-	font: bold 1.1em Arial, sans-serif, sans;
-	color: #fff;
-	background-color: #667;
+#smallcalendar .days_today {
+	width: 12%;
 	text-align: center;
+	font-size: 11px;
+	border: 1px solid #FA8500;
+	border-collapse: collapse;
+	background-color: #FFCA8D;
 }
-.ical_export {
-	float: right;
-	margin-top: 0.2em;
+/* ---------------------------------------------------
+	styles for the personal agenda
+-----------------------------------------------------*/
+.personal_agenda {
+	color: #008000;
+}
+.personal_agenda a:link, .personal_agenda a:visited {
+	color: #008000;
+}
+a.personal_agenda:link, a.personal_agenda:visited {
+	color: #008000;
+}
+.personal_agenda a:hover, .personal_agenda a:hover {
+	color: #666666;
+}
+a.personal_agenda:hover, a.personal_agenda:hover {
+	color: #666666;
 }
 /*
 ==============================================================================
diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css
index 27c213f015..4e959d538a 100755
--- a/main/css/sober_brown/default.css
+++ b/main/css/sober_brown/default.css
@@ -766,7 +766,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -775,7 +775,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -784,37 +784,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
-	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
-}
-/* text in the cells: display of agenda items (visible)*/
-#agenda_list .data {
-	background-color: #eee;
-	text-align: left;
-	padding: 2px 10px;
-	font-weight: bold;
-	border: 0px solid #dcdcdc;
-	border-collapse: collapse;
-}
-#agenda_list .datanotbold {
-	background-color: #eee;
-	text-align: left;
-	padding: 2px 10px;
-	font-weight: normal;
-	border: 0px solid #dcdcdc;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
+	background-color: #FFFFC0;	
 }
-#agenda_list .text {
-	background-color: #fff;
-	text-align: left;
-	padding: 2px 10px;
-	font-weight: normal;
-	border: 0px solid #dcdcdc;
-	border-collapse: collapse;
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
 }
+
 /*text in the cells: display of agenda items (invisible)*/
 #agenda_list .data_hidden {
 	background-color: #eee;
diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css
index 6fd1d14d29..08abb84f24 100755
--- a/main/css/steel_grey/default.css
+++ b/main/css/steel_grey/default.css
@@ -698,7 +698,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -707,7 +707,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -716,12 +716,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;
diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css
index 4da454f56d..5b0f8b330d 100755
--- a/main/css/tasty_olive/default.css
+++ b/main/css/tasty_olive/default.css
@@ -695,7 +695,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #f5f5f5;
 }
@@ -704,7 +704,7 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
 	background-color: #e6e6e6;
 }
@@ -713,12 +713,17 @@ input.liteoption {
 	width: 12%;
 	text-align: left;
 	vertical-align: top;
-	border: 1px solid #264269;
+	border: 1px solid #ccc;
 	border-collapse: collapse;
-	background-color: #FFCA8D;
-	color: #CC3300;
-	font-weight: bold;
+	background-color: #FFFFC0;	
 }
+
+#agenda_list th {
+	background-color:#E5EDF9;
+	border:1px solid gray;
+	padding-right:12px;
+}
+
 /* text in the cells: display of agenda items (visible)*/
 #agenda_list .data {
 	background-color: #eee;

From 47f8118c47b2a0628b04e7ff1ec9174cadd9c4ff Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 17:11:31 +0200
Subject: [PATCH 28/63] Minor -  cleaning code

---
 main/inc/lib/groupmanager.lib.php | 36 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index bddc3288bc..9d2b821075 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -1292,15 +1292,14 @@ class GroupManager {
 		$user_id = Database::escape_string($user_id);
 
 		$sql = "SELECT tutor_id FROM ".$course_user_table."
-		             WHERE `user_id`='".$user_id."'
-		             AND `course_code`='".$_course['sysCode']."'"."AND tutor_id=1";
+		        WHERE user_id='".$user_id."' AND course_code='".$_course['sysCode']."'"."AND tutor_id=1";
 		$db_result = Database::query($sql);
 		$result = (Database::num_rows($db_result) > 0);
 		return $result;
 	}
 
 	/**
-	 * Get all group's from a given course in which a given user is ubscribed
+	 * Get all group's from a given course in which a given user is unsubscribed
 	 * @author  Patrick Cool
 	 * @param	 string $course_db: the database of the course you want to
 	 * retrieve the groups for
@@ -1308,22 +1307,21 @@ class GroupManager {
 	 * group memberships
 	 */
 	public static function get_group_ids ($course_db,$user_id) {
-	$groups = array();
-	$tbl_group = Database::get_course_table(TABLE_GROUP_USER,$course_db);
-	$user_id = Database::escape_string($user_id);
-	$sql = "SELECT group_id FROM $tbl_group WHERE user_id = '$user_id'";
-	$groupres = Database::query($sql);
-
-	// uncommenting causes a bug in Agenda AND announcements because there we check if the return value of this function is an array or not
-	//$groups=array();
-
-	if($groupres)
-	{
-		while ($myrow= Database::fetch_array($groupres))
-			$groups[]=$myrow['group_id'];
-	}
-
-	return $groups;
+		$groups = array();
+		$tbl_group = Database::get_course_table(TABLE_GROUP_USER,$course_db);
+		$user_id = Database::escape_string($user_id);
+		$sql = "SELECT group_id FROM $tbl_group WHERE user_id = '$user_id'";
+		$groupres = Database::query($sql);
+	
+		// uncommenting causes a bug in Agenda AND announcements because there we check if the return value of this function is an array or not
+		//$groups=array();
+	
+		if($groupres) {
+			while ($myrow= Database::fetch_array($groupres))
+				$groups[]=$myrow['group_id'];
+		}
+	
+		return $groups;
 	}
 	/*
 	-----------------------------------------------------------

From f6388391d16bb0020484548fb0b5344754ee7774 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 17:17:32 +0200
Subject: [PATCH 29/63] More cleaning code, removing global variables in some
 functions

---
 main/calendar/agenda.inc.php | 83 ++++++++++++++----------------------
 main/calendar/agenda.php     | 23 +++++-----
 2 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index c48bbc3033..9fe0bcdb91 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 /* For licensing terms, see /license.txt */
 
 /**
@@ -16,7 +15,7 @@
 	check for each part of the code. I'm aware that is duplication, but
 	it makes the code much easier to read.
 	
-	@todo this code should be clean as well as the myagenda.inc.php lots of function
+	@todo this code should be clean as well as the myagenda.inc.php 
 
 */
 
@@ -1744,37 +1743,33 @@ function showhide_agenda_item($id)
 * @author Yannick Warnier <yannick.warnier@dokeos.com> - cleanup
 * @author Julio Montoya <gugli100@gmail.com> - More cleanup
 */
-function display_agenda_items() {
-	 
+function display_agenda_items($select_month, $select_year) {	 
 	$TABLEAGENDA		 = Database::get_course_table(TABLE_AGENDA);
 	$TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
-	
-	global $select_month, $select_year;
-	global $DaysShort, $DaysLong, $MonthsLong;
-	global $is_courseAdmin;
-	global $dateFormatLong, $timeNoSecFormat,$charset, $_user, $_course;
+	//not used in the function
+	//global $DaysShort, $DaysLong, $MonthsLong;
+	//global $is_courseAdmin; 
+	//global $dateFormatLong, $timeNoSecFormat,$charset, $_user, $_course;
+	global $charset, $_user, $_course;
 
 	// getting the group memberships
-	$group_memberships = GroupManager::get_group_ids($_course['dbName'],$_user['user_id']);
+	$group_memberships = GroupManager::get_group_ids($_course['dbName'],api_get_user_id());
 
 	// getting the name of the groups
 	$group_names = get_course_groups();
-
-	/*
-			CONSTRUCT THE SQL STATEMENT
-	 */
+	/* CONSTRUCT THE SQL STATEMENT  */
 
     $start = 0;
     $stop = 0;
 	// this is to make a difference between showing everything (all months) or only the current month)
 	// $show_all_current is a part of the sql statement
-	if ($_SESSION['show']!=="showall") {
+	if ($_SESSION['show']!=='showall') {
 		$show_all_current=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
         $start = mktime(0,0,0,$select_month,1,$select_year);
         $stop = 0;
-        if(empty($select_year)){$select_year = date('Y');}
-        if(empty($select_month)){$select_month = date('m');}
-        if($select_month==12) {
+        if (empty($select_year)) { $select_year = date('Y');}
+        if (empty($select_month)) { $select_month = date('m');}
+        if ($select_month==12) {
             $stop = mktime(0,0,0,1,1,$select_year+1)-1;
         } else {
             $stop = mktime(0,0,0,$select_month+1,1,$select_year)-1;
@@ -1943,13 +1938,10 @@ function display_agenda_items() {
 						ORDER BY start_date ".$_SESSION['sort'];
 				 	}
 				 	*/
-
 				 }
 			}
 		}
-
 	} //if (is_allowed_to_edit() OR( api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))
-
 	// B. you are a student
 	else {
 		if (is_array($group_memberships) and count($group_memberships)>0) {
@@ -1988,19 +1980,16 @@ function display_agenda_items() {
 	} // you are a student
 
 	//echo "<pre>".$sql."</pre>";
-	$result=Database::query($sql) or die(Database::error());
-	$number_items=Database::num_rows($result);
+	$result			= Database::query($sql);
+	$number_items	= Database::num_rows($result);
 			
-	/*
-			DISPLAY: NO ITEMS
-	*/
+	/* 	DISPLAY: NO ITEMS	*/
+	
 	if ($number_items==0) {
-        echo "<table class=\"data_table\" ><tr><td>".get_lang("NoAgendaItems")."</td></tr></table>";
+        echo "<table class=\"data_table\" ><tr><td>".get_lang('NoAgendaItems')."</td></tr></table>";
 	}
 
-	/*
-			DISPLAY: THE ITEMS
-	 */
+	/*	DISPLAY: THE ITEMS	 */
 
     $month_bar="";
     $event_list="";
@@ -2024,30 +2013,22 @@ function display_agenda_items() {
 			"</td></tr>";
 		}
 
-        /*--------------------------------------------------
-         display: the icon, title, destinees of the item
-         -------------------------------------------------*/
+        /*	display: the icon, title, destinees of the item	*/
     	echo '<tr>';
 
     	// highlight: if a date in the small calendar is clicked we highlight the relevant items
     	$db_date = (int)api_format_date($myrow["start_date"], "%d").intval(api_format_date($myrow["start_date"], "%m")).api_format_date($myrow["start_date"], "%Y");
     	if ($_GET["day"].$_GET["month"].$_GET["year"] <>$db_date) {
-    		if ($myrow['visibility']=='0')
-    		{
+    		if ($myrow['visibility']=='0') {
     			$style="data_hidden";
     			$stylenotbold="datanotbold_hidden";
     			$text_style="text_hidden";
-    		}
-    		else
-    		{
+    		} else {
     			$style="data";
     			$stylenotbold="datanotbold";
     			$text_style="text";
     		}
-
-    	}
-    	else
-    	{
+    	} else {
     		$style="datanow";
     		$stylenotbold="datanotboldnow";
     		$text_style="textnow";
@@ -2060,8 +2041,7 @@ function display_agenda_items() {
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
     	Display::display_icon('agenda.gif', get_lang('Agenda'));
-    	if ($myrow['to_group_id']!=='0')
-    	{
+    	if ($myrow['to_group_id']!=='0') {
     		echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
     	}
     	echo $myrow['title'];
@@ -2074,18 +2054,17 @@ function display_agenda_items() {
     	echo $sent_to_form;
     	echo "</th>";
 
-    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())))
-    	{
-    		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) )
-			{ // a coach can only delete an element belonging to his session
+    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
+    		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
+    			// a coach can only delete an element belonging to his session
 	    		echo '<th>'.get_lang('Modify');
 	    		echo '</th></tr>';
 			}
     	}
 
-        /*--------------------------------------------------
+        /*
      			display: the title
-         --------------------------------------------------*/
+         */
     	echo "<tr class='row_odd'>";
     	echo "<td>".get_lang("StartTimeWindow").": ";
     	echo api_format_date($myrow['start_date']);
@@ -2100,9 +2079,9 @@ function display_agenda_items() {
     	// attachment list
 	    	$attachment_list=get_attachment($myrow['id']);
 
-        /*--------------------------------------------------
+        /*
     	 display: edit delete button (course admin only)
-         --------------------------------------------------*/
+         */
 
 
     	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index 399a106301..eabecc115f 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -332,15 +332,14 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 					display_ical_import_form();
 					break;
 				}
-		        display_agenda_items();
-		    }
-		    else {
+		        display_agenda_items($select_month, $select_year);
+		    } else {
 		    	display_ical_import_form();
 		    }
 		    break;
 		case 'add' :
 			if ($_POST['submit_event']) {
-				display_agenda_items();
+				display_agenda_items($select_month, $select_year);
 			} else {
 				show_add_form();
 			}
@@ -348,42 +347,42 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		case 'edit' :
 			if ( !(api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, intval($_REQUEST['id'])))) {
 				if ($_POST['submit_event']) {
-					display_agenda_items();
+					display_agenda_items($select_month, $select_year);
 				} else {
 					$id=(int)$_GET['id'];
 					show_add_form($id);
 				}
 			} else {
-				display_agenda_items();
+				display_agenda_items($select_month, $select_year);
 			}
 			break;
 		case 'delete':
-			display_agenda_items();
+			display_agenda_items($select_month, $select_year);
 			break;
 		case 'showhide':
 			if(!empty($_GET['agenda_id'])) {
 				 display_one_agenda_item((int)$_GET['agenda_id']);
 			} else {
-				display_agenda_items();
+				display_agenda_items($select_month, $select_year);
 			}
 			break;
 		case 'announce': 		
-			display_agenda_items();
+			display_agenda_items($select_month, $select_year);
 			break;
 		case 'delete_attach': 	
-			display_agenda_items();
+			display_agenda_items($select_month, $select_year);
 			break;
 	}
 }
 
 // this is for students and whenever the courseaministrator has not chosen any action. It is in fact the default behaviour
-if (!$_GET['action'] || $_GET['action']=="showall"  || $_GET['action']=="showcurrent" || $_GET['action']=="view") {
+if (!$_GET['action'] || $_GET['action']=='showall'  || $_GET['action']=='showcurrent' || $_GET['action']=="view") {
 	if ($_GET['origin'] != 'learnpath') {
 		if (!$_SESSION['view'] || $_SESSION['view'] <> 'month') {
             if(!empty($_GET['agenda_id'])) {
                 display_one_agenda_item($_GET['agenda_id']);
             } else {
-			   display_agenda_items();
+			   display_agenda_items($select_month, $select_year);
             }
 		} else {
 			display_monthcalendar($select_month, $select_year);

From 2d8cc8f0894d6e32beff7e31d20aa97944837edd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 18:46:18 +0200
Subject: [PATCH 30/63] Minor -  cleaning code

---
 main/calendar/agenda.inc.php | 209 +++++++++++++++++++----------------
 1 file changed, 112 insertions(+), 97 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 9fe0bcdb91..e5b696f4d5 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -392,7 +392,7 @@ function display_monthcalendar($month, $year) {
 	echo '<table id="agenda_list">';
 	echo '<tr>';
 	echo '<th width="10%"><a href="'.$backwardsURL.'">'.Display::return_icon('action_prev.png',get_lang('Previous')).'</a></th>';
-	echo '<th width="80%" colspan="5">'.$MonthsLong[$maand_array_maandnummer].$year.'</th>';
+	echo '<th width="80%" colspan="5">'.$MonthsLong[$maand_array_maandnummer].' '.$year.'</th>';
 	echo '<th width="10%"><a href="'.$forewardsURL.'"> '.Display::return_icon('action_next.png',get_lang('Next')).'</a></th>';
 	echo '</tr>';
 
@@ -428,6 +428,7 @@ function display_monthcalendar($month, $year) {
 									$start_time = api_convert_and_format_date($value['start_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
 									$end_time 	= api_convert_and_format_date($value['end_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
 									
+									//Setting a personal event to green
 									$personal_start =  $personal_end = '';
 									
 									if ($value['calendar_type'] == 'personal') {
@@ -1716,18 +1717,15 @@ function delete_agenda_item($id)
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @param integer id the id of the agenda item we are changing the visibility of
 */
-function showhide_agenda_item($id)
-{
+function showhide_agenda_item($id) {
 	global $nameTools;
-	/*==================================================
+	/*
 				SHOW / HIDE A CALENDAR ITEM
-	  ==================================================*/
+	*/
 	//  and $_GET['isStudentView']<>"false" is added to prevent that the visibility is changed after you do the following:
 	// change visibility -> studentview -> course manager view
-	if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) and $_GET['isStudentView']<>"false")
-	{
-		if (isset($_GET['id']) && isset($_GET['action']) && $_GET['action']=="showhide")
-		{
+	if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) and $_GET['isStudentView']<>"false") {
+		if (isset($_GET['id']) && isset($_GET['action']) && $_GET['action']=="showhide") {
 			$id=(int)addslashes($_GET['id']);
 			if (isset($_GET['next_action']) && $_GET['next_action'] == strval(intval($_GET['next_action']))) {
 				$visibility = $_GET['next_action'];
@@ -1761,10 +1759,14 @@ function display_agenda_items($select_month, $select_year) {
 
     $start = 0;
     $stop = 0;
+    $select_month = intval($select_month);
+    $select_year  = intval($select_year);
 	// this is to make a difference between showing everything (all months) or only the current month)
 	// $show_all_current is a part of the sql statement
 	if ($_SESSION['show']!=='showall') {
-		$show_all_current=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
+		$show_all_current			=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
+		$show_all_current_personal	=" AND MONTH(date)=$select_month AND year(date)=$select_year";
+		
         $start = mktime(0,0,0,$select_month,1,$select_year);
         $stop = 0;
         if (empty($select_year)) { $select_year = date('Y');}
@@ -1775,7 +1777,8 @@ function display_agenda_items($select_month, $select_year) {
             $stop = mktime(0,0,0,$select_month+1,1,$select_year)-1;
         }
 	} else {
-		$show_all_current="";
+		$show_all_current='';
+		$show_all_current_personal = '';
         $start = time();
         $stop = mktime(0,0,0,1,1,2038);//by default, set year to maximum for mktime()
 	}
@@ -1997,8 +2000,28 @@ function display_agenda_items($select_month, $select_year) {
     $export_icon 	  = 'export.png';
     $export_icon_low  = 'export_low_fade.png';
     $export_icon_high = 'export_high_fade.png';
+	
+	$my_events = array();
+	while($myrow = Database::fetch_array($result)) {
+		$myrow['calendar_type'] = 'course';		
+		$my_events[] = $myrow;
+	}
 
-    while($myrow=Database::fetch_array($result)) {
+	//Check my personal calendar items	
+	if (api_get_setting('allow_personal_agenda') == 'true') {
+		$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);		
+		// 1. creating the SQL statement for getting the personal agenda items in MONTH view
+		$sql = "SELECT id, title, text as content , date as start_date, enddate as end_date, parent_event_id FROM ".$tbl_personal_agenda."
+				WHERE user='".api_get_user_id()."' ".$show_all_current_personal." ORDER BY date ASC";		
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			$row['calendar_type'] = 'personal';			
+			$my_events[] = $row;
+		}
+	}	
+	
+    //while($myrow = Database::fetch_array($result)) {
+   	foreach ($my_events as $myrow) {
     	$is_repeated = !empty($myrow['parent_event_id']);
 	    echo '<table class="data_table">';
         /*
@@ -2008,9 +2031,10 @@ function display_agenda_items($select_month, $select_year) {
         $myrow["start_date"] = api_get_local_time($myrow["start_date"], null, date_default_timezone_get());
         if ($month_bar != api_format_date($myrow["start_date"], "%m%Y")) {
             $month_bar = api_format_date($myrow["start_date"], "%m%Y");
-			echo "<tr><td class=\"agenda_month_divider\" colspan=\"3\" valign=\"top\">".
-			api_format_date($myrow["start_date"], "%B %Y").
-			"</td></tr>";
+            //Showing month header 
+			echo '<tr><td class="agenda_month_divider" colspan="3" valign="top">';
+			echo api_format_date($myrow["start_date"], "%B %Y");
+			echo '</td></tr>';
 		}
 
         /*	display: the icon, title, destinees of the item	*/
@@ -2040,20 +2064,31 @@ function display_agenda_items($select_month, $select_year) {
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-    	Display::display_icon('agenda.gif', get_lang('Agenda'));
-    	if ($myrow['to_group_id']!=='0') {
-    		echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
-    	}
-    	echo $myrow['title'];
-    	echo "</th>";
-
-    	// the message has been sent to
-    	echo "<th>".get_lang("SentTo").": ";
-    	$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
-    	$sent_to_form=sent_to_form($sent_to);
-    	echo $sent_to_form;
-    	echo "</th>";
-
+    	if ($myrow['calendar_type'] != 'personal') {
+    		echo '<div style="padding-left:5px; font-size:130%; float:left;">';    		
+    		Display::display_icon('agenda.gif', get_lang('Agenda'));
+    		if ($myrow['to_group_id']!=='0') {
+    			echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
+    		}    		
+    		echo $myrow['title'];
+    		echo '</div>';
+    	} else {
+    		Display::display_icon('calendar_personal.gif', get_lang('Personal'));    		
+    		echo $myrow['title'];    		
+    	}    	
+    	echo '</th>';
+    	
+		if ($myrow['calendar_type'] != 'personal') {
+	    	// the message has been sent to
+	    	echo "<th>".get_lang('SentTo').": ";
+	    	$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
+	    	$sent_to_form=sent_to_form($sent_to);
+	    	echo $sent_to_form;	    	
+	    	echo '</th>';
+		} else {
+			echo '<th>'.get_lang('Personal').'</th>';	
+		}
+		
     	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
     			// a coach can only delete an element belonging to his session
@@ -2062,35 +2097,30 @@ function display_agenda_items($select_month, $select_year) {
 			}
     	}
 
-        /*
-     			display: the title
-         */
-    	echo "<tr class='row_odd'>";
-    	echo "<td>".get_lang("StartTimeWindow").": ";
+        /*	display: the title	*/
+    	echo '<tr class="row_odd">';
+    	echo '<td>'.get_lang('StartTimeWindow').': ';
     	echo api_format_date($myrow['start_date']);
-    	echo "</td>";
-    	echo "<td>";
-    	if ($myrow["end_date"]<>"0000-00-00 00:00:00") {
-    		echo get_lang("EndTimeWindow").": ";
+    	echo '</td>';
+    	echo '<td>';
+    	
+    	if ($myrow['end_date']<>'0000-00-00 00:00:00') {
+    		echo get_lang('EndTimeWindow').": ";
     		echo api_convert_and_format_date($myrow['end_date'], null, date_default_timezone_get());
     	}
-    	echo "</td>";
+    	echo '</td>';
 
     	// attachment list
-	    	$attachment_list=get_attachment($myrow['id']);
-
-        /*
-    	 display: edit delete button (course admin only)
-         */
+	    $attachment_list=get_attachment($myrow['id']);
 
-
-    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
+        /*Display: edit delete button (course admin only) */
+		if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] != 'personal') {
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
     			// a coach can only delete an element belonging to his session
 				$mylink = api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;id='.$myrow['id'].'&amp;';
 	    		echo '<td align="center">';
-	    		// edit
 	    		
+	    		// edit	    		
     			echo '<a href="'.$mylink.api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup']).'&amp;action=edit&amp;id_attach='.$attachment_list['id'].'" title="'.get_lang("ModifyCalendarItem").'">';
 	    		echo Display::return_icon('edit.gif', get_lang('ModifyCalendarItem'))."</a>";
 
@@ -2112,38 +2142,38 @@ function display_agenda_items($select_month, $select_year) {
     			echo 	'<a href="'.$mylink.api_get_cidreq().'&amp;sort=asc&amp;toolgroup='.Security::remove_XSS($_GET['toolgroup']).'&amp;action=showhide&amp;next_action='.$next_action.'" title="'.$text_visibility.'">'.Display::return_icon($image_visibility, $text_visibility),'</a> ';
 			}
 
-    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
-    		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) )
-			{ // a coach can only delete an element belonging to his session
-    			$td_colspan= '<td colspan="3">';
-			} else {
-				$td_colspan= '<td colspan="2">';
-			}
-    	} else {
-    		$td_colspan= '<td colspan="2">';
-    	}
-    	$mylink = 'ical_export.php?'.api_get_cidreq().'&amp;type=course&amp;id='.$myrow['id'];
-		//echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
-    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
-    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
-	    echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
-    	echo '</td>';
-    	echo '</tr>';
-}
+	    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
+	    		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
+	    			// a coach can only delete an element belonging to his session
+	    			$td_colspan= '<td colspan="3">';
+				} else {
+					$td_colspan= '<td colspan="2">';
+				}
+	    	} else {
+	    		$td_colspan= '<td colspan="2">';
+	    	}
+	    	$mylink = 'ical_export.php?'.api_get_cidreq().'&amp;type=course&amp;id='.$myrow['id'];
+			//echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
+	    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
+	    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
+		    echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
+	    	echo '</td>';	    	
+		} else {
+			echo '<td align="center">';
+			echo '</td>';
+		}
+		echo '</tr>';
 
-        /*--------------------------------------------------
-     			display: the content
-         --------------------------------------------------*/
+        /*    			display: the content		*/
     	$content = $myrow['content'];
     	$content = make_clickable($content);
     	$content = text_filter($content);
-    	echo "<tr class='row_even'>";
-    	echo "<td colspan='3'>";
-
+    	
+    	echo '<tr class="row_even">';
+    	echo '<td colspan="3">';
     	echo $content;
     	// show attachment list
 			if (!empty($attachment_list)) {
-
 				$realname=$attachment_list['path'];
 				$user_filename=$attachment_list['filename'];
 				$full_file_name = 'download.php?file='.$realname;
@@ -2154,52 +2184,37 @@ function display_agenda_items($select_month, $select_year) {
 				if (api_is_allowed_to_edit()) {
 					echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;action=delete_attach&amp;id_attach='.$attachment_list['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a><br />';
 				}
-
 			}
-
 	    echo '</td></tr>';
 
-
-        /*--------------------------------------------------
-     			display: the added resources
-         --------------------------------------------------*/
-    	if (check_added_resources("Agenda", $myrow["id"]))
-    	{
-
+        /*     	display: the added resources         */
+    	if (check_added_resources("Agenda", $myrow["id"])) {
     		echo '<tr>';
     		echo '<td colspan="3">';
     		echo "<i>".get_lang("AddedResources")."</i><br/>";
-    		if ($myrow['visibility']==0)
-    		{
+    		if ($myrow['visibility']==0) {
     			$addedresource_style="invisible";
     		}
     		display_added_resources("Agenda", $myrow["id"], $addedresource_style);
     		echo "</td></tr>";
-    	}
-
-
+	   	}
     	$event_list.=$myrow['id'].',';
-
     	$counter++;
-        /*--------------------------------------------------
-    	 display: jump-to-top icon
-         --------------------------------------------------*/
+        /*   	 display: jump-to-top icon	*/
     	echo '<tr>';
         echo '<td colspan="3">';
-        if($is_repeated){echo get_lang('RepeatedEvent'),' <a href="',api_get_self(),'?',api_get_cidreq(),'&amp;agenda_id=',$myrow['parent_event_id'],'" alt="',get_lang('RepeatedEventViewOriginalEvent'),'">',get_lang('RepeatedEventViewOriginalEvent'),'</a>';}
+        if ($is_repeated) {
+        	echo get_lang('RepeatedEvent'),' <a href="',api_get_self(),'?',api_get_cidreq(),'&amp;agenda_id=',$myrow['parent_event_id'],'" alt="',get_lang('RepeatedEventViewOriginalEvent'),'">',get_lang('RepeatedEventViewOriginalEvent'),'</a>';
+        }
     	echo "<a href=\"#top\">".Display::return_icon('top.gif', get_lang('Top'))."</a></td></tr>";
     	echo "</table><br /><br />";
     } // end while ($myrow=Database::fetch_array($result))
 
-    if(!empty($event_list))
-    {
+    if(!empty($event_list)) {
     	$event_list=api_substr($event_list,0,-1);
-    }
-    else
-    {
+    } else {
     	$event_list='0';
     }
-
     echo "<form name=\"event_list_form\"><input type=\"hidden\" name=\"event_list\" value=\"$event_list\" /></form>";
 
     // closing the layout table

From 539093eb0e00605882b2d34e4921fed4ea53d6af Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:06:19 +0200
Subject: [PATCH 31/63] More code cleaning

---
 main/calendar/agenda.inc.php   | 43 ++++++++++++++++--------------
 main/calendar/myagenda.inc.php | 48 ++++++++++++++--------------------
 2 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index e5b696f4d5..f98eaa4ab1 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -731,17 +731,16 @@ function plus_ical() {
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @return javascript code
 */
-function user_group_filter_javascript()
-{
-return "<script language=\"JavaScript\" type=\"text/JavaScript\">
-<!--
-function MM_jumpMenu(targ,selObj,restore){
-  eval(targ+\".location='\"+selObj.options[selObj.selectedIndex].value+\"'\");
-  if (restore) selObj.selectedIndex=0;
-}
-//-->
-</script>
-";
+function user_group_filter_javascript() {
+	return "<script language=\"JavaScript\" type=\"text/JavaScript\">
+	<!--
+	function MM_jumpMenu(targ,selObj,restore){
+	  eval(targ+\".location='\"+selObj.options[selObj.selectedIndex].value+\"'\");
+	  if (restore) selObj.selectedIndex=0;
+	}
+	//-->
+	</script>
+	";
 }
 
 
@@ -1457,10 +1456,9 @@ function change_visibility($tool,$id,$visibility)
 function display_courseadmin_links() {
 	//echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&amp;view=".(($_SESSION['view']=='month')?"list":Security::remove_XSS($_SESSION['view'])."&amp;origin=".Security::remove_XSS($_GET['origin']))."'>".Display::return_icon('calendar_add.gif', get_lang('AgendaAdd'))." ".get_lang('AgendaAdd')."</a>";
 	  echo "<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&action=add&amp;view=".(($_SESSION['view']=='month')?"list":Security::remove_XSS($_SESSION['view'])."&amp;origin=".Security::remove_XSS($_GET['origin']))."'>".Display::return_icon('calendar_add.gif', get_lang('AgendaAdd'))." ".get_lang('AgendaAdd')."</a>";
-	if (empty ($_SESSION['toolgroup']))
-	{
+	if (empty ($_SESSION['toolgroup'])) {
 		echo get_lang('UserGroupFilter');
-		echo "<form name=\"filter\" style=\"display:inline;\">";
+		echo "&nbsp;&nbsp;<form name=\"filter\" style=\"display:inline;\">";
 		show_user_group_filter_form();
 		echo "</form> ";
 	}
@@ -2065,16 +2063,19 @@ function display_agenda_items($select_month, $select_year) {
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
     	if ($myrow['calendar_type'] != 'personal') {
-    		echo '<div style="padding-left:5px; font-size:130%; float:left;">';    		
-    		Display::display_icon('agenda.gif', get_lang('Agenda'));
+    		  		
+    		Display::display_icon('agenda.gif', get_lang('Agenda'));    		  
     		if ($myrow['to_group_id']!=='0') {
     			echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
     		}    		
+    		echo '<span style="padding-left:5px; font-size:130%; ">';
     		echo $myrow['title'];
-    		echo '</div>';
+    		echo '</span>';
     	} else {
-    		Display::display_icon('calendar_personal.gif', get_lang('Personal'));    		
-    		echo $myrow['title'];    		
+    		Display::display_icon('calendar_personal.gif', get_lang('Personal'));
+    		echo '<span style="padding-left:5px; font-size:130%; ">';    		
+    		echo $myrow['title'];
+    		echo '</span>';    		
     	}    	
     	echo '</th>';
     	
@@ -2089,12 +2090,14 @@ function display_agenda_items($select_month, $select_year) {
 			echo '<th>'.get_lang('Personal').'</th>';	
 		}
 		
-    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
+    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] != 'personal' ) {
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
     			// a coach can only delete an element belonging to his session
 	    		echo '<th>'.get_lang('Modify');
 	    		echo '</th></tr>';
 			}
+    	} else {
+    		echo '<th></th></tr>';
     	}
 
         /*	display: the title	*/
diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index d4e981008f..2438fe3225 100755
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -688,19 +688,17 @@ function get_personal_agenda_item($id) {
  * these items in one list (ordered by date and grouped by month (the month_bar)
  */
 function show_personal_agenda() {
-	global $MonthsLong, $charset;
-	global $_user;
+	global $MonthsLong, $charset;	
 	
 	$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
 	
 	// The SQL statement that retrieves all the personal agenda items of this user
-	$sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' ORDER BY date DESC";
+	$sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".api_get_user_id()."' ORDER BY date DESC";
 	$result = Database::query($sql);
 	// variable initialisation
 	$month_bar = "";
 	// setting the default day, month and year
-	if (!$_GET['day'] AND !$_GET['month'] AND !$_GET['year'])
-	{
+	if (!$_GET['day'] AND !$_GET['month'] AND !$_GET['year']) {
 		$today = getdate();
 		$year = $today['year'];
 		$month = $today['mon'];
@@ -711,32 +709,33 @@ function show_personal_agenda() {
 	$export_icon_high = 'export_high_fade.png';
 
 	// starting the table output
-	echo "<table class=\"data_table\">";
+	echo '<table class="data_table">';
 
-	if (Database::num_rows($result) > 0)
-	{
-		while ($myrow = Database::fetch_array($result))
-		{
-			/*--------------------------------------------------
-					display: the month bar
-			  --------------------------------------------------*/
-			if ($month_bar != date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"])))
-			{
+	if (Database::num_rows($result) > 0) {
+		while ($myrow = Database::fetch_array($result)) {
+			/* 	display: the month bar		*/
+			if ($month_bar != date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]))) {
 				$month_bar = date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]));
 				echo "<tr><th class=\"title\" colspan=\"2\" class=\"month\" valign=\"top\">".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))."</th></tr>";
 			}
 			// highlight: if a date in the small calendar is clicked we highlight the relevant items
 			$db_date = (int) date("d", strtotime($myrow["date"])).date("n", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]));
-			if ($_GET["day"].$_GET["month"].$_GET["year"] <> $db_date)
-			{
+			if ($_GET["day"].$_GET["month"].$_GET["year"] <> $db_date) {
 				$style = "data";
 				$text_style = "text";
-			}
-			else
-			{
+			} else {
 				$style = "datanow";
 				$text_style = "text";
 			}
+			
+			/*	display: the title	*/
+			
+			echo "<tr>";
+			echo '<td class="'.$style.'" colspan="2">';
+			echo $myrow['title'];
+			echo "</td>";
+			echo "</tr>";
+			
 			/*--------------------------------------------------
 			 			display: date and time
 			  --------------------------------------------------*/
@@ -754,14 +753,7 @@ function show_personal_agenda() {
 			//echo '<a class="ical_export" href="ical_export.php?type=personal&id='.$myrow['id'].'&class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a>';
 			//echo "</td>";
 			echo "</tr>";
-			/*--------------------------------------------------
-			 			display: the title
-			  --------------------------------------------------*/
-			echo "<tr>";
-			echo '<td class="'.$style.'" colspan="2">';
-			echo $myrow['title'];
-			echo "</td>";
-			echo "</tr>";
+
 			/*--------------------------------------------------
 			 			display: the content
 			  --------------------------------------------------*/

From c6918067d2a12af2c18aed562707bc3c1c3503a8 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:28:58 +0200
Subject: [PATCH 32/63] Personal agenda events don't have end date

---
 main/calendar/agenda.inc.php | 48 ++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index f98eaa4ab1..fbe74e3ba0 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -374,7 +374,7 @@ function display_monthcalendar($month, $year) {
 
 	// Grabbing all the calendar items for this year and storing it in a array + my personal calendar events if exist and if enabled 
 	$data = get_calendar_items($month,$year);
-
+		
 	//Handle leap year
 	$numberofdays = array(0,31,28,31,30,31,30,31,31,30,31,30,31);
 	if (($year%400 == 0) or ($year%4==0 and $year%100<>0)) $numberofdays[2] = 29;
@@ -387,7 +387,7 @@ function display_monthcalendar($month, $year) {
 	$backwardsURL = api_get_self()."?".api_get_cidreq()."&amp;origin=$origin&amp;month=".($month==1 ? 12 : $month-1)."&amp;year=".($month==1 ? $year-1 : $year);
 	$forewardsURL = api_get_self()."?".api_get_cidreq()."&amp;origin=$origin&amp;month=".($month==12 ? 1 : $month+1)."&amp;year=".($month==12 ? $year+1 : $year);
 
-	   $maand_array_maandnummer=$month-1;
+	$maand_array_maandnummer=$month-1;
 
 	echo '<table id="agenda_list">';
 	echo '<tr>';
@@ -418,32 +418,38 @@ function display_monthcalendar($month, $year) {
 					$bgcolor = $ii<5 ? 'class="row_odd"' : 'class="row_even"';
 					$dayheader = "$curday";
 					
-					if (key_exists($curday, $data)) {					
-						foreach ($data[$curday] as $key=>$agenda_item) {						
-							foreach ($agenda_item as $key=>$value) {						
-								$month_start_date = (int)substr($value['start_date'],5,2);	
-								$start_time = api_convert_and_format_date($value['start_date']);												
+					if (key_exists($curday, $data)) {			
+						foreach ($data[$curday] as $key=>$agenda_item) {
+							$dayheader ="<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";					
+							foreach ($agenda_item as $key=>$value) {		
+								
+								$month_start_date = (int)substr($value['start_date'],5,2);									
+								$start_time = api_convert_and_format_date($value['start_date']);
+								
+																				
 								if ($month == $month_start_date) {
 									
 									$start_time = api_convert_and_format_date($value['start_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
 									$end_time 	= api_convert_and_format_date($value['end_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
 									
 									//Setting a personal event to green
-									$personal_start =  $personal_end = '';
-									
+									$personal_start =  $personal_end = '';									
 									if ($value['calendar_type'] == 'personal') {
 										$personal_start = '<div style="color:green;">';
 										$personal_end	= '</div>';	
-									}
-									$dayheader = $personal_start;
-									$dayheader.="<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
+									}									
+									$dayheader.= $personal_start;									
 									
 									if ($value['end_date']=='0000-00-00 00:00:00') {										
 										$dayheader .= '<br />'.get_lang('Work').'<br />';
 										$dayheader .= $value['title'];
 										$dayheader .= '<br/>';
 									} else {
-										$dayheader .= '<br />'.get_lang('StartTimeWindow').'&nbsp;<i>'.$start_time.'</i>&nbsp;-&nbsp;'.get_lang('EndTimeWindow').'&nbsp;<i>'.$end_time.'&nbsp;</i>';
+										if ($value['calendar_type'] == 'personal') {
+											$dayheader .= '<br />'.get_lang('StartTimeWindow').'&nbsp;<i>'.$start_time.'</i>&nbsp;</i>';
+										} else {
+											$dayheader .= '<br />'.get_lang('StartTimeWindow').'&nbsp;<i>'.$start_time.'</i>&nbsp;-&nbsp;'.get_lang('EndTimeWindow').'&nbsp;<i>'.$end_time.'&nbsp;</i>';
+										}
 										$dayheader .= '<br />';
 										$dayheader .= $value['title'];
 										$dayheader .= '<br/>';
@@ -452,11 +458,10 @@ function display_monthcalendar($month, $year) {
 								} else {
 									//$dayheader=$curday;
 								}
-								//$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view");
-								//echo $agendaitems['title'];
-							}
+							}							
 						}
 					}
+					//var_dump($dayheader);
 					
 					if (($curday==$today['mday']) && ($year ==$today['year'])&&($month == $today['mon'])) {
 						echo '<td class="days_today"'.$bgcolor.'" style="width:10%">'.$dayheader;
@@ -2062,8 +2067,7 @@ function display_agenda_items($select_month, $select_year) {
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-    	if ($myrow['calendar_type'] != 'personal') {
-    		  		
+    	if ($myrow['calendar_type'] != 'personal') {    		  		
     		Display::display_icon('agenda.gif', get_lang('Agenda'));    		  
     		if ($myrow['to_group_id']!=='0') {
     			echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
@@ -2107,9 +2111,11 @@ function display_agenda_items($select_month, $select_year) {
     	echo '</td>';
     	echo '<td>';
     	
-    	if ($myrow['end_date']<>'0000-00-00 00:00:00') {
-    		echo get_lang('EndTimeWindow').": ";
-    		echo api_convert_and_format_date($myrow['end_date'], null, date_default_timezone_get());
+    	if ($myrow['calendar_type'] != 'personal') {
+    		if ($myrow['end_date']<>'0000-00-00 00:00:00') {
+    			echo get_lang('EndTimeWindow').": ";
+    			echo api_convert_and_format_date($myrow['end_date'], null, date_default_timezone_get());
+    		}
     	}
     	echo '</td>';
 

From 7538ea649ebfc96acf1e769c954148576a843827 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:35:03 +0200
Subject: [PATCH 33/63] Fixing wrong user of the remove_XSS function. Adding
 database::escape_string function

---
 main/calendar/agenda.inc.php | 61 +++++++++++++++---------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index fbe74e3ba0..3849d55cc5 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -993,21 +993,18 @@ function store_new_agenda_item() {
 	$content=trim($_POST['content']);
 	$start_date=(int)$_POST['fyear']."-".(int)$_POST['fmonth']."-".(int)$_POST['fday']." ".(int)$_POST['fhour'].":".(int)$_POST['fminute'].":00";
 	$end_date=(int)$_POST['end_fyear']."-".(int)$_POST['end_fmonth']."-".(int)$_POST['end_fday']." ".(int)$_POST['end_fhour'].":".(int)$_POST['end_fminute'].":00";
-
-	$content=stripslashes($content);
-	$title=Database::escape_string(Security::remove_XSS($title));
-	$content = Database::escape_string(Security::remove_XSS($content,COURSEMANAGERLOWSECURITY));
-	$start_date=Database::escape_string($start_date);
-	$end_date=Database::escape_string($end_date);
+	
+	$title		= Database::escape_string($title);
+	$content 	= Database::escape_string($content);
+	$start_date = Database::escape_string($start_date);
+	$end_date   = Database::escape_string($end_date);
 
 
 	// store in the table calendar_event
-	$sql = "INSERT INTO ".$TABLEAGENDA."
-					        (title,content, start_date, end_date)
-					        VALUES
-					        ('".$title."','".$content."', '".$start_date."','".$end_date."')";
-	$result = Database::query($sql);
-	$last_id = Database::insert_id();
+	$sql = "INSERT INTO ".$TABLEAGENDA." (title,content, start_date, end_date)
+			VALUES ('".$title."','".$content."', '".$start_date."','".$end_date."')";
+	$result 	= Database::query($sql);
+	$last_id 	= Database::insert_id();
 
 	// store in last_tooledit (first the groups, then the users
 	$to=$_POST['selectedform'];
@@ -1077,26 +1074,23 @@ function store_agenda_item_as_announcement($item_id){
 		$sql_max = "SELECT MAX(display_order) FROM $table_ann";
 		$res_max = Database::query($sql_max);
 		$row_max = Database::fetch_array($res_max);
-		$max = $row_max[0]+1;
+		$max = intval($row_max[0])+1;
 		//build the announcement text
 		$content = $row['start_date']." - ".$row['end_date']."\n".$row['content'];
 		//insert announcement
-                $session_id = api_get_session_id();
+        $session_id = api_get_session_id();
 		$sql_ins = "INSERT INTO $table_ann (title,content,end_date,display_order,session_id) " .
-				"VALUES ('".Security::remove_XSS($row['title'])."','".$content."','".$row['end_date']."','$max','$session_id')";
+					"VALUES ('".Database::escape_string($row['title'])."','".Database::escape_string($content)."','".Database::escape_string($row['end_date'])."','$max','$session_id')";
 		$res_ins = Database::query($sql_ins);
-		if($res > 0)
-		{
+		if($res > 0) {
 			$ann_id = Database::insert_id();
 			//Now also get the list of item_properties rows for this agenda_item (calendar_event)
 			//and copy them into announcement item_properties
 			$table_props = Database::get_course_table(TABLE_ITEM_PROPERTY);
 			$sql_props = "SELECT * FROM $table_props WHERE tool = 'calendar_event' AND ref='$item_id'";
 			$res_props = Database::query($sql_props);
-			if(Database::num_rows($res_props)>0)
-			{
-				while($row_props = Database::fetch_array($res_props))
-				{
+			if(Database::num_rows($res_props)>0) {
+				while($row_props = Database::fetch_array($res_props)) {
 					//insert into announcement item_property
 					$time = date("Y-m-d H:i:s", time());
 					$sql_ins_props = "INSERT INTO $table_props " .
@@ -1111,14 +1105,14 @@ function store_agenda_item_as_announcement($item_id){
 							"'".$row_props['visibility']."','".$row_props['start_visible']."','".$row_props['end_visible']."')";
 					$res_ins_props = Database::query($sql_ins_props);
 					if($res_ins_props <= 0){
-						error_log('SQL Error in '.__FILE__.' at line '.__LINE__.': '.$sql_ins_props);
-					}else{
+						return -1;
+					} else {
 						//copy was a success
 						return $ann_id;
 					}
 				}
 			}
-		}else{
+		} else {
 			return -1;
 		}
 	}
@@ -1132,8 +1126,7 @@ function store_agenda_item_as_announcement($item_id){
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @return array
 */
-function separate_users_groups($to)
-{
+function separate_users_groups($to) {
 	$grouplist = array();
     $userlist  = array();
     $send_to = null;
@@ -1640,12 +1633,11 @@ function store_edited_agenda_item($id_attach,$file_comment)
 * This function stores the Agenda Item in the table calendar_event and updates the item_property table also (after an edit)
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
-function save_edit_agenda_item($id,$title,$content,$start_date,$end_date)
-{
+function save_edit_agenda_item($id,$title,$content,$start_date,$end_date) {
 	$TABLEAGENDA= Database::get_course_table(TABLE_AGENDA);
 	$id			= Database::escape_string($id);
-	$title		= Database::escape_string(Security::remove_XSS($title));
-	$content 	= Database::escape_string(Security::remove_XSS($content,COURSEMANAGERLOWSECURITY));
+	$title		= Database::escape_string($title);
+	$content 	= Database::escape_string($content);
 	$start_date	= Database::escape_string($start_date);
 	$end_date	= Database::escape_string($end_date);
 
@@ -1669,8 +1661,7 @@ function save_edit_agenda_item($id,$title,$content,$start_date,$end_date)
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @param integer the id of the agenda item wa are deleting
 */
-function delete_agenda_item($id)
-{
+function delete_agenda_item($id) {
 	global $_course;
 	$id=Database::escape_string($id);
 	if (api_is_allowed_to_edit(false,true)  OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))
@@ -4262,12 +4253,12 @@ function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end
     // database table definitions
     $t_agenda   = Database::get_course_table(TABLE_AGENDA,$course_info['dbName']);
     $agenda_table_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
-    $item_property 				=	Database::get_course_table(TABLE_ITEM_PROPERTY);
+    $item_property 			 = Database::get_course_table(TABLE_ITEM_PROPERTY);
 
     // some filtering of the input data
     $content=stripslashes($content);
-	$title=Database::escape_string(Security::remove_XSS($title));
-	$content = Database::escape_string(Security::remove_XSS($content,COURSEMANAGERLOWSECURITY));
+	$title=Database::escape_string($title);
+	$content = Database::escape_string($content);
     $start_date = Database::escape_string($db_start_date);
     $end_date   = Database::escape_string($db_end_date);
     isset($_SESSION['id_session'])?$id_session=intval($_SESSION['id_session']):$id_session=null;

From 69733a2969b8dec6a2bca9a5fb681976985d7d10 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:42:23 +0200
Subject: [PATCH 34/63] Removing execise use of remove_XSS . i.e:
 Database::escape_string(Security::remove_XSS())

---
 main/link/linkfunctions.php | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/main/link/linkfunctions.php b/main/link/linkfunctions.php
index 91d2635018..273c59fcb3 100755
--- a/main/link/linkfunctions.php
+++ b/main/link/linkfunctions.php
@@ -224,18 +224,18 @@ function deletelinkcategory($type) {
 	}
 
 	if ($type == 'category') {
-
 		global $id;
+		if (isset($_GET['id']) && !empty($_GET['id'])) {
+			// First we delete the category itself and afterwards all the links of this category.
+			$sql = "DELETE FROM ".$tbl_categories." WHERE id='".intval($_GET['id'])."'";
+			Database::query($sql);
+			$sql = "DELETE FROM ".$tbl_link." WHERE category_id='".intval($_GET['id'])."'";
+			$catlinkstatus = get_lang('CategoryDeleted');
+			unset ($id);
+			Database::query($sql);
 
-		// First we delete the category itself and afterwards all the links of this category.
-		$sql = "DELETE FROM ".$tbl_categories." WHERE id='".Database::escape_string(Security::remove_XSS($_GET['id']))."'";
-		Database::query($sql);
-		$sql = "DELETE FROM ".$tbl_link." WHERE category_id='".Database::escape_string(Security::remove_XSS($_GET['id']))."'";
-		$catlinkstatus = get_lang('CategoryDeleted');
-		unset ($id);
-		Database::query($sql);
-
-		Display::display_confirmation_message(get_lang('CategoryDeleted'));
+			Display::display_confirmation_message(get_lang('CategoryDeleted'));
+		}
 	}
 }
 
@@ -328,7 +328,7 @@ function editlinkcategory($type) {
 			}
 
 			// Finding the old category_id
-			$sql = "SELECT * FROM ".$tbl_link." WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
+			$sql = "SELECT * FROM ".$tbl_link." WHERE id='".intval($_POST['id'])."'";
 			$result = Database::query($sql);
 			$row = Database::fetch_array($result);
 			$category_id = $row['category_id'];
@@ -342,7 +342,14 @@ function editlinkcategory($type) {
 				$max_display_order = $row['display_order'];
 			}
 
-			$sql = "UPDATE ".$tbl_link." set url='".Database::escape_string(Security::remove_XSS($_POST['urllink']))."', title='".Database::escape_string(Security::remove_XSS($_POST['title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."', category_id='".Database::escape_string(Security::remove_XSS($_POST['selectcategory']))."', display_order='".$max_display_order."', on_homepage='".Database::escape_string(Security::remove_XSS($onhomepage))." ' $mytarget WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
+			$sql = "UPDATE ".$tbl_link." SET " .
+					"url='".Database::escape_string($_POST['urllink'])."', " .
+					"title='".Database::escape_string($_POST['title'])."', " .
+					"description='".Database::escape_string($_POST['description'])."', " .
+					"category_id='".Database::escape_string($_POST['selectcategory'])."', " .
+					"display_order='".$max_display_order."', " .
+					"on_homepage='".Database::escape_string($onhomepage)." ' $mytarget " .
+					" WHERE id='".Database::escape_string($_POST['id'])."'";
 			Database::query($sql);
 
             // Update search enchine and its values table if enabled
@@ -453,7 +460,7 @@ function editlinkcategory($type) {
 
 		// This is used to put the modified info of the category-form into the database
 		if ($submit_category) {
-			$sql = "UPDATE ".$tbl_categories." set category_title='".Database::escape_string(Security::remove_XSS($_POST['category_title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."' WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
+			$sql = "UPDATE ".$tbl_categories." set category_title='".Database::escape_string($_POST['category_title'])."', description='".Database::escape_string($_POST['description'])."' WHERE id='".Database::escape_string($_POST['id'])."'";
 			Database::query($sql);
 			Display::display_confirmation_message(get_lang('CategoryModded'));
 		}

From 03cefca1a0a266e2eaf94ddc8bcce6e5e5e2b9f4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:48:34 +0200
Subject: [PATCH 35/63] Removing execise use of remove_XSS . i.e:
 Database::escape_string(Security::remove_XSS())

---
 main/survey/survey.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index e94d212dc6..19587cc1d8 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -217,16 +217,16 @@ class survey_manager {
 			}
 			$sql = "INSERT INTO $table_survey (code, title, subtitle, author, lang, avail_from, avail_till, is_shared, template, intro, surveythanks, creation_date, anonymous".$additional['columns'].", session_id) VALUES (
 						'".Database::escape_string(strtolower(generate_course_code(api_substr($values['survey_code'],0))))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_title'])), COURSEMANAGERLOWSECURITY))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_subtitle'])), COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string($values['survey_title'])."',
+						'".Database::escape_string($values['survey_subtitle'])."',
 						'".Database::escape_string($_user['user_id'])."',
 						'".Database::escape_string($values['survey_language'])."',
 						'".Database::escape_string($values['start_date'])."',
 						'".Database::escape_string($values['end_date'])."',
 						'".Database::escape_string($shared_survey_id)."',
 						'".Database::escape_string('template')."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_introduction'])), COURSEMANAGERLOWSECURITY))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_thanks'])), COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string($values['survey_introduction'])."',
+						'".Database::escape_string($values['survey_thanks'])."',
 						'".date('Y-m-d H:i:s')."',
 						'".Database::escape_string($values['anonymous'])."'".$additional['values'].",
 						".intval($_SESSION['id_session'])."

From 130f367a823d6e0c9352bc58fdd597b896a29d08 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:53:01 +0200
Subject: [PATCH 36/63] Removing execise use of remove_XSS . i.e:
 Database::escape_string(Security::remove_XSS())

---
 main/wiki/wiki.inc.php | 125 +++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 66 deletions(-)

diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 5d1657efe7..7271fc0970 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -270,16 +270,17 @@ function save_wiki() {
 	// NOTE: visibility, visibility_disc and ratinglock_disc changes are not made here, but through the interce buttons
 
 	// cleaning the variables
-	$_clean['page_id']=Database::escape_string($_POST['page_id']);
-	$_clean['reflink']=Database::escape_string(Security::remove_XSS($_POST['reflink']));
-	$_clean['title']=Database::escape_string(Security::remove_XSS($_POST['title']));
-	$_clean['content']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['content'])),COURSEMANAGERLOWSECURITY));
-	$_clean['user_id']=(int)Database::escape_string(api_get_user_id());
-	$_clean['assignment']=Database::escape_string($_POST['assignment']);
-    $_clean['comment']=Database::escape_string(Security::remove_XSS($_POST['comment']));
-    $_clean['progress']=Database::escape_string($_POST['progress']);
-	$_clean['version']=Database::escape_string($_POST['version'])+1;
-	$_clean['linksto'] = links_to($_clean['content']); //and check links content
+	$_clean['page_id']		= Database::escape_string($_POST['page_id']);
+	$_clean['reflink']		= Database::escape_string($_POST['reflink']);
+	$_clean['title']		= Database::escape_string($_POST['title']);
+	$_clean['content']		= Database::escape_string($_POST['content']);
+	$_clean['user_id']		= api_get_user_id();
+	$_clean['assignment']	= Database::escape_string($_POST['assignment']);
+    $_clean['comment']		= Database::escape_string($_POST['comment']);
+    $_clean['progress']		= Database::escape_string($_POST['progress']);
+	$_clean['version']		= intval($_POST['version']) + 1 ;
+	$_clean['linksto'] 		= links_to($_clean['content']); //and check links content
+	
 	$dtime = date( "Y-m-d H:i:s" );
 	$session_id = api_get_session_id();
 
@@ -296,56 +297,55 @@ function save_wiki() {
 
 	if(!empty($_POST['task']))
 	{
-		$_clean['task']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['task'])),COURSEMANAGERLOWSECURITY));
+		$_clean['task']= Database::escape_string($_POST['task']);
 	}
-	if(!empty($_POST['feedback1']) || !empty($_POST['feedback2']) || !empty($_POST['feedback3']))
-	{
-		$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1']));
-		$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
-		$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
-		$_clean['fprogress1']=Database::escape_string(Security::remove_XSS($_POST['fprogress1']));
-		$_clean['fprogress2']=Database::escape_string(Security::remove_XSS($_POST['fprogress2']));
-		$_clean['fprogress3']=Database::escape_string(Security::remove_XSS($_POST['fprogress3']));
+	if(!empty($_POST['feedback1']) || !empty($_POST['feedback2']) || !empty($_POST['feedback3'])) {
+		$_clean['feedback1']=Database::escape_string($_POST['feedback1']);
+		$_clean['feedback2']=Database::escape_string($_POST['feedback2']);
+		$_clean['feedback3']=Database::escape_string($_POST['feedback3']);
+		$_clean['fprogress1']=Database::escape_string($_POST['fprogress1']);
+		$_clean['fprogress2']=Database::escape_string($_POST['fprogress2']);
+		$_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
 	}
 
 	if(Security::remove_XSS($_POST['initstartdate']==1))
 	{
-		$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('startdate_assig')));
+		$_clean['startdate_assig']=Database::escape_string(get_date_from_select('startdate_assig'));
 	}
 	else
 	{
-		$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS($_POST['startdate_assig']));
+		$_clean['startdate_assig']=Database::escape_string($_POST['startdate_assig']);
 	}
 
 	if(Security::remove_XSS($_POST['initenddate']==1))
 	{
-		$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('enddate_assig')));
+		$_clean['enddate_assig']=Database::escape_string(get_date_from_select('enddate_assig'));
 	}
 	else
 	{
-		$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS($_POST['enddate_assig']));
+		$_clean['enddate_assig']=Database::escape_string($_POST['enddate_assig']);
 	}
 
-	$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit']));
+	$_clean['delayedsubmit']=Database::escape_string($_POST['delayedsubmit']);
 
 	if(!empty($_POST['max_text']) || !empty($_POST['max_version']))
 	{
-		$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text']));
-		$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version']));
+		$_clean['max_text']	=Database::escape_string($_POST['max_text']);
+		$_clean['max_version']=Database::escape_string($_POST['max_version']);
 	}
 
-	$sql = "INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip, session_id) VALUES ('".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
+	$sql = "INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip, session_id)
+			VALUES ('".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
 
-	$result=Database::query($sql);
-    $Id = Database::insert_id();
+	$result	= Database::query($sql);
+    $Id 	= Database::insert_id();
 
 	if ($Id > 0) {
 		//insert into item_property
 		api_item_property_update(api_get_course_info(), TOOL_WIKI, $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']);
 	}
 
-	if ($_clean['page_id']	==0)
-	{
+	if ($_clean['page_id']	==0) {
 		$sql='UPDATE '.$tbl_wiki.' SET page_id="'.$Id.'" WHERE id="'.$Id.'"';
 		Database::query($sql);
 	}
@@ -354,7 +354,8 @@ function save_wiki() {
 
 	if ($_clean['reflink']=='index' && $_clean['version']==1)
 	{
-		$sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
+		$sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit)
+			  VALUES ('".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
 	}
 	else
 	{
@@ -435,13 +436,13 @@ function save_new_wiki() {
 	$session_id = api_get_session_id();
 
 	if($_clean['assignment']==2 || $_clean['assignment']==1) {// Unlike ordinary pages of pages of assignments. Allow create a ordinary page although there is a assignment with the same name
-		$_clean['reflink']=Database::escape_string(Security::remove_XSS(str_replace(' ','_',$_POST['title']."_uass".$assig_user_id)));
+		$_clean['reflink']=Database::escape_string(str_replace(' ','_',$_POST['title']."_uass".$assig_user_id));
     } else {
-	 	$_clean['reflink']=Database::escape_string(Security::remove_XSS(str_replace(' ','_',$_POST['title'])));
+	 	$_clean['reflink']=Database::escape_string(str_replace(' ','_',$_POST['title']));
 	}
 
-	$_clean['title']=Database::escape_string(Security::remove_XSS($_POST['title']));
-	$_clean['content']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['content'])),COURSEMANAGERLOWSECURITY));
+	$_clean['title']=Database::escape_string($_POST['title']);
+	$_clean['content']= Database::escape_string($_POST['content']);
 
 	if($_clean['assignment']==2)  {//config by default for individual assignment (students)
 
@@ -452,7 +453,7 @@ function save_new_wiki() {
 		$_clean['ratinglock_disc']=0;
 
 	} else {
-	 	$_clean['user_id']=(int)Database::escape_string(api_get_user_id());
+	 	$_clean['user_id']=api_get_user_id();
 
 		$_clean['visibility']=1;
 		$_clean['visibility_disc']=1;
@@ -460,7 +461,7 @@ function save_new_wiki() {
 
 	}
 
-	$_clean['comment']=Database::escape_string(Security::remove_XSS($_POST['comment']));
+	$_clean['comment']=Database::escape_string($_POST['comment']);
 	$_clean['progress']=Database::escape_string($_POST['progress']);
 	$_clean['version']=1;
 
@@ -476,44 +477,36 @@ function save_new_wiki() {
 	$_clean['linksto'] = links_to($_clean['content']);	//check wikilinks
 
 	//cleaning config variables
-	$_clean['task']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['task'])),COURSEMANAGERLOWSECURITY));
-	$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1']));
-	$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
-	$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
-	$_clean['fprogress1']=Database::escape_string(Security::remove_XSS($_POST['fprogress1']));
-	$_clean['fprogress2']=Database::escape_string(Security::remove_XSS($_POST['fprogress2']));
-	$_clean['fprogress3']=Database::escape_string(Security::remove_XSS($_POST['fprogress3']));
-
-	if(Security::remove_XSS($_POST['initstartdate']==1))
-	{
-		$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('startdate_assig')));
-	}
-	else
-	{
-		$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS($_POST['startdate_assig']));
+	$_clean['task']= Database::escape_string($_POST['task']);
+	$_clean['feedback1']=Database::escape_string($_POST['feedback1']);
+	$_clean['feedback2']=Database::escape_string($_POST['feedback2']);
+	$_clean['feedback3']=Database::escape_string($_POST['feedback3']);
+	$_clean['fprogress1']=Database::escape_string($_POST['fprogress1']);
+	$_clean['fprogress2']=Database::escape_string($_POST['fprogress2']);
+	$_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
+
+	if(Security::remove_XSS($_POST['initstartdate']==1)) {
+		$_clean['startdate_assig']=Database::escape_string(get_date_from_select('startdate_assig'));
+	} else {
+		$_clean['startdate_assig']=Database::escape_string($_POST['startdate_assig']);
 	}
 
-	if(Security::remove_XSS($_POST['initenddate']==1))
-	{
-		$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('enddate_assig')));
-	}
-	else
-	{
-		$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS($_POST['enddate_assig']));
+	if(Security::remove_XSS($_POST['initenddate']==1)) {
+		$_clean['enddate_assig']=Database::escape_string(get_date_from_select('enddate_assig'));
+	} else {
+		$_clean['enddate_assig']=Database::escape_string($_POST['enddate_assig']);
 	}
 
-	$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit']));
-	$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text']));
-	$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version']));
+	$_clean['delayedsubmit']=Database::escape_string($_POST['delayedsubmit']);
+	$_clean['max_text']=Database::escape_string($_POST['max_text']);
+	$_clean['max_version']=Database::escape_string($_POST['max_version']);
 
 	//filter no _uass
 	if (api_eregi('_uass', $_POST['title']) || (api_strtoupper(trim($_POST['title'])) == 'INDEX' || api_strtoupper(trim(api_htmlentities($_POST['title'], ENT_QUOTES, $charset))) == api_strtoupper(api_htmlentities(get_lang('DefaultTitle'), ENT_QUOTES, $charset)))) {
 		$message= get_lang('GoAndEditMainPage');
 		Display::display_warning_message($message,false);
 	} else {
-
 		$var=$_clean['reflink'];
-
 		$group_id=Security::remove_XSS($_GET['group_id']);
 		if(!checktitle($var)) {
 		   return get_lang('WikiPageTitleExist').'<a href="index.php?action=edit&amp;title='.$var.'&group_id='.$group_id.'">'.$_POST['title'].'</a>';
@@ -2084,7 +2077,7 @@ function make_select($name,$values,$checked='') {
  *
  */
 function get_date_from_select($prefix) {
-				return $_POST[$prefix.'_year'].'-'.two_digits($_POST[$prefix.'_month']).'-'.two_digits($_POST[$prefix.'_day']).' '.two_digits($_POST[$prefix.'_hour']).':'.two_digits($_POST[$prefix.'_minute']).':00';
+	return $_POST[$prefix.'_year'].'-'.two_digits($_POST[$prefix.'_month']).'-'.two_digits($_POST[$prefix.'_day']).' '.two_digits($_POST[$prefix.'_hour']).':'.two_digits($_POST[$prefix.'_minute']).':00';
 }
 
 /**

From aa7cc3e9169216fa8d6fc8a6d27002876319d828 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 19:53:59 +0200
Subject: [PATCH 37/63] Removing use of remove_XSS . i.e:
 Database::escape_string(Security::remove_XSS())

---
 main/wiki/wiki.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 7271fc0970..91b2dcbb4c 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -485,13 +485,13 @@ function save_new_wiki() {
 	$_clean['fprogress2']=Database::escape_string($_POST['fprogress2']);
 	$_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
 
-	if(Security::remove_XSS($_POST['initstartdate']==1)) {
+	if($_POST['initstartdate']==1) {
 		$_clean['startdate_assig']=Database::escape_string(get_date_from_select('startdate_assig'));
 	} else {
 		$_clean['startdate_assig']=Database::escape_string($_POST['startdate_assig']);
 	}
 
-	if(Security::remove_XSS($_POST['initenddate']==1)) {
+	if($_POST['initenddate']==1) {
 		$_clean['enddate_assig']=Database::escape_string(get_date_from_select('enddate_assig'));
 	} else {
 		$_clean['enddate_assig']=Database::escape_string($_POST['enddate_assig']);

From 8d54ded29a09f0a0a3a3c5954f9c6e17658d1977 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 20:00:12 +0200
Subject: [PATCH 38/63] Cleaning code

---
 main/wiki/index.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/main/wiki/index.php b/main/wiki/index.php
index e4cd4984f0..941b882ac6 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -1843,18 +1843,14 @@ if ($_GET['action']=='history' or Security::remove_XSS($_POST['HistoryDifference
 //rss feed. TODO:
 //
 
-if ($_GET['action']=='recentchanges')
-{
+if ($_GET['action']=='recentchanges') {
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	if ( api_is_allowed_to_session_edit(false,true) ) {
-		if (check_notify_all()==1)
-		{
+		if (check_notify_all()==1) {
 			$notify_all= '<img src="../img/wiki/send_mail_checked.gif" title="'.get_lang('FullNotifyByEmail').'" alt="'.get_lang('FullNotifyByEmail').'" style="vertical-align:middle;" />'.get_lang('NotNotifyChanges');
 			$lock_unlock_notify_all='unlocknotifyall';
-		}
-		else
-		{
+		} else {
 			$notify_all= '<img src="../img/wiki/send_mail.gif" title="'.get_lang('FullCancelNotifyByEmail').'" alt="'.get_lang('FullCancelNotifyByEmail').'"  style="vertical-align:middle;"/>'.get_lang('NotifyChanges');
 			$lock_unlock_notify_all='locknotifyall';
 		}
@@ -1873,14 +1869,12 @@ if ($_GET['action']=='recentchanges')
 
 		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.$condition_session.' ORDER BY dtime DESC'; // new version
 
-	}
-	else
-	{
+	} else	{
 		$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.$condition_session.' AND visibility=1 ORDER BY dtime DESC';	// old version TODO: Replace by the bottom line
 
 		//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND visibility=1 AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version
 	}
-
+	
 	$allpages=Database::query($sql);
 
 	//show table

From d133ff9d3d9a751110b42d1c96d7cd4ea938cc84 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 20:09:04 +0200
Subject: [PATCH 39/63] Minor changing Dxxxx to Chamilo

---
 main/inc/lib/security.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 main/inc/lib/security.lib.php

diff --git a/main/inc/lib/security.lib.php b/main/inc/lib/security.lib.php
old mode 100644
new mode 100755
index 9c6106d1c1..0059e35a5d
--- a/main/inc/lib/security.lib.php
+++ b/main/inc/lib/security.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-* This is the security library for Dokeos.
+* This is the security library for Chamilo.
 *
 * This library is based on recommendations found in the PHP5 Certification
 * Guide published at PHP|Architect, and other recommendations found on
 * http://www.phpsec.org/
-* The principles here are that all data is tainted (most scripts of Dokeos are
+* The principles here are that all data is tainted (most scripts of Chamilo are
 * open to the public or at least to a certain public that could be malicious
 * under specific circumstances). We use the white list approach, where as we
 * consider that data can only be used in the database or in a file if it has

From 09f40030e3e8aa8963a8525fa94845f69b4d31b3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 21:06:50 +0200
Subject: [PATCH 40/63] Cleaning code + adding securty::remove_XSS

---
 main/admin/access_url_edit_courses_to_url.php |  1 -
 .../admin/access_url_edit_sessions_to_url.php |  2 +-
 main/admin/calendar.lib.php                   | 89 ++++++++-----------
 main/admin/calendar.php                       | 51 +++--------
 4 files changed, 46 insertions(+), 97 deletions(-)

diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index b646ace69f..5345ecf62c 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -17,7 +17,6 @@ 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');
 
 $xajax = new xajax();
-//$xajax->debugOn();
 $xajax -> registerFunction (array('search_courses', 'Accessurleditcoursestourl', 'search_courses'));
 
 
diff --git a/main/admin/access_url_edit_sessions_to_url.php b/main/admin/access_url_edit_sessions_to_url.php
index c5fbac3397..776611444c 100755
--- a/main/admin/access_url_edit_sessions_to_url.php
+++ b/main/admin/access_url_edit_sessions_to_url.php
@@ -18,7 +18,7 @@ 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();
+
 $xajax -> registerFunction (array('search_sessions', 'Accessurleditsessionstourl', 'search_sessions'));
 
 
diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php
index d890c52042..2d34c50a1b 100755
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
@@ -4,6 +4,8 @@
 *	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/agenda.inc.php
+*
+*  	@todo This file should not exist since redeclares many of the functions in calendar/agenda.inc.php J.M
 */
 
 /*
@@ -40,8 +42,7 @@ $MonthsLong = api_get_months_long();
 * @return html code
 * @todo refactor this so that $monthName is no longer needed as a parameter
 */
-function display_minimonthcalendar($agendaitems, $month, $year, $monthName)
-{
+function display_minimonthcalendar($agendaitems, $month, $year, $monthName) {
 	global $DaysShort;
 	//Handle leap year
 	$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
@@ -119,10 +120,9 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName)
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @return javascript code
 */
-function to_javascript()
-{
-$Send2All=get_lang("Send2All");
-return "<script type=\"text/javascript\" language=\"JavaScript\">
+function to_javascript() {
+	$Send2All=get_lang("Send2All");
+	return "<script type=\"text/javascript\" language=\"JavaScript\">
 <!-- Begin javascript menu swapper
 
 function move(fbox,	tbox)
@@ -287,21 +287,19 @@ function validate_date()
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @return javascript code
 */
-function user_group_filter_javascript()
-{
-return "<script language=\"JavaScript\" type=\"text/JavaScript\">
-<!--
-function MM_jumpMenu(targ,selObj,restore){
-  eval(targ+\".location='\"+selObj.options[selObj.selectedIndex].value+\"'\");
-  if (restore) selObj.selectedIndex=0;
-}
-//-->
-</script>
-";
+function user_group_filter_javascript() {
+	return "<script language=\"JavaScript\" type=\"text/JavaScript\">
+	<!--
+	function MM_jumpMenu(targ,selObj,restore){
+	  eval(targ+\".location='\"+selObj.options[selObj.selectedIndex].value+\"'\");
+	  if (restore) selObj.selectedIndex=0;
+	}
+	//-->
+	</script>
+	";
 }
 
-function display_monthcalendar($month, $year)
-{
+function display_monthcalendar($month, $year) {
 	global $MonthsLong;
 	global $DaysShort;
 	global $origin;
@@ -333,16 +331,14 @@ function display_monthcalendar($month, $year)
 
 	echo "<tr>\n";
 
-	for ($ii=1;$ii<8; $ii++)
-	{
-	echo "<td class=\"weekdays\" width=\"14%\">",$DaysShort[$ii%7],"</td>\n";
-  }
+	for ($ii=1;$ii<8; $ii++) {
+		echo "<td class=\"weekdays\" width=\"14%\">",$DaysShort[$ii%7],"</td>\n";
+  	}
 
 	echo "</tr>\n";
 	$curday = -1;
 	$today = getdate();
-	while ($curday <=$numberofdays[$month])
-  	{
+	while ($curday <=$numberofdays[$month]) {
 	echo "<tr>\n";
     	for ($ii=0; $ii<7; $ii++)
 	  	{
@@ -401,9 +397,7 @@ echo "</table>";
 * @author: Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @return integer the id of the last added agenda item
 */
-function store_new_agenda_item()
-{
-	global $_user /*, $_course*/;
+function store_new_agenda_item() {	
 	
 	$TABLEAGENDA = Database::get_main_table(TABLE_MAIN_SYSTEM_CALENDAR);
     //$t_agenda_repeat = Database::get_course_Table(TABLE_AGENDA_REPEAT);
@@ -486,23 +480,16 @@ function display_courseadmin_links() {
 	echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('calendar_personal_add.gif', get_lang('AgendaAdd'))." ".get_lang('AgendaAdd')."</a>";
 
 }
-function display_student_links()
-{
-	global $show;
-	if ($_SESSION['sort'] == 'DESC')
-	{
-		echo "<a href='".api_get_self()."?sort=asc&amp;origin=".$_GET['origin']."'>".Display::return_icon('calendar_up.gif',get_lang('AgendaSortChronologicallyUp')).' '.get_lang("AgendaSortChronologicallyUp")."</a>";
-	}
-	else
-	{
-		echo "<a href='".api_get_self()."?sort=desc&amp;origin=".$_GET['origin']."'>".Display::return_icon('calendar_down.gif',get_lang('AgendaSortChronologicallyDown')).' '.get_lang("AgendaSortChronologicallyDown")."</a>";
+
+function display_student_links() {	
+	if ($_SESSION['sort'] == 'DESC') {
+		echo "<a href='".api_get_self()."?sort=asc&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('calendar_up.gif',get_lang('AgendaSortChronologicallyUp')).' '.get_lang("AgendaSortChronologicallyUp")."</a>";
+	} else {
+		echo "<a href='".api_get_self()."?sort=desc&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('calendar_down.gif',get_lang('AgendaSortChronologicallyDown')).' '.get_lang("AgendaSortChronologicallyDown")."</a>";
 	}
-	if ($_SESSION['view'] <> 'month')
-	{
+	if ($_SESSION['view'] <> 'month') {
 		echo "\t<a href=\"".api_get_self()."?action=view&amp;view=month\"><img src=\"../img/calendar_month.gif\" border=\"0\" alt=\"".get_lang('MonthView')."\" /> ".get_lang('MonthView')."</a>\n";
-	}
-	else
-	{
+	} else {
 		echo "\t<a href=\"".api_get_self()."?action=view&amp;view=list\"><img src=\"../img/calendar_select.gif\" border=\"0\" alt=\"".get_lang('ListView')."\" /> ".get_lang('ListView')."</a>\n";
 	}
 }
@@ -512,8 +499,7 @@ function display_student_links()
 * @param integer the id of the agenda item we are getting all the information of
 * @return an associative array that contains all the information of the agenda item. The keys are the database fields
 */
-function get_agenda_item($id)
-{
+function get_agenda_item($id) {
 	$TABLEAGENDA = Database::get_main_table(TABLE_MAIN_SYSTEM_CALENDAR);
     //$t_agenda_repeat = Database::get_course_table(TABLE_AGENDA_REPEAT);
     $item = array();
@@ -532,12 +518,9 @@ function get_agenda_item($id)
 	$item['end_date']		= $entry_to_edit["end_date"];
 	$item['to']				== "everyone";
 	// if the item has been sent to everybody then we show the compact to form
-	if ($item['to']=="everyone")
-	{
+	if ($item['to']=="everyone") {
 		$_SESSION['allow_individual_calendar']="hide";
-	}
-	else
-	{
+	} else {
 		$_SESSION['allow_individual_calendar']="show";
 	}
 
@@ -550,8 +533,7 @@ function get_agenda_item($id)
 * 3. modify the attachments (if needed)
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
-function store_edited_agenda_item()
-{
+function store_edited_agenda_item() {
 
 	// STEP 1: editing the calendar_event table
 	// 1.a.  some filtering of the input data
@@ -626,8 +608,7 @@ function delete_agenda_item($id)
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @param integer id the id of the agenda item we are changing the visibility of
 */
-function showhide_agenda_item($id)
-{
+function showhide_agenda_item($id) {
 	global $nameTools;
 	/*==================================================
 				SHOW / HIDE A CALENDAR ITEM
diff --git a/main/admin/calendar.php b/main/admin/calendar.php
index b00802c556..48b2e67491 100755
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
@@ -23,14 +23,6 @@ api_protect_admin_script(true);
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-//$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-
-// Database Table Definitions
-//	$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-//	$tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-//	$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-//	$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-//	$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
 
 // setting the name of the tool
 $tool_name= get_lang('SubscribeCoursesToSession');
@@ -47,23 +39,18 @@ if(!api_is_platform_admin())
 	}
 }
 /*
------------------------------------------------------------
 	Libraries
------------------------------------------------------------
 */
 // containing the functions for the agenda tool
-include "calendar.lib.php";
-// some debug functions
-include($includePath."/lib/debug.lib.inc.php");
-
+require_once 'calendar.lib.php';
 
-/*==============================================================================
+/*
   			TREATING THE PARAMETERS
 			1. viewing month only or everything
 			2. sort ascending or descending
 			3. showing or hiding the send-to-specific-groups-or-users form
 			4. filter user or group
-  ============================================================================== */
+ */
 // 1. show all or show current month?
 if (!$_SESSION['show'])
 {
@@ -133,9 +120,9 @@ else
 	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"".$clarolineRepositoryWeb."css/default.css\"/>";
 }*/
 
-/* ==============================================================================
+/* 
   			SETTING SOME VARIABLES
-============================================================================== */
+*/
 // Variable definitions
 // Defining the shorts for the days. We use camelcase because these are arrays of language variables
 $DaysShort = api_get_week_days_short();
@@ -151,29 +138,18 @@ $tbl_user       		= Database::get_main_table(TABLE_MAIN_USER);
 $tbl_courseUser 		= Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $tbl_group      		= Database::get_course_table(TABLE_GROUP);
 $tbl_groupUser  		= Database::get_course_table(TABLE_GROUP_USER);
-$tbl_session_course_user= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
-
-
-/* ==============================================================================
+/* 
   			ACCESS RIGHTS
-============================================================================== */
+*/
 // permission stuff - also used by loading from global in agenda.inc.php
 $is_allowed_to_edit = is_allowed_to_edit() OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
 
-// Displaying the title of the tool
-// api_display_tool_title($nameTools);
-
-// tool introduction
-//Display::display_introduction_section(TOOL_CALENDAR_EVENT);
-
 // insert an anchor (top) so one can jump back to the top of the page
 echo "<a name=\"top\"></a>";
 
 /*
-==============================================================================
 		MAIN SECTION
-==============================================================================
 */
 
 //setting the default year and month
@@ -207,10 +183,8 @@ echo '</div><br /><br />';
 echo '<table width="100%" border="0" cellspacing="0" cellpadding="0">'
 		. '<tr>';
 
-
 // THE LEFT PART
-if (empty($_GET['origin']) or $_GET['origin']!='learnpath')
-{
+if (empty($_GET['origin']) or $_GET['origin']!='learnpath') {
 	echo '<td width="220" height="19" valign="top">';
 	// the small calendar
 	$MonthName = $MonthsLong[$select_month -1];
@@ -382,15 +356,10 @@ if (!$_GET['action'] OR $_GET['action']=="showall"  OR $_GET['action']=="showcur
 echo "&nbsp;</td></tr></table>";
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
 // The footer is displayed only if we are not in the learnpath
-if ($_GET['origin'] != 'learnpath')
-{
-
+if ($_GET['origin'] != 'learnpath') {
 	Display::display_footer();
-
 }
-?>
+?>
\ No newline at end of file

From ce635f12420f7f197b9a00b3b03dd9321d5c403d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 18 May 2010 21:13:22 +0200
Subject: [PATCH 41/63] Minor - Adding headers

---
 main/conference/api.php                 | 9 ++++-----
 main/conference/audiopost.php           | 4 +++-
 main/conference/checksession.php        | 2 +-
 main/conference/get_translation.lib.php | 2 +-
 main/conference/index.php               | 9 ++++++---
 main/conference/testpost.php            | 2 ++
 main/conference/videoconference.php     | 2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 main/conference/api.php
 mode change 100644 => 100755 main/conference/audiopost.php
 mode change 100644 => 100755 main/conference/checksession.php
 mode change 100644 => 100755 main/conference/index.php
 mode change 100644 => 100755 main/conference/testpost.php
 mode change 100644 => 100755 main/conference/videoconference.php

diff --git a/main/conference/api.php b/main/conference/api.php
old mode 100644
new mode 100755
index bb7adb8ab9..3dede1f9a7
--- a/main/conference/api.php
+++ b/main/conference/api.php
@@ -1,14 +1,13 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 
 /* FIX for IE cache when using https */
 session_cache_limiter("none");
 
 /**
-==============================================================================
-*	This is an interface between Dokeos and Videoconference application
+*	This is an interface between Chamilo and Videoconference application
 *
-==============================================================================
+
 */
 /*==== DEBUG ====*/
 $debug=0;
@@ -42,7 +41,7 @@ if ($_SERVER['HTTP_USER_AGENT'] == 'Shockwave Flash') {
 } */
 
 /*==== INCLUDE ====*/
-require_once ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 api_block_anonymous_users();
 require_once (api_get_path(LIBRARY_PATH)."course.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."document.lib.php");
diff --git a/main/conference/audiopost.php b/main/conference/audiopost.php
old mode 100644
new mode 100755
index ee1f3147bc..2986509bad
--- a/main/conference/audiopost.php
+++ b/main/conference/audiopost.php
@@ -1,8 +1,10 @@
 <?php
+/* See license terms in /license.txt */
+
 //file_put_contents("result.txt", print_r($_POST, true));
 //file_put_contents("result3.txt", print_r($_FILES, true));
 //file_put_contents("result2.txt", print_r($_GET, true));
-require('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 
 // check the request comes from our red5 server
 $ips = gethostbynamel(api_get_setting('service_visio','visio_host'));
diff --git a/main/conference/checksession.php b/main/conference/checksession.php
old mode 100644
new mode 100755
index 5912d7a42b..ee24b6efef
--- a/main/conference/checksession.php
+++ b/main/conference/checksession.php
@@ -1,5 +1,5 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 
 /* FIX for IE cache when using https */
 session_cache_limiter("none");
diff --git a/main/conference/get_translation.lib.php b/main/conference/get_translation.lib.php
index d66f217ad0..301426f375 100755
--- a/main/conference/get_translation.lib.php
+++ b/main/conference/get_translation.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* See license terms in /chamilo_license.txt */
+/* See license terms in /license.txt */
 /**
  * Library for language translation from Chamilo language files to XML for videoconference
  * @uses main_api.lib.php for api_get_path()
diff --git a/main/conference/index.php b/main/conference/index.php
old mode 100644
new mode 100755
index 2f72908e99..10ab049fc9
--- a/main/conference/index.php
+++ b/main/conference/index.php
@@ -1,11 +1,14 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
  * Generates the HTML page containing the iframe that loads the videoconference's Flash plugin
  */
-include("../inc/global.inc.php");
+require_once '../inc/global.inc.php'; 
 api_protect_course_script();
-$_SESSION["roomType"] = $_GET['type'];
+//Not sure what values can be set here I just found that $_SESSION["roomType"] could be the string "conference" 
+if ($_GET['type'] == 'conference') {
+	$_SESSION["roomType"] = $_GET['type'];
+}
 ?>
 <span align="center">
 <iframe frameborder="0" scrolling="no" width="100%" height="100%" src="videoconference.php"></iframe>
diff --git a/main/conference/testpost.php b/main/conference/testpost.php
old mode 100644
new mode 100755
index f4b7b8b966..c28ed5745f
--- a/main/conference/testpost.php
+++ b/main/conference/testpost.php
@@ -1,4 +1,6 @@
 <?php
+/* See license terms in /license.txt */
+
 //file_put_contents("result.txt", print_r($_POST, true));
 //file_put_contents("result3.txt", print_r($_FILES, true));
 //file_put_contents("result2.txt", print_r($_GET, true));
diff --git a/main/conference/videoconference.php b/main/conference/videoconference.php
old mode 100644
new mode 100755
index 1bcdfdfadc..de1d2a4805
--- a/main/conference/videoconference.php
+++ b/main/conference/videoconference.php
@@ -1,4 +1,4 @@
-<?php require('../inc/global.inc.php'); ?>
+<?php require_once '../inc/global.inc.php';?>
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>

From 3064dfe27ac53bf2488089f8b57bc1294ddce4ca Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 20 May 2010 12:10:50 +0200
Subject: [PATCH 42/63] Fixing javascript error in LPs in ie8 see CT#827

---
 main/newscorm/lp_view.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index c9f9902c9d..beb097127d 100755
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -391,6 +391,20 @@ window.onload = function() {
 	document.body.style.overflow = 'hidden';
 	updateContentHeight();
 	viewportheight = window.innerHeight;
+	//Fixing IE compatibility of window.innerHeight
+
+	var viewportheight = 0;
+	if( typeof( window.innerHeight ) == 'number' ) {
+	    //Non-IE
+		viewportheight = window.innerHeight;
+	} else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+    	//IE 6+ in 'standards compliant mode'
+	    viewportheight = document.documentElement.clientHeight;
+ 	} else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+	    //IE 4 compatible
+	    viewportheight = document.body.clientHeight;
+ 	}
+
 	document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
 
 }
@@ -584,7 +598,21 @@ window.onload = function() {
 	rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
 	document.body.style.overflow = 'hidden';
 	updateContentHeight();
-	viewportheight = window.innerHeight;
+	
+	//Fixing IE compatibility of window.innerHeight
+
+	var viewportheight = 0;
+	if( typeof( window.innerHeight ) == 'number' ) {
+	    //Non-IE
+		viewportheight = window.innerHeight;
+	} else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+    	//IE 6+ in 'standards compliant mode'
+	    viewportheight = document.documentElement.clientHeight;
+ 	} else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+	    //IE 4 compatible
+	    viewportheight = document.body.clientHeight;
+ 	}
+
 	document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
 
 
@@ -633,4 +661,4 @@ window.onresize = updateContentHeight;
 	//Display::display_footer();
 }
 //restore global setting
-$_setting['show_navigation_menu'] = $save_setting;
\ No newline at end of file
+$_setting['show_navigation_menu'] = $save_setting;

From 9446154dd109ac237576bccd3382013b44afdb93 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 20 May 2010 14:14:11 +0200
Subject: [PATCH 43/63] Cleaning file removing \n and \t

---
 main/admin/calendar.lib.php | 182 ++++++++++++++++++------------------
 1 file changed, 90 insertions(+), 92 deletions(-)

diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php
index 2d34c50a1b..bf8ae91c7c 100755
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
@@ -55,22 +55,22 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName) {
 	$backwardsURL = api_get_self()."?".api_get_cidreq()."&amp;coursePath=".(empty($_GET['coursePath'])?'':$_GET['coursePath'])."&amp;courseCode=".(empty($_GET['courseCode'])?'':$_GET['courseCode'])."&amp;month=". ($month == 1 ? 12 : $month -1)."&amp;year=". ($month == 1 ? $year -1 : $year);
 	$forewardsURL = api_get_self()."?".api_get_cidreq()."&amp;coursePath=".(empty($_GET['coursePath'])?'':$_GET['coursePath'])."&amp;courseCode=".(empty($_GET['courseCode'])?'':$_GET['courseCode'])."&amp;month=". ($month == 12 ? 1 : $month +1)."&amp;year=". ($month == 12 ? $year +1 : $year);
 
-	echo 	"<table class=\"data_table\">\n",
-			"<tr>\n",
-			"<th width=\"10%\"><a href=\"", $backwardsURL, "\"> ".Display::return_icon('action_prev.png',get_lang('Previous'))." </a></th>\n",
-			"<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
-			"<th  width=\"10%\"><a href=\"", $forewardsURL, "\"> ".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>\n", "</tr>\n";
-	echo "<tr>\n";
+	echo 	"<table class=\"data_table\">",
+			"<tr>",
+			"<th width=\"10%\"><a href=\"", $backwardsURL, "\"> ".Display::return_icon('action_prev.png',get_lang('Previous'))." </a></th>",
+			"<th width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>",
+			"<th  width=\"10%\"><a href=\"", $forewardsURL, "\"> ".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>", "</tr>";
+	echo "<tr>";
 	for ($ii = 1; $ii < 8; $ii ++)
 	{
-		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>\n";
+		echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 	}
-	echo "</tr>\n";
+	echo "</tr>";
 	$curday = -1;
 	$today = getdate();
 	while ($curday <= $numberofdays[$month])
 	{
-		echo "<tr>\n";
+		echo "<tr>";
 		for ($ii = 0; $ii < 7; $ii ++)
 		{
 			if (($curday == -1) && ($ii == $startdayofweek))
@@ -86,7 +86,7 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName) {
 					$dayheader = "$curday";
 					$class = "class=\"days_today\"";
 				}
-				echo "\t<td ".$class.">";
+				echo "<td ".$class.">";
 				if (!empty($agendaitems[$curday]))
 				{
 					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;action=view&amp;view=day&amp;day=".$curday."&amp;month=".$month."&amp;year=".$year."\">".$dayheader."</a>";
@@ -95,18 +95,18 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName) {
 				{
 					echo $dayheader;
 				}
-				// "a".$dayheader." <span class=\"agendaitem\">".$agendaitems[$curday]."</span>\n";
-				echo "</td>\n";
+				// "a".$dayheader." <span class=\"agendaitem\">".$agendaitems[$curday]."</span>";
+				echo "</td>";
 				$curday ++;
 			}
 			else
 			{
-				echo "<td>&nbsp;</td>\n";
+				echo "<td>&nbsp;</td>";
 			}
 		}
-		echo "</tr>\n";
+		echo "</tr>";
 	}
-	echo "</table>\n";
+	echo "</table>";
 }
 /**
 * show the calender of the given month
@@ -322,24 +322,24 @@ function display_monthcalendar($month, $year) {
 
 	   $maand_array_maandnummer=$month-1;
 
-	echo "<table class=\"data_table\">\n",
-		"<tr>\n",
-		"<th width=\"10%\"><a href=\"",$backwardsURL,"\"> ".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>\n",
-		"<th width=\"80%\" colspan=\"5\">",$MonthsLong[$maand_array_maandnummer]," ",$year,"</th>\n",
-		"<th width=\"10%\"><a href=\"",$forewardsURL,"\"> ".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>\n",
-		"</tr>\n";
+	echo "<table class=\"data_table\">",
+		"<tr>",
+		"<th width=\"10%\"><a href=\"",$backwardsURL,"\"> ".Display::return_icon('action_prev.png',get_lang('Previous'))."</a></th>",
+		"<th width=\"80%\" colspan=\"5\">",$MonthsLong[$maand_array_maandnummer]," ",$year,"</th>",
+		"<th width=\"10%\"><a href=\"",$forewardsURL,"\"> ".Display::return_icon('action_next.png',get_lang('Next'))."</a></th>",
+		"</tr>";
 
-	echo "<tr>\n";
+	echo "<tr>";
 
 	for ($ii=1;$ii<8; $ii++) {
-		echo "<td class=\"weekdays\" width=\"14%\">",$DaysShort[$ii%7],"</td>\n";
+		echo "<td class=\"weekdays\" width=\"14%\">",$DaysShort[$ii%7],"</td>";
   	}
 
-	echo "</tr>\n";
+	echo "</tr>";
 	$curday = -1;
 	$today = getdate();
 	while ($curday <=$numberofdays[$month]) {
-	echo "<tr>\n";
+	echo "<tr>";
     	for ($ii=0; $ii<7; $ii++)
 	  	{
 	  		if (($curday == -1)&&($ii==$startdayofweek))
@@ -367,13 +367,13 @@ function display_monthcalendar($month, $year) {
 
 				if (($curday==$today['mday'])&&($year ==$today['year'])&&($month == $today['mon']))
 				{
-			echo "<td id=\"today\" ",$bgcolor,"\">".$dayheader." \n";
+			echo "<td id=\"today\" ",$bgcolor,"\">".$dayheader." ";
       }
 				else
 				{
-			echo "<td id=\"days\" ",$bgcolor,"\">".$dayheader." \n";
+			echo "<td id=\"days\" ",$bgcolor,"\">".$dayheader." ";
 				}
-			echo "</td>\n";
+			echo "</td>";
 
 	      		$curday++;
 	    }
@@ -488,9 +488,9 @@ function display_student_links() {
 		echo "<a href='".api_get_self()."?sort=desc&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('calendar_down.gif',get_lang('AgendaSortChronologicallyDown')).' '.get_lang("AgendaSortChronologicallyDown")."</a>";
 	}
 	if ($_SESSION['view'] <> 'month') {
-		echo "\t<a href=\"".api_get_self()."?action=view&amp;view=month\"><img src=\"../img/calendar_month.gif\" border=\"0\" alt=\"".get_lang('MonthView')."\" /> ".get_lang('MonthView')."</a>\n";
+		echo "<a href=\"".api_get_self()."?action=view&amp;view=month\"><img src=\"../img/calendar_month.gif\" border=\"0\" alt=\"".get_lang('MonthView')."\" /> ".get_lang('MonthView')."</a>";
 	} else {
-		echo "\t<a href=\"".api_get_self()."?action=view&amp;view=list\"><img src=\"../img/calendar_select.gif\" border=\"0\" alt=\"".get_lang('ListView')."\" /> ".get_lang('ListView')."</a>\n";
+		echo "<a href=\"".api_get_self()."?action=view&amp;view=list\"><img src=\"../img/calendar_select.gif\" border=\"0\" alt=\"".get_lang('ListView')."\" /> ".get_lang('ListView')."</a>";
 	}
 }
 /**
@@ -712,7 +712,7 @@ function display_agenda_items()
     while($myrow=Database::fetch_array($result))
     {
     	$is_repeated = !empty($myrow['parent_event_id']);
-	    echo '<table class="data_table">',"\n";
+	    echo '<table class="data_table">',"";
         /*--------------------------------------------------
         		display: the month bar
          --------------------------------------------------*/
@@ -721,9 +721,9 @@ function display_agenda_items()
         if ($month_bar != api_format_date($myrow["start_date"], "%m%Y"))
 		{
             $month_bar = api_format_date($myrow["start_date"], "%m%Y");
-			echo "\t<tr>\n\t\t<td class=\"agenda_month_divider\" colspan=\"3\" valign=\"top\">".
+			echo "<tr><td class=\"agenda_month_divider\" colspan=\"3\" valign=\"top\">".
 			api_format_date($myrow["start_date"], "%B %Y").
-			"</td>\n\t</tr>\n";
+			"</td></tr>";
 		}
 
         /*--------------------------------------------------
@@ -756,9 +756,9 @@ function display_agenda_items()
     		$text_style="textnow";
     	}
 
-    	echo "\t\t<th>\n";
+    	echo "<th>";
     	// adding an internal anchor
-    	echo "\t\t\t<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
+    	echo "<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
@@ -767,11 +767,11 @@ function display_agenda_items()
     	{
     		echo Display::return_icon('group.gif', get_lang('AllUsersOfThePlatform'));
     	}
-    	echo " ".$myrow['title']."\n";
-    	echo "\t\t</th>\n";
+    	echo " ".$myrow['title']."";
+    	echo "</th>";
 
     	// the message has been sent to
-    	echo "\t\t<th>".get_lang("SentTo").": ".get_lang('AllUsersOfThePlatform');
+    	echo "<th>".get_lang("SentTo").": ".get_lang('AllUsersOfThePlatform');
     	//$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
     	//$sent_to_form=sent_to_form($sent_to);
     //	echo $sent_to_form;
@@ -790,16 +790,16 @@ function display_agenda_items()
      			display: the title
          --------------------------------------------------*/
     	echo "<tr class='row_odd'>";
-    	echo "\t\t<td>".get_lang("StartTimeWindow").": ";
+    	echo "<td>".get_lang("StartTimeWindow").": ";
     	echo api_format_date($myrow["start_date"]);
-    	echo "</td>\n";
-    	echo "\t\t<td>";
+    	echo "</td>";
+    	echo "<td>";
     	if ($myrow["end_date"]<>"0000-00-00 00:00:00")
     	{
     		echo get_lang("EndTimeWindow").": ";
     		echo api_convert_and_format_date($myrow["end_date"], null, date_default_timezone_get());
     	}
-    	echo "</td>\n";
+    	echo "</td>";
 
     	// attachment list
 	    	//$attachment_list=get_attachment($myrow['id']);
@@ -976,12 +976,12 @@ function display_one_agenda_item($agenda_id)
 	/*--------------------------------------------------
 			DISPLAY: THE ITEMS
 	  --------------------------------------------------*/
-	echo "<table id=\"data_table\">\n";
+	echo "<table id=\"data_table\">";
 
 	/*--------------------------------------------------
 	 DISPLAY : the icon, title, destinees of the item
 	  --------------------------------------------------*/
-	echo "\t<tr>\n";
+	echo "<tr>";
 
 	// highlight: if a date in the small calendar is clicked we highlight the relevant items
 	$myrow["start_date"] = api_get_local_time($myrow["start_date"], null, date_default_timezone_get());
@@ -1009,10 +1009,10 @@ function display_one_agenda_item($agenda_id)
 	}
 
 
-	echo "\t\t<td class=\"".$style."\">\n";
+	echo "<td class=\"".$style."\">";
 
 	// adding an internal anchor
-	echo "\t\t\t<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
+	echo "<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
 
 	// the icons. If the message is sent to one or more specific users/groups
 	// we add the groups icon
@@ -1022,27 +1022,27 @@ function display_one_agenda_item($agenda_id)
 	{
 		echo Display::return_icon('group.gif');
 	}
-	echo " ".$myrow['title']."\n";
-	echo "\t\t</td>\n";
+	echo " ".$myrow['title']."";
+	echo "</td>";
 
 	// the message has been sent to
-	echo "\t\t<td class=\"".$stylenotbold."\">".get_lang("SentTo").": ".get_lang('AllUsersOfThePlatform');
+	echo "<td class=\"".$stylenotbold."\">".get_lang("SentTo").": ".get_lang('AllUsersOfThePlatform');
 	//$sent_to = sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
 	//sent_to_form=sent_to_form($sent_to);
 	//echo $sent_to_form;
-	echo "</td>\n\t</tr>\n";
+	echo "</td></tr>";
 
 	/*--------------------------------------------------
 	 			DISPLAY: the title
 	  --------------------------------------------------*/
-	echo "\t<tr class=\"".$stylenotbold."\">\n";
-	echo "\t\t<td>".get_lang("StartTime").": ";
+	echo "<tr class=\"".$stylenotbold."\">";
+	echo "<td>".get_lang("StartTime").": ";
 	echo api_format_date($myrow["start_date"]);
-	echo "</td>\n";
-	echo "\t\t<td>".get_lang("EndTime").": ";
+	echo "</td>";
+	echo "<td>".get_lang("EndTime").": ";
 	echo api_convert_and_format_date($myrow["end_date"], null, date_default_timezone_get());
-	echo "</td>\n";
-	echo "\n\t</tr>\n";
+	echo "</td>";
+	echo "</tr>";
 
 	/*--------------------------------------------------
 	 			DISPLAY: the content
@@ -1054,7 +1054,7 @@ function display_one_agenda_item($agenda_id)
 	$content = $myrow['content'];
 	$content = make_clickable($content);
 	$content = text_filter($content);
-	//echo "\t<tr>\n\t\t<td class=\"".$text_style."\" colspan='2'>";
+	//echo "<tr><td class=\"".$text_style."\" colspan='2'>";
 	//echo $content;
 	//echo "</td></tr>";
     echo "<tr class='row_even'>";
@@ -1162,32 +1162,32 @@ echo "</select>";
 function show_user_group_filter_form()
 {
 	/** @todo this select missing to implement */
-	echo "\n<select name=\"select\" onchange=\"MM_jumpMenu('parent',this,0)\">";
-	echo "\n\t<option value=\"agenda.php?user=none\">".get_lang("ShowAll")."</option>";
+	echo "<select name=\"select\" onchange=\"MM_jumpMenu('parent',this,0)\">";
+	echo "<option value=\"agenda.php?user=none\">".get_lang("ShowAll")."</option>";
 
 	// Groups
-	echo "\n\t<optgroup label=\"".get_lang("Groups")."\">";
+	echo "<optgroup label=\"".get_lang("Groups")."\">";
 	//$group_list=get_course_groups();
 /*	foreach($group_list as $this_group)
 	{
 		// echo "<option value=\"agenda.php?isStudentView=true&amp;group=".$this_group['id']."\">".$this_group['name']."</option>";
-		echo "\n\t\t<option value=\"agenda.php?group=".$this_group['id']."\" ";
+		echo "<option value=\"agenda.php?group=".$this_group['id']."\" ";
 		echo ($this_group['id']==$_SESSION['group'])? " selected":"" ;
 		echo ">".$this_group['name']."</option>";
 	}*/
-	echo "\n\t</optgroup>";
+	echo "</optgroup>";
 
 	// Users
-	echo "\n\t<optgroup label=\"".get_lang("Users")."\">";
+	echo "<optgroup label=\"".get_lang("Users")."\">";
 	//$user_list=get_course_users();
 /*	foreach($user_list as $this_user)
 		{
 		// echo "<option value=\"agenda.php?isStudentView=true&amp;user=".$this_user['uid']."\">".$this_user['lastName']." ".$this_user['firstName']."</option>";
-		echo "\n\t\t<option value=\"agenda.php?user=".$this_user['uid']."\" ";
+		echo "<option value=\"agenda.php?user=".$this_user['uid']."\" ";
 		echo ($this_user['uid']==$_SESSION['user'])? " selected":"" ;
 		echo ">".$this_user['lastName']." ".$this_user['firstName']."</option>";
 		}*/
-	echo "\n\t</optgroup>";
+	echo "</optgroup>";
 	echo "</select>";
 }
 
@@ -1313,14 +1313,13 @@ function show_add_form($id = '')
 				</td></tr>
 				<td width="10%">
 					<!-- date: 1 -> 31 -->
-					<nobr><?php echo get_lang('StartDate').": \n"; ?></nobr>
+					<nobr><?php echo get_lang('StartDate').": "; ?></nobr>
 				</td>
 				<td width="35%">
 					<select name="fday" onchange="javascript:document.new_calendar_item.end_fday.value=this.value;">
 							<?php
 							// small loop for filling all the dates
 							// 2do: the available dates should be those of the selected month => february is from 1 to 28 (or 29) and not to 31
-							echo "\n";
 							foreach (range(1, 31) as $i)
 											{
 											// values have to have double digits
@@ -1328,11 +1327,11 @@ function show_add_form($id = '')
 											// the current day is indicated with [] around the date
 											if ($value==$day)
 											{
-												echo "\t\t\t\t <option value=\"".$value."\" selected> ".$i." </option>\n";
+												echo " <option value=\"".$value."\" selected> ".$i." </option>";
 											}
 											else
 											{
-												echo "\t\t\t\t<option value=\"$value\">$i</option>\n";
+												echo "<option value=\"$value\">$i</option>";
 											}
 										}
 										 ?>
@@ -1340,7 +1339,6 @@ function show_add_form($id = '')
 					<!-- month: january -> december -->
 					<select name="fmonth" onchange="javascript:document.new_calendar_item.end_fmonth.value=this.value;">
 					<?php
-											echo "\n";
 											for ($i=1; $i<=12; $i++)
 											{
 												// values have to have double digits
@@ -1354,11 +1352,11 @@ function show_add_form($id = '')
 												}
 												if ($value==$month)
 												{
-													echo "\t\t\t\t <option value=\"".$value."\" selected>".$MonthsLong[$i-1]."</option>\n";
+													echo " <option value=\"".$value."\" selected>".$MonthsLong[$i-1]."</option>\n";
 												}
 												else
 												{
-													echo "\t\t\t\t <option value=\"".$value."\">".$MonthsLong[$i-1]."</option>\n";
+													echo " <option value=\"".$value."\">".$MonthsLong[$i-1]."</option>\n";
 												}
 											} ?>
 					</select>
@@ -1370,7 +1368,7 @@ function show_add_form($id = '')
 												for ($i=1; $i<=5; $i++)
 												{
 													$value=$year+$i;
-													echo "\t\t\t\t<option value=\"$value\">$value</option>\n";
+													echo "<option value=\"$value\">$value</option>\n";
 												} ?>
 					</select>
 					<a href="javascript:openCalendar('new_calendar_item','f')"><?php Display::display_icon('calendar_select.gif', get_lang('Select'), array ('style' => 'vertical-align: middle;')); ?></a>
@@ -1390,11 +1388,11 @@ function show_add_form($id = '')
 									// the current hour is indicated with [] around the hour
 									if ($hours==$value)
 									{
-										echo "\t\t\t\t<option value=\"".$value."\" selected> ".$value." </option>\n";
+										echo "<option value=\"".$value."\" selected> ".$value." </option>\n";
 									}
 									else
 									{
-										echo "\t\t\t\t<option value=\"$value\">$value</option>\n";
+										echo "<option value=\"$value\">$value</option>\n";
 									}
 								} ?>
 						</select>
@@ -1407,7 +1405,7 @@ function show_add_form($id = '')
 								{
 									// values have to have double digits
 									$value = ($i <= 9 ? '0'.$i : $i );
-									echo "\t\t\t\t<option value=\"$value\">$value</option>\n";
+									echo "<option value=\"$value\">$value</option>\n";
 								} ?>
 						</select>
 					</td>
@@ -1434,9 +1432,9 @@ function show_add_form($id = '')
 									$value = ($i <= 9 ? '0'.$i : $i );
 									// the current day is indicated with [] around the date
 									if ($value==$end_day)
-										{ echo "\t\t\t\t <option value=\"".$value."\" selected> ".$i." </option>\n";}
+										{ echo " <option value=\"".$value."\" selected> ".$i." </option>\n";}
 									else
-										{ echo "\t\t\t\t <option value=\"".$value."\">".$i."</option>\n"; }
+										{ echo " <option value=\"".$value."\">".$i."</option>\n"; }
 									}?>
 						</select>
 							<!-- month: january -> december -->
@@ -1448,9 +1446,9 @@ function show_add_form($id = '')
 									// values have to have double digits
 									$value = ($i <= 9 ? '0'.$i : $i );
 									if ($value==$end_month)
-										{ echo "\t\t\t\t <option value=\"".$value."\" selected>".$MonthsLong[$i-1]."</option>\n"; }
+										{ echo " <option value=\"".$value."\" selected>".$MonthsLong[$i-1]."</option>\n"; }
 									else
-										{ echo "\t\t\t\t <option value=\"".$value."\">".$MonthsLong[$i-1]."</option>\n"; }
+										{ echo " <option value=\"".$value."\">".$MonthsLong[$i-1]."</option>\n"; }
 									}?>
 						</select>
 						<select name="end_fyear">
@@ -1461,7 +1459,7 @@ function show_add_form($id = '')
 								for ($i=1; $i<=5; $i++)
 								{
 									$value=$end_year+$i;
-									echo "\t\t\t\t<option value=\"$value\">$value</option>\n";
+									echo "<option value=\"$value\">$value</option>\n";
 								} ?>
 						</select>
 						<a href="javascript:openCalendar('new_calendar_item', 'end_f')"><?php Display::display_icon('calendar_select.gif',get_lang('Select'), array ('style' => 'vertical-align: middle;')); ?></a>
@@ -1480,9 +1478,9 @@ function show_add_form($id = '')
 									$value = ($i <= 9 ? '0'.$i : $i );
 									// the current hour is indicated with [] around the hour
 									if ($end_hours==$value)
-										{ echo "\t\t\t\t<option value=\"".$value."\" selected> ".$value." </option>\n"; }
+										{ echo "<option value=\"".$value."\" selected> ".$value." </option>\n"; }
 									else
-										{ echo "\t\t\t\t<option value=\"".$value."\"> ".$value." </option>\n"; }
+										{ echo "<option value=\"".$value."\"> ".$value." </option>\n"; }
 								} ?>
 						</select>
 
@@ -1494,7 +1492,7 @@ function show_add_form($id = '')
 								{
 									// values have to have double digits
 									$value = ($i <= 9 ? '0'.$i : $i );
-									echo "\t\t\t\t<option value=\"$value\">$value</option>\n";
+									echo "<option value=\"$value\">$value</option>\n";
 								} ?>
 						</select>
 						<br>
@@ -1545,11 +1543,11 @@ function show_add_form($id = '')
 	</tr>-->
 	<?php
 	   //if ($_SESSION['addedresource'])
-	   echo "\t<tr>\n";
-	   echo "\t\t<td colspan=\"4\">\n";
+	   echo "<tr>\n";
+	   echo "<td colspan=\"4\">\n";
 	   //echo display_resources(0);//--------------------------------------------------------
 	   $test=$_SESSION['addedresource'];
-	   echo "\t\t</td>\n\t</tr>\n";
+	   echo "</td>\n</tr>\n";
 	   /* END ADDED BY UGENT, Patrick Cool, march 2004 */
     if(empty($id)) //only show repeat fields when adding the first time
     {
@@ -1785,7 +1783,7 @@ function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $
 			$class = "class=\"row_odd\"";
 		}
 		echo "<tr $class>\n";
-		echo "\t";
+		echo "";
 		if ($i % 2 == 0)
 		{
 			echo ("<td valign=\"top\" width=\"75\">". (($i) / 2)." ".get_lang("HourShort")." 00</td>\n");
@@ -1794,7 +1792,7 @@ function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $
 		{
 			echo ("<td valign=\"top\" width=\"75\">". ((($i) / 2) - (1 / 2))." ".get_lang("HourShort")." 30</td>\n");
 		}
-		echo "\t<td $class valign=\"top\" colspan=\"2\">\n";
+		echo "<td $class valign=\"top\" colspan=\"2\">\n";
 		if (is_array($agendaitems[$i]))
 		{
 			foreach ($agendaitems[$i] as $key => $value)
@@ -1806,7 +1804,7 @@ function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $
 		{
 			echo $agendaitems[$i];
 		}
-		echo "\t</td>\n";
+		echo "</td>\n";
 		echo "</tr>\n";
 	}
 	echo "</table>\n";
@@ -1856,7 +1854,7 @@ function display_weekcalendar($agendaitems, $month, $year, $weekdaynames, $month
 	for ($ii = 1; $ii < 8; $ii ++)
 	{
 		$is_today = ($ii == $thisday_of_the_week AND (!isset($_GET['week']) OR $_GET['week']==$thisweek_number));
-		echo "\t<td class=\"weekdays\">";
+		echo "<td class=\"weekdays\">";
 		if ($is_today)
 		{
 			echo "<font color=#CC3300>";
@@ -1890,7 +1888,7 @@ function display_weekcalendar($agendaitems, $month, $year, $weekdaynames, $month
 			$class = "class=\"days_today\"";
 		}
 
-		echo "\t<td ".$class.">";
+		echo "<td ".$class.">";
 		echo "<span class=\"agendaitem\">".$agendaitems[date('j', $value)]."&nbsp;</span> ";
 		echo "</td>\n";
 		$counter ++;

From 04f3fe5330a8a398aea391829597c86263be50d0 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 20 May 2010 14:40:47 +0200
Subject: [PATCH 44/63] Adding global events in course agenda and personal
 agenda see CT#325

---
 main/admin/calendar.lib.php  |  14 +++---
 main/admin/calendar.php      |  58 +++++-----------------
 main/calendar/agenda.inc.php |  90 +++++++++++++++++++++++++----------
 main/calendar/agenda.php     |   1 -
 main/img/calendar_global.png | Bin 0 -> 946 bytes
 main/img/loading1.gif        | Bin 0 -> 673 bytes
 6 files changed, 85 insertions(+), 78 deletions(-)
 create mode 100644 main/img/calendar_global.png
 create mode 100644 main/img/loading1.gif

diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php
index bf8ae91c7c..ba2bd8eea5 100755
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
@@ -653,7 +653,7 @@ function display_agenda_items()
     $stop = 0;
 	// this is to make a difference between showing everything (all months) or only the current month)
 	// $show_all_current is a part of the sql statement
-	if ($_SESSION['show']!=="showall")
+	if ($_SESSION['show_all_admin']!=="showall")
 	{
 		$show_all_current=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
         $start = mktime(0,0,0,$select_month,1,$select_year);
@@ -762,11 +762,10 @@ function display_agenda_items()
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-    	Display::display_icon('agenda.gif', get_lang('Agenda'));
-    	if ($myrow['to_group_id']!=='0')
-    	{
+    	Display::display_icon('calendar_global.png', get_lang('Agenda'));
+    	/*if ($myrow['to_group_id']!=='0') {
     		echo Display::return_icon('group.gif', get_lang('AllUsersOfThePlatform'));
-    	}
+    	}*/
     	echo " ".$myrow['title']."";
     	echo "</th>";
 
@@ -1666,9 +1665,8 @@ function get_agendaitems($month, $year)
 	return $agendaitems;
 }
 
-function display_upcoming_events()
-{
-	echo '<b>'.get_lang('UpcomingEvent').'</b><br />';
+function display_upcoming_events() {
+	echo '<br /><b>'.get_lang('UpcomingEvent').'</b><br />';
 	$number_of_items_to_show = (int)api_get_setting('number_of_upcoming_events');
 
 	//databases of the courses
diff --git a/main/admin/calendar.php b/main/admin/calendar.php
index 48b2e67491..bf48c1632a 100755
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
@@ -52,19 +52,17 @@ require_once 'calendar.lib.php';
 			4. filter user or group
  */
 // 1. show all or show current month?
-if (!$_SESSION['show'])
-{
-	$_SESSION['show']="showall";
+if (!$_SESSION['show_all_admin']) {
+	$_SESSION['show_all_admin']="showall";
 }
 if (!empty($_GET['action']) and $_GET['action']=="showcurrent")
 {
-	$_SESSION['show']="showcurrent";
+	$_SESSION['show_all_admin']='showcurrent';
 }
 if (!empty($_GET['action']) and $_GET['action']=="showall")
 {
-	$_SESSION['show']="showall";
+	$_SESSION['show_all_admin']='showall';
 }
-//echo $_SESSION['show'];
 
 // 2. sorting order (ASC or DESC)
 if (empty($_GET['sort']) and empty($_SESSION['sort']))
@@ -189,13 +187,12 @@ if (empty($_GET['origin']) or $_GET['origin']!='learnpath') {
 	// the small calendar
 	$MonthName = $MonthsLong[$select_month -1];
 	$agenda_items=get_calendar_items($select_month,$select_year);
-	if (api_get_setting('display_mini_month_calendar') == 'true')
-	{
+	if (api_get_setting('display_mini_month_calendar') == 'true') {
 		display_minimonthcalendar($agenda_items, $select_month,$select_year, $MonthName);
 	}
-	/*if (api_get_setting('display_upcoming_events') == 'true') {
+	if (api_get_setting('display_upcoming_events') == 'true') {
 		display_upcoming_events();
-	}*/
+	}
 	echo '</td>';
 	echo '<td width="20" background="../img/verticalruler.gif">&nbsp;</td>';
 }
@@ -206,17 +203,13 @@ echo '<td valign="top">';
 echo '<div class="sort" style="float:right">';
 
 echo '</div>';
-if (api_is_allowed_to_edit(false,true))
-{
+if (api_is_allowed_to_edit(false,true)) {
 	switch ($_GET['action'])
 	{
 		case "add":
             if(!empty($_POST['ical_submit'])) {
                 $course_info = api_get_course_info();
-                agenda_import_ical($course_info,$_FILES['ical_import']);
-                if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-				}
+                agenda_import_ical($course_info,$_FILES['ical_import']);                
                 display_agenda_items();
             } elseif ($_POST['submit_event']) {
 
@@ -232,10 +225,7 @@ if (api_is_allowed_to_edit(false,true))
                     $end_d = intval($_POST['repeat_end_day']);
                     $end   = mktime(23, 59, 59, $end_m, $end_d, $end_y);
                     $res = agenda_add_repeat_item($course_info,$id,$_POST['repeat_type'],$end,null,$_POST['file_comment']);
-                }
-                if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-				}
+                }                
 				display_agenda_items();
 			} else {
 				show_add_form();
@@ -249,22 +239,12 @@ if (api_is_allowed_to_edit(false,true))
 				{		$my_id_attach = (int)$_REQUEST['id_attach'];
 						$my_file_comment = Database::escape_string($_REQUEST['file_comment']);
 						store_edited_agenda_item($my_id_attach,$my_file_comment);
-						if (api_get_setting('display_upcoming_events') == 'true') {
-							display_upcoming_events();
-						}
 						display_agenda_items();
-				}
-				else
-				{
+				} else {
 						$id=(int)$_GET['id'];
 						show_add_form($id);
 				}
-			}
-			else
-			{
-				if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-				}
+			} else {
 				display_agenda_items();
 			}
 			break;
@@ -282,10 +262,7 @@ if (api_is_allowed_to_edit(false,true))
 					}
 				}
 			}
-				if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-				}
-				display_agenda_items();
+			display_agenda_items();
 			break;
 
 		case "showhide":
@@ -294,9 +271,6 @@ if (api_is_allowed_to_edit(false,true))
 			{ // a coach can only delete an element belonging to his session
 				showhide_agenda_item($id);
 			}
-			if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-			}
 			display_agenda_items();
 			break;
 		case "announce": //copying the agenda item into an announcement
@@ -308,9 +282,6 @@ if (api_is_allowed_to_edit(false,true))
 				echo '<br />';
 				Display::display_normal_message(get_lang('CopiedAsAnnouncement').'<a href="../announcements/announcements.php?id='.$ann_id.$tool_group_link.'">'.get_lang('NewAnnouncement').'</a>', false);
 			}
-			if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-			}
 			display_agenda_items();
 			break;
 		case "delete_attach": //delete attachment file
@@ -318,9 +289,6 @@ if (api_is_allowed_to_edit(false,true))
 			if (!empty($id_attach)) {
 				delete_attachment_file($id_attach);
 			}
-			if (api_get_setting('display_upcoming_events') == 'true') {
-					display_upcoming_events();
-			}
 			display_agenda_items();
 			break;
 
diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 3849d55cc5..04a69bbf40 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -86,7 +86,8 @@ function get_calendar_items($month, $year) {
     $stop = 0;
 	// this is to make a difference between showing everything (all months) or only the current month)
 	// $show_all_current is a part of the sql statement
-	if ($_SESSION['show']!=="showall") {
+	
+	if ($_SESSION['show']!=='showall') {
 		$show_all_current=" AND MONTH(start_date)=$select_month AND year(start_date)=$select_year";
         $start = mktime(0,0,0,$select_month,1,$select_year);
         $stop = 0;
@@ -236,10 +237,8 @@ function get_calendar_items($month, $year) {
 			}
 		}
 	} // you are a student
-
-	
-	$result=Database::query($sql) or die(Database::error());
-
+		
+	$result=Database::query($sql);
 	$data=array();
 	while ($row=Database::fetch_array($result, 'ASSOC')) {
 		$datum_item=(int)substr($row['start_date'],8,2);
@@ -247,7 +246,7 @@ function get_calendar_items($month, $year) {
 		$data[$datum_item][intval($datum_item)][] = $row;
 	}	
 	
-	//Check my personal calendar items	
+	//Check my personal agenda events	
 	if (api_get_setting('allow_personal_agenda') == 'true') {
 		$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);		
 		// 1. creating the SQL statement for getting the personal agenda items in MONTH view
@@ -259,8 +258,21 @@ function get_calendar_items($month, $year) {
 			$row['calendar_type'] = 'personal';		
 			$data[$datum_item][$datum_item][] = $row;
 		}
-	}	
-	
+	}
+	/*
+	//Check global agenda events	*/
+	$table_agenda_system = Database :: get_main_table(TABLE_MAIN_SYSTEM_CALENDAR);
+	$sql = "SELECT DISTINCT * FROM ".$table_agenda_system."
+			WHERE
+			MONTH(start_date)='".$month."'
+			AND YEAR(start_date)='".$year."'			
+			ORDER BY start_date ";
+	$result=Database::query($sql);
+	while ($row = Database::fetch_array($result, 'ASSOC')) {			
+		$datum_item=intval(substr($row['start_date'],8,2));	
+		$row['calendar_type'] = 'global';		
+		$data[$datum_item][$datum_item][] = $row;
+	}
 	
 	return $data;
 }
@@ -276,8 +288,7 @@ function get_calendar_items($month, $year) {
 * @return html code
 * @todo refactor this so that $monthName is no longer needed as a parameter
 */
-function display_minimonthcalendar($agendaitems, $month, $year, $monthName)
-{
+function display_minimonthcalendar($agendaitems, $month, $year, $monthName) {
 	global $DaysShort;
 	//Handle leap year
 	$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
@@ -420,14 +431,16 @@ function display_monthcalendar($month, $year) {
 					
 					if (key_exists($curday, $data)) {			
 						foreach ($data[$curday] as $key=>$agenda_item) {
-							$dayheader ="<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";					
+							
+							$dayheader 	= "<a href='".api_get_self()."?".api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
+							$some_content = false; 
 							foreach ($agenda_item as $key=>$value) {		
 								
 								$month_start_date = (int)substr($value['start_date'],5,2);									
-								$start_time = api_convert_and_format_date($value['start_date']);
+								$start_time = api_convert_and_format_date($value['start_date']);				
 								
-																				
 								if ($month == $month_start_date) {
+									$some_content = true;
 									
 									$start_time = api_convert_and_format_date($value['start_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
 									$end_time 	= api_convert_and_format_date($value['end_date'], TIME_NO_SEC_FORMAT, date_default_timezone_get());
@@ -435,9 +448,12 @@ function display_monthcalendar($month, $year) {
 									//Setting a personal event to green
 									$personal_start =  $personal_end = '';									
 									if ($value['calendar_type'] == 'personal') {
-										$personal_start = '<div style="color:green;">';
+										$personal_start = '<div style="color:green;">'.get_lang('MyAgenda');
+										$personal_end	= '</div>';	
+									} elseif ($value['calendar_type'] == 'global') {
+										$personal_start = '<div style="color:red;">'.get_lang('GlobalEvent');
 										$personal_end	= '</div>';	
-									}									
+									}
 									$dayheader.= $personal_start;									
 									
 									if ($value['end_date']=='0000-00-00 00:00:00') {										
@@ -458,7 +474,12 @@ function display_monthcalendar($month, $year) {
 								} else {
 									//$dayheader=$curday;
 								}
-							}							
+							}
+							//Do not show links with no content
+							if ($some_content == false) {
+								$dayheader = $curday;
+							}
+												
 						}
 					}
 					//var_dump($dayheader);
@@ -2014,6 +2035,20 @@ function display_agenda_items($select_month, $select_year) {
 		}
 	}	
 	
+	
+		
+	//Check global agenda events	*/
+	$table_agenda_system = Database :: get_main_table(TABLE_MAIN_SYSTEM_CALENDAR);
+	$sql = "SELECT DISTINCT id, title, content , start_date, end_date FROM ".$table_agenda_system."
+			WHERE 1=1  ".$show_all_current."
+			ORDER BY start_date ";
+	$result=Database::query($sql);
+	while ($row = Database::fetch_array($result, 'ASSOC')) {
+		$row['calendar_type'] = 'global';		
+		$my_events[] = $row;
+	}
+	
+	
     //while($myrow = Database::fetch_array($result)) {
    	foreach ($my_events as $myrow) {
     	$is_repeated = !empty($myrow['parent_event_id']);
@@ -2058,7 +2093,7 @@ function display_agenda_items($select_month, $select_year) {
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-    	if ($myrow['calendar_type'] != 'personal') {    		  		
+    	if ($myrow['calendar_type'] == 'course') {    		  		
     		Display::display_icon('agenda.gif', get_lang('Agenda'));    		  
     		if ($myrow['to_group_id']!=='0') {
     			echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
@@ -2066,26 +2101,33 @@ function display_agenda_items($select_month, $select_year) {
     		echo '<span style="padding-left:5px; font-size:130%; ">';
     		echo $myrow['title'];
     		echo '</span>';
-    	} else {
+    	} elseif ($myrow['calendar_type'] == 'personal') {
     		Display::display_icon('calendar_personal.gif', get_lang('Personal'));
     		echo '<span style="padding-left:5px; font-size:130%; ">';    		
     		echo $myrow['title'];
     		echo '</span>';    		
-    	}    	
+    	} else {
+    		Display::display_icon('calendar_global.png', get_lang('Personal'));
+    		echo '<span style="padding-left:5px; font-size:130%; ">';    		
+    		echo $myrow['title'];
+    		echo '</span>';
+    	}
     	echo '</th>';
     	
-		if ($myrow['calendar_type'] != 'personal') {
+		if ($myrow['calendar_type'] == 'course') {
 	    	// the message has been sent to
 	    	echo "<th>".get_lang('SentTo').": ";
 	    	$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
 	    	$sent_to_form=sent_to_form($sent_to);
 	    	echo $sent_to_form;	    	
 	    	echo '</th>';
-		} else {
+		} elseif ($myrow['calendar_type'] == 'personal') {
 			echo '<th>'.get_lang('Personal').'</th>';	
+		} elseif ($myrow['calendar_type'] == 'global') {
+			echo '<th>'.get_lang('GlobalEvent').'</th>';
 		}
 		
-    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] != 'personal' ) {
+    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] == 'course' ) {
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
     			// a coach can only delete an element belonging to his session
 	    		echo '<th>'.get_lang('Modify');
@@ -2102,7 +2144,7 @@ function display_agenda_items($select_month, $select_year) {
     	echo '</td>';
     	echo '<td>';
     	
-    	if ($myrow['calendar_type'] != 'personal') {
+    	if ($myrow['calendar_type'] == 'course') {
     		if ($myrow['end_date']<>'0000-00-00 00:00:00') {
     			echo get_lang('EndTimeWindow').": ";
     			echo api_convert_and_format_date($myrow['end_date'], null, date_default_timezone_get());
@@ -2114,7 +2156,7 @@ function display_agenda_items($select_month, $select_year) {
 	    $attachment_list=get_attachment($myrow['id']);
 
         /*Display: edit delete button (course admin only) */
-		if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] != 'personal') {
+		if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous())) && $myrow['calendar_type'] == 'course') {
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) ) { 
     			// a coach can only delete an element belonging to his session
 				$mylink = api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;id='.$myrow['id'].'&amp;';
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index eabecc115f..45e747183e 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -76,7 +76,6 @@ if (!empty($_GET['action']) and $_GET['action']=="showcurrent") {
 if (!empty($_GET['action']) and $_GET['action']=="showall") {
 	$_SESSION['show']="showall";
 }
-//echo $_SESSION['show'];
 
 // 2. sorting order (ASC or DESC)
 if (empty($_GET['sort']) and empty($_SESSION['sort'])) {
diff --git a/main/img/calendar_global.png b/main/img/calendar_global.png
new file mode 100644
index 0000000000000000000000000000000000000000..74169fd4b9cb7a52fc325112f613527ffaf7f276
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS`
z3<?~N9+&U{00S~fL_t(I%bk+VOJqkB#eeUk+t@;w_Jij_T<EMM48#UCL_}P<QxHZW
zFdJjm`fmvCM3BtJjpAZp@IS~xMMMw;mo2EEw%D4W-EGyYd$Z{GdfJ{<a^O+7?yGz1
z+*`-{`tjp%kjb0?po)lq2r7cA)>r311W96b4i!O?HO<*ttq=y8%*n5xK1r=y_DO#>
z7di)VTrYMGjbqf>Ml8wxhkRcC`ts!@1gMqE{>$a%H<CF17AM7GZ9Q)c6330b7*o%^
zfA4D?<D*KeGDJX{h|@JCk7G#kG>H%qLJ>usq7Kwa5-VyIjU{Qzq9##fZG8mRpw=Qb
zMy+X(hf=f1t3xUVbpkG~ABq!2u|bTjliD~Tsb7%JPpUQS-QQI29th>Pc^DZ%|0&d8
zRVA5%pel%@IYmWr;!sgU1!D}audkTbS2Ule`peIRKYjSXkMG{m-qDc|DxT+&LQ=aV
zc~vEj<Hnbwy}g~bT#nE=hpOV71Hkuv9v>gMxVS)7>Fw>MtE&rZEvKia6pO{gvdYNF
z2vHQFiGSlbCRA0L@$~e>!NCFLav5U`rBaFc`FV1=97jh-oSmID2nGiSiK6IDeVDeD
zwtI7P!_CbNQ&UqIV_02X<>cgq@$qr)@9&wJnPF^fjJCEmeBW<$mcnmUn8{>_qKJGx
z&-3#$VHh$nFn}?JhldCD_V!p=Sz&W?lXAKIX5IjP8aU^uR;zS&b}~6R$<@^rJ3BiR
z3I+Q6`>9kaSZi5WSYUa1nTv}Hj*pLN6%?iq^78V6a}MA4DHe-tY-}(zG{oH89G>UV
z-QCUF+8Unc;hZCiBJS?)zH>!rt))__;GDzrJW8b!TU%RnbaYTC6gWRWr>CcfVzJ2f
z_BIO(3#clkQi;*g(eGLgYqeTKwuo?ec*yPTExzxwzP^qzhUw{PW@l%)yu4(0cNgaz
z6B82*4-YrInZn!O-`BprJ}Q+8%`e^z&+`a^pkeaVufFd$JekYoxW2xw+oqWyJ=BVH
zRzVQF$+gB|5CmkiS*;84_&-opve~Q#LEw3di;KT6EiL`oYS90RAPD&U`STzD0@l^B
UwGrI%Pyhe`07*qoM6N<$g884mqyPW_

literal 0
HcmV?d00001

diff --git a/main/img/loading1.gif b/main/img/loading1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0bce1542342e912da81a2c260562df172f30d73
GIT binary patch
literal 673
zcmZ?wbhEHb6krfw_{6~Q|Nnmm28Kh24mmkF0U1e2Nli^nlO|14{Lk&@8WQa67~pE8
zXTZz|lvDgC<y@4SSdyBeP@Y+mp^%uBSdo*Tn4*`NmzK|<_>+Z`3#dv5h=E26FfcG1
zbL_hF&)}42ws10s6^G;;cE1^EoUR)U5A70}d2pLv!jVIT7j&Z~EblI3x0K*v_sV|m
z0kj3v921Z^em#l`(k(o@H$3ZdDRc@9NidXDNbqrumReCGv$gd8+e8WW28HVqkJ_9i
zH>s*<31KtHjANIPvi2#*6BEu%3Dak5O_t&NBI)<h(<yPr>H?V$TxT}#l{vOTn<?_G
z_#ejR!~8}oQ>5naXTfF^&~Hhq+NX@#Ccc>y7T?;vjI&jdhsDsPJyAw*m0Qz>i}K7#
zL9w50<qa%!r20=RDYEpz>Ng{fT}A5JUe8lRK1h7_Y2;BWJDd=c6f&i?Wv5(5q?6|P
zQw{>maxZP<537OA37Uk}7@%_$4o$EWe_Zl>&#id|lE-BpDC#+Fn|msJ%_2h{Hg1vP
z#N8WAzfWasG}yq|xqE)DrWaOofX=z|?*pgc%{ig5vl!pqDlC|q&~Z0$&Rvsft&VO-
z4MZj+%-+Vx%W}v;V76hyp=;+R;x+~t^Q%*xuFTQAF2})fSfTHDAs>sO!OBw`)&)o$
c0!CNZt))x~rAZP^^P&YOFfdqy5)K#u0POD40{{R3

literal 0
HcmV?d00001


From d1c9dbc01995b143920337442d0b7e89f27e6c7c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 20 May 2010 15:02:46 +0200
Subject: [PATCH 45/63] Cleaning code

---
 main/forum/viewthread_flat.inc.php     | 34 +++++++++++++-------------
 main/forum/viewthread_nested.inc.php   | 32 ++++++++++++------------
 main/forum/viewthread_threaded.inc.php | 32 ++++++++++++------------
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php
index 6cdc649582..162888a480 100755
--- a/main/forum/viewthread_flat.inc.php
+++ b/main/forum/viewthread_flat.inc.php
@@ -14,7 +14,7 @@ if (isset($current_thread['thread_id'])){
 	$rows=get_posts($current_thread['thread_id']);
 	$increment=0;
 	foreach ($rows as $row) {
-		echo "<table width=\"100%\" class=\"post\" cellspacing=\"5\" border=\"0\">\n";
+		echo "<table width=\"100%\" class=\"post\" cellspacing=\"5\" border=\"0\">";
 		// the style depends on the status of the message: approved or not
 		if ($row['visible']=='0') {
 			$titleclass='forum_message_post_title_2_be_approved';
@@ -26,8 +26,8 @@ if (isset($current_thread['thread_id'])){
 			$leftclass='forum_message_left';
 		}
 	
-		echo "\t<tr>\n";
-		echo "\t\t<td rowspan=\"3\" class=\"$leftclass\">";
+		echo "<tr>";
+		echo "<td rowspan=\"3\" class=\"$leftclass\">";
 		if ($row['user_id']=='0') {
 			$name=prepare4display($row['poster_name']);
 		} else {
@@ -49,16 +49,16 @@ if (isset($current_thread['thread_id'])){
 		// The course admin him/herself can do this off course always
 		if (($current_forum['allow_edit']==1 AND $row['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true)  && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
 			if (api_is_allowed_to_session_edit(false,true))
-				echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$row['post_id']."&origin=".$origin."&edit=edition&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>\n";
+				echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$row['post_id']."&origin=".$origin."&edit=edition&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 		}
 	
 		if ($origin != 'learnpath') {
 			if (api_is_allowed_to_edit(false,true)  && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$row['post_id']."&origin=".$origin."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\n";
+				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$row['post_id']."&origin=".$origin."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
 				display_visible_invisible_icon('post', $row['post_id'], $row['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']), 'origin'=>$origin ));
-				echo "\n";
+				echo "";
 				if ($increment>0) {
-					echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$row['post_id']."&origin=".$origin."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>\n";
+					echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$row['post_id']."&origin=".$origin."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>";
 				}
 			}
 		}
@@ -70,11 +70,11 @@ if (isset($current_thread['thread_id'])){
 			if( isset($_GET['gradebook'])){
 				if ($increment>0 && $user_status!=1 ) {
 					$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
-					echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."&gradebook=".Security::remove_XSS($_GET['gradebook'])."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";
+					echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".$info_thread['forum_id']."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."&gradebook=".Security::remove_XSS($_GET['gradebook'])."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>";
 				 }
 			} else {
 				if ($increment>0 && $user_status!=1 ) {
-					echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";
+					echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$row['post_id']."&amp;user=".$row['poster_id']."&user_id=".$row['poster_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>";
 				}
 			}
 		}
@@ -82,8 +82,8 @@ if (isset($current_thread['thread_id'])){
 		if ($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0 OR api_is_allowed_to_edit(false,true)) {
 			if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id'])) {
 				if (!api_is_anonymous() && api_is_allowed_to_session_edit(false,true)) {
-					echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$row['post_id'].'&amp;action=replymessage&origin='.$origin.'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>\n";
-					echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$row['post_id'].'&amp;action=quote&origin='.$origin.'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>\n";
+					echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$row['post_id'].'&amp;action=replymessage&origin='.$origin.'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>";
+					echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$row['post_id'].'&amp;action=quote&origin='.$origin.'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>";
 				}
 			}
 		} else {
@@ -97,7 +97,7 @@ if (isset($current_thread['thread_id'])){
 				echo get_lang('ThreadLocked').'<br />';
 			}
 		}
-		echo "</td>\n";
+		echo "</td>";
 		// show the
 		if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]) and !empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]) and !empty($whatsnew_post_info[$_GET['forum']][$row['thread_id']])) {
 			$post_image=icon('../img/forumpostnew.gif');
@@ -108,13 +108,13 @@ if (isset($current_thread['thread_id'])){
 			$post_image.=icon('../img/forumnotification.gif',get_lang('YouWillBeNotified'));
 		}
 		// The post title
-		echo "\t\t<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($row['post_title'], STUDENT))."</td>\n";
-		echo "\t</tr>\n";
+		echo "<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($row['post_title'], STUDENT))."</td>";
+		echo "</tr>";
 		
 		// The post message
-		echo "\t<tr>\n";
-		echo "\t\t<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($row['post_text'], STUDENT))."</td>\n";
-		echo "\t</tr>\n";
+		echo "<tr>";
+		echo "<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($row['post_text'], STUDENT))."</td>";
+		echo "</tr>";
 	
 		// The check if there is an attachment
 		 
diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php
index 4d706fb755..4de01b834a 100755
--- a/main/forum/viewthread_nested.inc.php
+++ b/main/forum/viewthread_nested.inc.php
@@ -40,8 +40,8 @@ foreach ($rows as $post) {
 
 	$indent=$post['indent_cnt']*'20';
 	echo "<div style=\"margin-left: ".$indent."px;\">";
-	echo "<table width=\"100%\"  class=\"post\" cellspacing=\"5\" border=\"0\">\n";
-	echo "\t<tr>\n";
+	echo "<table width=\"100%\"  class=\"post\" cellspacing=\"5\" border=\"0\">";
+	echo "\t<tr>";
 	echo "\t\t<td rowspan=\"3\" class=\"$leftclass\">";
 	if ($post['user_id']=='0') {
 		$name=$post['poster_name'];
@@ -59,14 +59,14 @@ foreach ($rows as $post) {
 	// The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
 	// The course admin him/herself can do this off course always
 	if (($current_forum['allow_edit']==1 AND $post['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
-		echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;post=".$post['post_id']."&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>\n";
+		echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;post=".$post['post_id']."&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 	}
 	if (api_is_allowed_to_edit(false,true)  && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) {
-		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$post['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\n";
+		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$post['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
 		display_visible_invisible_icon('post', $post['post_id'], $post['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']) ));
-		echo "\n";
+		echo "";
 		if ($count>0) {
-			echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;origin=".$origin."&amp;post=".$post['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>\n";
+			echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;origin=".$origin."&amp;post=".$post['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>";
 		}
 	}
 	$userinf=api_get_user_info($post['user_id']);
@@ -74,7 +74,7 @@ foreach ($rows as $post) {
 	if (api_is_allowed_to_edit(null,true)) {
 		if ($count>0 && $user_status!=1) {
 			$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$post['user_id'],$_GET['thread']);
-			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$post['post_id']."&amp;user=".$post['user_id']."&user_id=".$post['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";
+			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$post['post_id']."&amp;user=".$post['user_id']."&user_id=".$post['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>";
 		}
 	}
 	//echo '<br /><br />';
@@ -82,8 +82,8 @@ foreach ($rows as $post) {
 	if ($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0 OR api_is_allowed_to_edit(false,true)) {
 		if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id'])) {
 			if (!api_is_anonymous() && api_is_allowed_to_session_edit(false,true)) {
-				echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$post['post_id'].'&amp;action=replymessage&amp;origin='. $origin .'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>\n";
-				echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$post['post_id'].'&amp;action=quote&amp;origin='. $origin .'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>\n";
+				echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$post['post_id'].'&amp;action=replymessage&amp;origin='. $origin .'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>";
+				echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$post['post_id'].'&amp;action=quote&amp;origin='. $origin .'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>";
 			}
 		}
 	} else {
@@ -97,7 +97,7 @@ foreach ($rows as $post) {
 			echo get_lang('ThreadLocked').'<br />';
 		}
 	}
-	echo "</td>\n";
+	echo "</td>";
 	// note: this can be removed here because it will be displayed in the tree
 	if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) and !empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) and !empty($whatsnew_post_info[$_GET['forum']][$post['thread_id']])) {
 		$post_image=icon('../img/forumpostnew.gif');
@@ -108,13 +108,13 @@ foreach ($rows as $post) {
 		$post_image.=icon('../img/forumnotification.gif',get_lang('YouWillBeNotified'));
 	}
 	// The post title
-	echo "\t\t<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($post['post_title'], STUDENT))."</td>\n";
-	echo "\t</tr>\n";
+	echo "\t\t<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($post['post_title'], STUDENT))."</td>";
+	echo "\t</tr>";
 
 	// The post message		
-	echo "\t<tr>\n";
-	echo "\t\t<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($post['post_text'], STUDENT))."</td>\n";
-	echo "\t</tr>\n";
+	echo "\t<tr>";
+	echo "\t\t<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($post['post_text'], STUDENT))."</td>";
+	echo "\t</tr>";
 
 
 	// The check if there is an attachment
@@ -139,7 +139,7 @@ foreach ($rows as $post) {
 	// The post has been displayed => it can be removed from the what's new array
 	unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
 	unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
-	echo "</table>\n";
+	echo "</table>";
 	echo "</div>";
 	$count++;
 }
diff --git a/main/forum/viewthread_threaded.inc.php b/main/forum/viewthread_threaded.inc.php
index 9fc6f03737..3317d00019 100755
--- a/main/forum/viewthread_threaded.inc.php
+++ b/main/forum/viewthread_threaded.inc.php
@@ -95,7 +95,7 @@ foreach ($rows as $post) {
 			$class='';
 		}
 		$count_loop=($count==0)?'&id=1' : '';
-		$thread_structure.= "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$post['post_id']."&amp;origin=$origin$count_loop\" $class>".prepare4display(Security::remove_XSS($post['post_title'],STUDENT))."</a></div>\n";
+		$thread_structure.= "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$post['post_id']."&amp;origin=$origin$count_loop\" $class>".prepare4display(Security::remove_XSS($post['post_title'],STUDENT))."</a></div>";
 		$prev_next_array[]=$post['post_id'];
 	}
 	$count++;
@@ -180,8 +180,8 @@ else
 // we mark the image we are displaying as set
 unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]);
 
-echo "<table width=\"100%\"  class=\"post\"  cellspacing=\"5\" border=\"0\">\n";
-echo "\t<tr>\n";
+echo "<table width=\"100%\"  class=\"post\"  cellspacing=\"5\" border=\"0\">";
+echo "\t<tr>";
 echo "\t\t<td rowspan=\"3\" class=\"$leftclass\">";
 if ($rows[$display_post_id]['user_id']=='0') {
 	$name=prepare4display($rows[$display_post_id]['poster_name']);
@@ -200,13 +200,13 @@ $id_attach = !empty($attachment_list)?$attachment_list['id']:'';
 // The course admin him/herself can do this off course always
 if (($current_forum['allow_edit']==1 AND $rows[$display_post_id]['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])))
 {
-	echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;post=".$rows[$display_post_id]['post_id']."&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>\n";
+	echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;post=".$rows[$display_post_id]['post_id']."&id_attach=".$id_attach."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 }
 if (api_is_allowed_to_edit(false,true)  && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))
 {
-	echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$rows[$display_post_id]['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\n";
+	echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$rows[$display_post_id]['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
 	display_visible_invisible_icon('post', $rows[$display_post_id]['post_id'], $rows[$display_post_id]['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']), 'post'=>Security::remove_XSS($_GET['post']) ));
-	echo "\n";
+	echo "";
 	//verified the post minor
 	$my_post=get_posts($_GET['thread']);
 	$id_posts=array();
@@ -221,7 +221,7 @@ if (api_is_allowed_to_edit(false,true)  && !(api_is_course_coach() && $current_f
 	$post_minor=(int)$id_posts[0];
 	$post_id = isset($_GET['post'])?(int)$_GET['post']:0;
 	if (!isset($_GET['id']) && $post_id>$post_minor) {
-		echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;action=move&amp;post=".$rows[$display_post_id]['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>\n";
+		echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;origin=".$origin."&amp;action=move&amp;post=".$rows[$display_post_id]['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>";
 	}
 }
 $userinf=api_get_user_info($rows[$display_post_id]['user_id']);
@@ -232,7 +232,7 @@ if (api_is_allowed_to_edit(null,true)) {
 		if($user_status!=1)
 		{
 			$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$_GET['forum'],$rows[$display_post_id]['user_id'],$_GET['thread']);
-			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$rows[$display_post_id]['post_id']."&amp;user=".$rows[$display_post_id]['user_id']."&user_id=".$rows[$display_post_id]['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>\n";
+			echo "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=list&amp;post=".$rows[$display_post_id]['post_id']."&amp;user=".$rows[$display_post_id]['user_id']."&user_id=".$rows[$display_post_id]['user_id']."&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >".icon('../img/new_test_small.gif',get_lang('Qualify'))."</a>";
 		}
 	}
 }
@@ -243,8 +243,8 @@ if ($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $cu
 	if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id']))
 	{
 		if (!api_is_anonymous() && api_is_allowed_to_session_edit(false,true)) {
-			echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=replymessage&amp;origin='. $origin .'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>\n";
-			echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=quote&amp;origin='. $origin .'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>\n";
+			echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=replymessage&amp;origin='. $origin .'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>";
+			echo '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=quote&amp;origin='. $origin .'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>";
 		}
 	}
 }
@@ -263,7 +263,7 @@ else
 		echo get_lang('ThreadLocked').'<br />';
 }
 }
-echo "</td>\n";
+echo "</td>";
 // note: this can be removed here because it will be displayed in the tree
 if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]) and !empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]) and !empty($whatsnew_post_info[$_GET['forum']][$rows[$display_post_id]['thread_id']]))
 {
@@ -278,13 +278,13 @@ if ($rows[$display_post_id]['post_notification']=='1' AND $rows[$display_post_id
 	$post_image.=icon('../img/forumnotification.gif',get_lang('YouWillBeNotified'));
 }
 // The post title
-echo "\t\t<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($rows[$display_post_id]['post_title'], STUDENT))."</td>\n";
-echo "\t</tr>\n";
+echo "\t\t<td class=\"$titleclass\">".prepare4display(Security::remove_XSS($rows[$display_post_id]['post_title'], STUDENT))."</td>";
+echo "\t</tr>";
 
 // The post message
-echo "\t<tr>\n";
-echo "\t\t<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($rows[$display_post_id]['post_text'], STUDENT))."</td>\n";
-echo "\t</tr>\n";
+echo "\t<tr>";
+echo "\t\t<td class=\"$messageclass\">".prepare4display(Security::remove_XSS($rows[$display_post_id]['post_text'], STUDENT))."</td>";
+echo "\t</tr>";
 
 // The check if there is an attachment
 $attachment_list = get_attachment($display_post_id);

From 1c16873a469d806f52c82de410c12a1030b57cb0 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 20 May 2010 21:16:22 +0200
Subject: [PATCH 46/63] Fixing BT#961 Updating score when exercise is in a LP
 with an open question with multiple attempts. We always take the last attempt
 in the teacher view.

---
 main/exercice/exercice.php | 136 +++++++++++++++++++++++--------------
 1 file changed, 85 insertions(+), 51 deletions(-)

diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index f7ed452465..44febe2e99 100755
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -130,12 +130,12 @@ if ($_GET['delete'] == 'delete' && ($is_allowedToEdit || api_is_coach()) && !emp
 }
 
 if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit || $is_tutor) && $_GET['exeid']== strval(intval($_GET['exeid']))) {
-	$id = $_GET['exeid']; //filtered by post-condition
-	$emailid = $_GET['emailid'];
-	$test = $_GET['test'];
-	$from = $_SESSION['_user']['mail'];
-	$from_name = api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
-	$url = api_get_path(WEB_CODE_PATH) . 'exercice/exercice.php?' . api_get_cidreq() . '&show=result';
+	$id 		= $_GET['exeid']; //filtered by post-condition
+	$emailid 	= $_GET['emailid'];
+	$test 		= $_GET['test'];
+	$from 		= $_SESSION['_user']['mail'];
+	$from_name  = api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
+	$url		= api_get_path(WEB_CODE_PATH) . 'exercice/exercice.php?' . api_get_cidreq() . '&show=result';
 	$TBL_RECORDING = Database :: get_statistic_table('track_e_attempt_recording');
 	$total_weighting = $_REQUEST['totalWeighting'];
 
@@ -157,10 +157,12 @@ if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit
 	} else {
 		$array_content_id_exe=$post_content_id;
 	}
+	
 
 	for ($i=0;$i<$loop_in_track;$i++) {
 
 		$my_marks=Database::escape_string($_POST['marks_'.$array_content_id_exe[$i]]);
+	
 		$contain_comments=Database::escape_string($_POST['comments_'.$array_content_id_exe[$i]]);
 
 		if (isset($contain_comments)) {
@@ -168,38 +170,40 @@ if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit
 		} else {
 			$my_comments='';
 		}
-			$my_questionid=$array_content_id_exe[$i];
-			$sql = "SELECT question from $TBL_QUESTIONS WHERE id = '$my_questionid'";
-			$result =Database::query($sql);
-			$ques_name = Database::result($result,0,"question");
-
-			$query = "UPDATE $TBL_TRACK_ATTEMPT SET marks = '$my_marks',teacher_comment = '$my_comments'
-					  WHERE question_id = '".$my_questionid."'
-					  AND exe_id='".$id."'";
-			Database::query($query);
-
-
-			$qry = 'SELECT sum(marks) as tot
-					FROM '.$TBL_TRACK_ATTEMPT.' WHERE exe_id = '.intval($id).'
-					GROUP BY question_id';
-
-			$res = Database::query($qry);
-			$tot = Database::result($res,0,'tot');
-			//updating also the total weight
-			$totquery = "UPDATE $TBL_TRACK_EXERCICES SET exe_result = '".Database::escape_string($tot)."', exe_weighting = '".Database::escape_string($total_weighting)."'
-						 WHERE exe_Id='".Database::escape_string($id)."'";
-			Database::query($totquery);
-			$recording_changes = 'INSERT INTO '.$TBL_RECORDING.' ' .
-					'(exe_id,
-					question_id,
-					marks,
-					insert_date,
-					author,
-					teacher_comment)
-					VALUES
-					('."'$id','".$my_questionid."','$my_marks','".date('Y-m-d H:i:s')."','".api_get_user_id()."'".',"'.$my_comments.'")';
-			Database::query($recording_changes);
+		$my_questionid=$array_content_id_exe[$i];
+		$sql = "SELECT question from $TBL_QUESTIONS WHERE id = '$my_questionid'";
+		$result =Database::query($sql);
+		$ques_name = Database::result($result,0,"question");
+
+		$query = "UPDATE $TBL_TRACK_ATTEMPT SET marks = '$my_marks',teacher_comment = '$my_comments'
+				  WHERE question_id = '".$my_questionid."'
+				  AND exe_id='".$id."'";
+				  
+		Database::query($query);
+
+
+		$qry = 'SELECT sum(marks) as tot
+				FROM '.$TBL_TRACK_ATTEMPT.' WHERE exe_id = '.intval($id).'
+				GROUP BY question_id';
+
+		$res = Database::query($qry);
+		$tot = Database::result($res,0,'tot');
+		//updating also the total weight
+		$totquery = "UPDATE $TBL_TRACK_EXERCICES SET exe_result = '".Database::escape_string($tot)."', exe_weighting = '".Database::escape_string($total_weighting)."'
+					 WHERE exe_Id='".Database::escape_string($id)."'";
+		Database::query($totquery);
+		$recording_changes = 'INSERT INTO '.$TBL_RECORDING.' ' .
+				'(exe_id,
+				question_id,
+				marks,
+				insert_date,
+				author,
+				teacher_comment)
+				VALUES
+				('."'$id','".$my_questionid."','$my_marks','".date('Y-m-d H:i:s')."','".api_get_user_id()."'".',"'.$my_comments.'")';
+		Database::query($recording_changes);
 	}
+
 	$post_content_id=array();
 	$array_content_id_exe=array();
 	/*foreach ($_POST as $key => $v) {
@@ -273,7 +277,7 @@ if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit
 	//search items
 	if (isset($_POST['my_exe_exo_id']) && isset($_POST['student_id'])) {
 		$sql_lp='SELECT li.id as lp_item_id,li.lp_id,li.item_type,li.path,liv.id AS lp_view_id,liv.user_id,max(liv.view_count) AS view_count FROM '.$TBL_LP_ITEM.' li
-		INNER JOIN '.$TBL_LP_VIEW.' liv ON li.lp_id=liv.lp_id WHERE li.path="'.Database::escape_string(Security::remove_XSS($_POST['my_exe_exo_id'])).'" AND li.item_type="quiz" AND user_id="'.Database::escape_string(Security::remove_XSS($_POST['student_id'])).'" ';
+		INNER JOIN '.$TBL_LP_VIEW.' liv ON li.lp_id=liv.lp_id WHERE li.path="'.Database::escape_string(Security::remove_XSS($_POST['my_exe_exo_id'])).'" AND li.item_type="quiz" AND user_id="'.Database::escape_string($_POST['student_id']).'" ';
 		$rs_lp=Database::query($sql_lp);
 		if (!($rs_lp===false)) {
 			$row_lp=Database::fetch_array($rs_lp);
@@ -348,33 +352,63 @@ if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit
 			$totalWeighting = $_POST['totalWeighting'];
 
 			if ($lp_item_id == strval(intval($lp_item_id)) && $lp_item_view_id == strval(intval($lp_item_view_id)) && $student_id == strval(intval($student_id))) {
-				$score = Database :: escape_string($_POST['total_score']);
+			
+				$score = Database :: escape_string($_POST['total_score']); //This is the new note
 				$total_time = Database :: escape_string($_POST['total_time']);
+				
+				//I need the lp_item_view_id in order to update the record
+				 
+				//@todo add the lp_item_view_id in the track_exercise table in order to have a real match between the lp_item_view and the track_exercise
+				
+				//$my_real_lp_item_view_id = Database :: escape_string($_POST['real_lp_item_view_id']);
+				
 				$lp_item_id = Database :: escape_string($lp_item_id);
 				$lp_item_view_id = Database :: escape_string($lp_item_view_id);
 				$student_id = Database :: escape_string($student_id);
 				$totalWeighting = Database :: escape_string($totalWeighting);
-				// get max view_count from lp_item_view
-				/*$sql = "SELECT MAX(view_count) FROM $TBL_LP_ITEM_VIEW WHERE lp_item_id = '" . (int) $lp_item_view_id . "'
-				    					AND lp_view_id = (SELECT id from $TBL_LP_VIEW  WHERE user_id = '" . (int) $student_id . "' and lp_id='" . (int) $lp_item_id . "')";
+				
+				/*
+				$sql = "SELECT (view_count) FROM $TBL_LP_ITEM_VIEW
+						WHERE lp_item_id = '" . (int) $lp_item_view_id . "' AND lp_view_id = $my_real_lp_item_view_id ORDER BY id DESC LIMIT 1";
+				$res_view_count = Database::query($sql);
+				$res_view_count = Database :: fetch_row($res_view_count);
+				$my_view_count =  intval($res_view_count[0]);
+				*/
+				
+				//Checking if this is the lastest attempt
+				$sql = "SELECT exe_id FROM $TBL_TRACK_EXERCICES
+						WHERE exe_user_id = '" . Database :: escape_string($_POST['student_id']) . "' AND exe_cours_id = '" . api_get_course_id() . "' AND orig_lp_id = '$lp_item_id' AND orig_lp_item_id =  '$lp_item_view_id'  AND session_id =  '" . api_get_session_id() . "' AND status = ''
+						ORDER BY exe_id DESC LIMIT 1 ";
+				$res_view_count = Database::query($sql);
+				$res_view_count = Database :: fetch_row($res_view_count);
+				$my_view_count =  intval($res_view_count[0]);				
+										
+				//Update lp_item_view if this attempts is the latest	
+				$sql = "SELECT MAX(view_count) FROM $TBL_LP_ITEM_VIEW
+						WHERE lp_item_id = '" . (int) $lp_item_view_id . "' AND lp_view_id = (SELECT id from $TBL_LP_VIEW  WHERE user_id = '" . (int) $student_id . "' and lp_id='" . (int) $lp_item_id . "')";
 				$res_max_view_count = Database::query($sql);
 				$row_max_view_count = Database :: fetch_row($res_max_view_count);
-				$max_view_count = (int) $row_max_view_count[0];
-
-				// update score and total_time from last attempt when you qualify the exercise in Learning path detail
-				$sql_update_score = "UPDATE $TBL_LP_ITEM_VIEW SET score = '" . (float) $score . "',total_time = '" . (int) $total_time . "' WHERE lp_item_id = '" . (int) $lp_item_view_id . "'
-				    					AND lp_view_id = (SELECT id from $TBL_LP_VIEW  WHERE user_id = '" . (int) $student_id . "' and lp_id='" . (int) $lp_item_id . "') AND view_count = '$max_view_count'";
-				Database::query($sql_update_score);
-
+				$max_view_count =  intval($row_max_view_count[0]);
+				
+				//Only update if is the last attempt			
+				if ($my_view_count == $_GET['exeid']) {									
+					// update score and total_time from last attempt when you qualify the exercise in Learning path detail
+					$sql_update_score = "UPDATE $TBL_LP_ITEM_VIEW SET score = '" . intval($tot) . "', total_time = '" . (int) $total_time . "' WHERE lp_item_id = '" . (int) $lp_item_view_id . "'
+					    					AND lp_view_id = (SELECT id from $TBL_LP_VIEW  WHERE user_id = '" . (int) $student_id . "' and lp_id='" . (int) $lp_item_id . "') AND view_count = '$max_view_count'";
+					Database::query($sql_update_score);
+				} 
+	
+				/*
+				/*
 				// update score and total_time from last attempt when you qualify the exercise in Learning path detail
 				$sql_update_score = "UPDATE $TBL_LP_ITEM_VIEW SET score = '" . (float) $score . "',total_time = '" . (int) $total_time . "' WHERE lp_item_id = '" . (int) $lp_item_view_id . "'
 				    					AND lp_view_id = (SELECT id from $TBL_LP_VIEW  WHERE user_id = '" . (int) $student_id . "' and lp_id='" . (int) $lp_item_id . "') AND view_count = '$max_view_count'";
 				Database::query($sql_update_score);*/
 
 				// update max_score from a exercise in lp
-				$sql_update_max_score = "UPDATE $TBL_LP_ITEM SET max_score = '" . (float) $totalWeighting . "'  WHERE id = '" . (int) $lp_item_view_id . "'";
+				//$sql_update_max_score = "UPDATE $TBL_LP_ITEM SET max_score = '" . (float) $totalWeighting . "'  WHERE id = '" . (int) $lp_item_view_id . "'";
 
-				Database::query($sql_update_max_score);
+				//Database::query($sql_update_max_score);
 
 			}
 		}

From 79e4baad0a72401e09dc5f3201b89c14f907d608 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 12:56:29 +0200
Subject: [PATCH 47/63] Cleaning code

---
 main/announcements/announcements.inc.php | 181 +++++++++++------------
 main/announcements/announcements.php     |  52 +++----
 main/announcements/download.php          |  31 +---
 3 files changed, 113 insertions(+), 151 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 1c13a7e918..3b9d2b0ba2 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -1,18 +1,13 @@
-<?php //$Id: announcements.inc.php 21903 2009-07-08 17:28:02Z juliomontoya $
+<?php
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * Include file with functions for the announcements module.
-* @package dokeos.announcements
-==============================================================================
+* @package chamilo.announcements
 */
 
 $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-
 /*
-==============================================================================
 		DISPLAY FUNCTIONS
-==============================================================================
 */
 /**
 * displays one specific announcement
@@ -20,10 +15,8 @@ $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATT
 * @todo remove globals
 * @todo more security checking
 */
-function display_announcement($announcement_id)
-{
+function display_announcement($announcement_id) {
 	global $_user, $dateFormatLong;
-
 	if ($announcement_id != strval(intval($announcement_id))) { return false; } // potencial sql injection
 
 	$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
@@ -61,45 +54,44 @@ function display_announcement($announcement_id)
 		list($last_post_date, $last_post_time) = split(" ", $last_post_datetime);
 	}
 
-	echo "<table height=\"100\" width=\"100%\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\" id=\"agenda_list\">\n";
-	echo "<tr class=\"data\"><td>" . $title . "</td></tr>\n";
-	echo "<tr><td class=\"announcements_datum\">" . get_lang('AnnouncementPublishedOn') . " : " . api_convert_and_format_date($last_post_datetime, null, date_default_timezone_get()) . "</td></tr>\n";
-	echo "<tr class=\"text\"><td>$content</td></tr>\n";
+	echo "<table height=\"100\" width=\"100%\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\" id=\"agenda_list\">";
+	echo "<tr class=\"data\"><td>" . $title . "</td></tr>";
+	echo "<tr><td class=\"announcements_datum\">" . get_lang('AnnouncementPublishedOn') . " : " . api_convert_and_format_date($last_post_datetime, null, date_default_timezone_get()) . "</td></tr>";
+	echo "<tr class=\"text\"><td>$content</td></tr>";
 	echo "</table>";
 }
 
-/*======================================
+/*
 	          SHOW_TO_FORM
-======================================*/
+*/
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
-function show_to_form($to_already_selected)
-{
+function show_to_form($to_already_selected) {
 	$user_list=get_course_users();
 	$group_list=get_course_groups();
 
 	if ($to_already_selected == "")
           $to_already_selected = array();
 
-	echo "\n<table id=\"recipient_list\" style=\"display: none;\">\n";
-	echo "\t<tr>\n";
+	echo "<table id=\"recipient_list\" style=\"display: none;\">";
+	echo "\t<tr>";
 
 	// the form containing all the groups and all the users of the course
-	echo "\t\t<td>\n";
+	echo "<td>";
 	echo "<strong>".get_lang('Users')."</strong><br />";
 	construct_not_selected_select_form($group_list,$user_list,$to_already_selected);
-	echo "\t\t</td>\n";
+	echo "</td>";
 
 	// the buttons for adding or removing groups/users
-	echo "\n\t\t<td valign=\"middle\">\n";
-	/*echo "\t\t<input	type=\"button\"	",
+	echo "<td valign=\"middle\">";
+	/*echo "<input	type=\"button\"	",
 				"onClick=\"javascript: move(this.form.elements[0],this.form.elements[3])\" ",// 7 & 4 : fonts
 				"value=\"   >>   \">",
 
-				"\n\t\t<p>&nbsp;</p>",
+				"<p>&nbsp;</p>",
 
-				"\n\t\t<input	type=\"button\"",
+				"<input	type=\"button\"",
 				"onClick=\"javascript: move(this.form.elements[3],this.form.elements[0])\" ",
 				"value=\"   <<   \">";*/
 
@@ -108,28 +100,28 @@ function show_to_form($to_already_selected)
 <br /> <br />
 <button class="arrowl" type="button" onClick="javascript: move(this.form.elements[3], this.form.elements[0])" onClick="javascript: move(this.form.elements[3], this.form.elements[0])"></button>
 <?php
-	echo "\t\t</td>\n";
-	echo "\n\t\t<td>\n";
+	echo "</td>";
+	echo "<td>";
 
 	// the form containing the selected groups and users
 	echo "<strong>".get_lang('DestinationUsers')."</strong><br />";
 	construct_selected_select_form($group_list,$user_list,$to_already_selected);
-	echo "\t\t</td>\n";
-	echo "\t</tr>\n";
+	echo "</td>";
+	echo "</tr>";
 	echo "</table>";
 }
 
 
-/*===========================================
+/*
 	  CONSTRUCT_NOT_SELECT_SELECT_FORM
-===========================================*/
+*/
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
 function construct_not_selected_select_form($group_list=null, $user_list=null,$to_already_selected)
 {
 
-	echo "\t\t<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>\n";
+	echo "<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>";
 	// adding the groups to the select form
 	if ($group_list)
 	{
@@ -139,14 +131,14 @@ function construct_not_selected_select_form($group_list=null, $user_list=null,$t
 			{
 				if (!in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
 				{
-					echo	"\t\t<option value=\"GROUP:".$this_group['id']."\">",
+					echo	"<option value=\"GROUP:".$this_group['id']."\">",
 					"G: ",$this_group['name']," - " . $this_group['userNb'] . " " . get_lang('Users') .
-					"</option>\n";
+					"</option>";
 				}
 			}
 		}
 		// a divider
-		echo	"\t\t<option value=\"\">---------------------------------------------------------</option>\n";
+		echo	"<option value=\"\">---------------------------------------------------------</option>";
 	}
 	// adding the individual users to the select form
 	if ($user_list) {
@@ -155,21 +147,21 @@ function construct_not_selected_select_form($group_list=null, $user_list=null,$t
 			if (is_array($to_already_selected)) {
 				if (!in_array("USER:".$this_user['user_id'],$to_already_selected)) // $to_already_selected is the array containing the users (and groups) that are already selected
 				{
-					echo	"\t\t<option value=\"USER:".$this_user['user_id']."\">",
+					echo	"<option value=\"USER:".$this_user['user_id']."\">",
 						"", api_get_person_name($this_user['firstname'], $this_user['lastname']),
-						"</option>\n";
+						"</option>";
 				}
 			}
 		}
 	}
-	echo "\t\t</select>\n";
+	echo "</select>";
 }
 
 
 
-/*==========================================
+/*
 	   CONSTRUCT_SELECTED_SELECT_FORM
-==========================================*/
+*/
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
@@ -190,20 +182,20 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 	$ref_array_users=get_course_users();
 
 	// we construct the form of the already selected groups / users
-	echo "\t\t<select name=\"selectedform[]\" size=\"5\" multiple style=\"width:200px\" width=\"200px\">";
+	echo "<select name=\"selectedform[]\" size=\"5\" multiple style=\"width:200px\" width=\"200px\">";
 	if (is_array($to_already_selected)) {
 		foreach($to_already_selected as $groupuser)
 		{
 			list($type,$id)=explode(":",$groupuser);
 			if ($type=="GROUP")
 			{
-				echo "\t\t<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>";
+				echo "<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>";
 			}
 			else
 			{
 				foreach($ref_array_users as $key=>$value){
 					if($value['user_id']==$id){
-						echo "\t\t<option value=\"".$groupuser."\">".api_get_person_name($value['firstname'], $value['lastname'])."</option>";
+						echo "<option value=\"".$groupuser."\">".api_get_person_name($value['firstname'], $value['lastname'])."</option>";
 						break;
 					}
 				}
@@ -219,9 +211,9 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 					//api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]);
 					if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
 					{
-						echo	"\t\t<option value=\"GROUP:".$this_group['id']."\">",
+						echo	"<option value=\"GROUP:".$this_group['id']."\">",
 							"G: ",$this_group['name']," &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
-							"</option>\n";
+							"</option>";
 					}
 				}
 			}
@@ -230,14 +222,14 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 			{
 				if (!is_array($to_already_selected) || !in_array("USER:".$this_user['user_id'],$to_already_selected)) // $to_already_selected is the array containing the users (and groups) that are already selected
 				{
-					echo	"\t\t<option value=\"USER:",$this_user['user_id'],"\">",
+					echo	"<option value=\"USER:",$this_user['user_id'],"\">",
 						"", api_get_person_name($this_user['firstname'], $this_user['lastname']),
-						"</option>\n";
+						"</option>";
 				}
 			}
 		}
 	}
-	echo "</select>\n";
+	echo "</select>";
 }
 
 
@@ -247,29 +239,29 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 function show_to_form_group($group_id)
 {
 
-	echo "\n<table id=\"recipient_list\" style=\"display: none;\">\n";
-	echo "\t<tr>\n";
+	echo "<table id=\"recipient_list\" style=\"display: none;\">";
+	echo "<tr>";
 
-	echo "\t\t<td>\n";
+	echo "<td>";
 
-	echo "\t\t<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>\n";
+	echo "<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>";
 	$group_users = GroupManager::get_subscribed_users($group_id);
 	foreach ($group_users as $user){
 		echo '<option value="'.$user['user_id'].'">'.api_get_person_name($user['firstname'], $user['lastname']).'</option>';
 	}
 	echo '</select>';
 
-	echo "\t\t</td>\n";
+	echo "</td>";
 
 	// the buttons for adding or removing groups/users
-	echo "\n\t\t<td valign=\"middle\">\n";
-	/*echo "\t\t<input	type=\"button\"	",
+	echo "<td valign=\"middle\">";
+	/*echo "<input	type=\"button\"	",
 				"onClick=\"move(this.form.elements[1],this.form.elements[4])\" ",// 7 & 4 : fonts
 				"value=\"   >>   \">",
 
-				"\n\t\t<p>&nbsp;</p>",
+				"<p>&nbsp;</p>",
 
-				"\n\t\t<input	type=\"button\"",
+				"<input	type=\"button\"",
 				"onClick=\"move(this.form.elements[4],this.form.elements[1])\" ",
 				"value=\"   <<   \">";*/
 
@@ -278,22 +270,20 @@ function show_to_form_group($group_id)
 <br /> <br />
 <button class="arrowl" type="button" onClick="javascript: move(this.form.elements[4], this.form.elements[1])" onClick="javascript: move(this.form.elements[4], this.form.elements[1])"></button>
 <?php
-	echo "\t\t</td>\n";
-	echo "\n\t\t<td>\n";
+	echo "</td>";
+	echo "<td>";
 
-	echo "\t\t<select name=\"selectedform[]\" size=5 style=\"width:200px\" multiple>\n";
+	echo "<select name=\"selectedform[]\" size=5 style=\"width:200px\" multiple>";
 	echo '</select>';
 
-	echo "\t\t</td>\n";
-	echo "\t</tr>\n";
+	echo "</td>";
+	echo "</tr>";
 	echo "</table>";
 }
 
 
 /*
-==============================================================================
 		DATA FUNCTIONS
-==============================================================================
 */
 
 /**
@@ -331,9 +321,10 @@ function get_course_groups()
 	return $new_group_list;
 }
 
-/*======================================
+/*
+ * 
 	          LOAD_EDIT_USERS
-======================================*/
+*/
 /**
 * This tools loads all the users and all the groups who have received
 * a specific item (in this case an announcement item)
@@ -371,9 +362,9 @@ function load_edit_users($tool, $id)
 
 
 
-/*======================================
+/*
 	 USER_GROUP_FILTER_JAVASCRIPT
-======================================*/
+*/
 /**
 * returns the javascript for setting a filter
 * this goes into the $htmlHeadXtra[] array
@@ -393,9 +384,9 @@ function user_group_filter_javascript()
 }
 
 
-/*======================================
+/*
 	         TO_JAVASCRIPT
-========================================*/
+*/
 /**
 * returns all the javascript that is required for easily
 * setting the target people/groups
@@ -552,9 +543,9 @@ function plus_attachment() {
 }
 
 
-/*======================================
+/*
 			SENT_TO_FORM
-======================================*/
+*/
 /**
 * constructs the form to display all the groups and users the message has been sent to
 * input: 	$sent_to_array is a 2 dimensional array containing the groups and the users
@@ -593,14 +584,14 @@ function sent_to_form($sent_to_array)
 	// starting the form if there is more than one user/group
 	if ($total_numbers >1)
 	{
-		$output="<select name=\"sent to\">\n";
+		$output="<select name=\"sent to\">";
 		$output.="<option>".get_lang("SentTo")."</option>";
 		// outputting the name of the groups
 		if (is_array($sent_to_array['groups']))
 		{
 			foreach ($sent_to_array['groups'] as $group_id)
 			{
-				$output.="\t<option value=\"\">G: ".$group_names[$group_id]['name']."</option>\n";
+				$output.="<option value=\"\">G: ".$group_names[$group_id]['name']."</option>";
 			}
 		}
 
@@ -611,13 +602,13 @@ function sent_to_form($sent_to_array)
 				foreach ($sent_to_array['users'] as $user_id)
 				{
 					$user_info = api_get_user_info($user_id);
-					$output.="\t<option value=\"\">".api_get_person_name($user_info['firstname'], $user_info['lastname'])."</option>\n";
+					$output.="<option value=\"\">".api_get_person_name($user_info['firstname'], $user_info['lastname'])."</option>";
 				}
 			}
 		}
 
 		// ending the form
-		$output.="</select>\n";
+		$output.="</select>";
 	}
 	else // there is only one user/group
 	{
@@ -643,9 +634,9 @@ function sent_to_form($sent_to_array)
 }
 
 
-/*======================================
+/*
 			SEPARATE_USERS_GROUPS
-	======================================*/
+*/
 /**
 * This function separates the users from the groups
 * users have a value USER:XXX (with XXX the dokeos id
@@ -674,9 +665,9 @@ function separate_users_groups($to)
 
 
 
-/*======================================
+/*
 	 			SENT_TO()
-  ======================================*/
+*/
 /**
 * Returns all the users and all the groups a specific announcement item
 * has been sent to
@@ -776,8 +767,7 @@ function change_visibility_announcement($tool,$id)
 function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = array(), $file_comment='') {
 
 	global $_course;
-	global $nameTools;
-	global $_user;
+	global $nameTools;	
 
 	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
 	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -809,7 +799,7 @@ function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = arra
 		{
 			foreach ($send_to['groups'] as $group)
 			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], $group);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
 			}
 		}
 
@@ -818,23 +808,21 @@ function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = arra
 		{
 			foreach ($send_to['users'] as $user)
 			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], '', $user);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
 			}
 		}
 	}
 	else // the message is sent to everyone, so we set the group to 0
 	{
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], '0');
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '0');
 	}
 	return $last_id;
 }
 
 
-function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_users, $file = array(), $file_comment='')
-{
+function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_users, $file = array(), $file_comment='') {
 	global $_course;
 	global $nameTools;
-	global $_user;
 
 	// database definitions
 	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
@@ -868,7 +856,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 		{
 			foreach ($send_to['groups'] as $group)
 			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], $group);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
 			}
 		}
 	}
@@ -879,7 +867,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 		{
 			foreach ($to_users as $user)
 			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", $_user['user_id'], '', $user);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
 			}
 		}
 	}
@@ -901,8 +889,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 
 	global $_course;
 	global $nameTools;
-	global $_user;
-
+	
 	global $tbl_announcement;
 	global $tbl_item_property;
 
@@ -940,7 +927,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 		{
 			foreach ($send_to['groups'] as $group)
 			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], $group);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), $group);
 			}
 		}
 		// storing the selected users
@@ -948,21 +935,19 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 		{
 			foreach ($send_to['users'] as $user)
 			{
-					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], 0, $user);
+					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), 0, $user);
 			}
 		}
 	}
 	else // the message is sent to everyone, so we set the group to 0
 	{
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", $_user['user_id'], '0');
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), '0');
 	}
 }
 
 
 /*
-==============================================================================
 		MAIL FUNCTIONS
-==============================================================================
 */
 
 /**
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index dcb27e71d5..634b63e0dd 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -893,8 +893,8 @@ if (!$surveyid) {
 
 if (empty($_GET['origin']) OR $_GET['origin'] !== 'learnpath') {
 	echo "\n\n<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-	echo "\t<tr>\n";
-	echo "\t\t<td width=\"20%\" valign=\"top\">\n";
+	echo "<tr>\n";
+	echo "<td width=\"20%\" valign=\"top\">\n";
 }
 
 /*
@@ -902,12 +902,12 @@ if (empty($_GET['origin']) OR $_GET['origin'] !== 'learnpath') {
 */
 if (!$surveyid) {
 	if ($display_title_list == true) {
-		echo "\t\t\t<table>\n";
+		echo "<table>\n";
 		while ($myrow = Database::fetch_array($result)) {
 			$title = $myrow['title'];
 			$title = Security::remove_XSS($title);
-			echo "\t\t\t\t<tr>\n";
-			echo "\t\t\t\t\t<td width=\"15%\">\n";
+			echo "<tr>\n";
+			echo "<td width=\"15%\">\n";
 			if ($myrow['visibility']==0) {
 				$class="class=\"invisible\"";
 			} else {
@@ -916,18 +916,18 @@ if (!$surveyid) {
 			//validation when belongs to a session
 			$session_img = api_get_session_image($myrow['session_id'], $_user['status']);
 
-			echo "\t\t\t\t\t\t".Display::return_icon('lp_announcement.png', api_convert_and_format_date($myrow['end_date'], DATE_FORMAT_LONG), array('align' => 'absmiddle', 'Width' => '10', 'Height' => '10'))."  <a style=\"text-decoration:none\" href=\"announcements.php?".api_get_cidreq()."#".$myrow['id']."\" ".$class.">" . api_trunc_str($title, $length) . "</a>\n" . $session_img;
-			echo "\t\t\t\t\t</td>\n\t\t\t\t</tr>\n";
+			echo Display::return_icon('lp_announcement.png', api_convert_and_format_date($myrow['end_date'], DATE_FORMAT_LONG), array('align' => 'absmiddle', 'Width' => '10', 'Height' => '10'))."  <a style=\"text-decoration:none\" href=\"announcements.php?".api_get_cidreq()."#".$myrow['id']."\" ".$class.">" . api_trunc_str($title, $length) . "</a>\n" . $session_img;
+			echo "</td>\n</tr>\n";
 		}
-		echo "\t\t\t</table>\n";
+		echo "</table>\n";
 	} // end $display_title_list == true
 }
 
 if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-	echo   "\t\t</td>\n";
-	echo "\t\t<td width=\"20\" background=\"../img/verticalruler.gif\">&nbsp;</td>\n";
+	echo   "</td>\n";
+	echo "<td width=\"20\" background=\"../img/verticalruler.gif\">&nbsp;</td>\n";
 	// START RIGHT PART
-	echo	"\t\t<td valign=\"top\">\n";
+	echo	"<td valign=\"top\">\n";
 }
 
 /*
@@ -1310,7 +1310,7 @@ if ($display_announcement_list && !$surveyid) {
 	$iterator = 1;
 	$bottomAnnouncement = $announcement_number;
 
-	echo "\t\t\t<table width=\"100%\" class=\"data_table\">\n";
+	echo "<table width=\"100%\" class=\"data_table\">\n";
 
 	$displayed=array();
 
@@ -1339,46 +1339,46 @@ if ($display_announcement_list && !$surveyid) {
 				$style = '';
 			}
 
-			echo	"\t\t\t\t<tr class=\"".$style."\">";
+			echo	"<tr class=\"".$style."\">";
 
 			/* THE ICONS */
 
-			echo "\t\t\t\t\t<th>\n";
+			echo "<th>\n";
 			// anchoring
 			echo "<a name=\"".(int)($myrow["id"])."\"></a>\n";
 			// User or group icon
 			if ($myrow['to_group_id']!== '0' and $myrow['to_group_id']!== 'NULL') {
-				echo "\t\t\t\t\t\t".Display::return_icon('group.gif', get_lang('AnnounceSentToUserSelection'))."\n";
+				echo Display::return_icon('group.gif', get_lang('AnnounceSentToUserSelection'))."\n";
 			}
 			// the email icon
 			if ($myrow['email_sent'] == '1') {
-				echo "\t\t\t\t\t\t".Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'))."\n";
+				echo Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'))."\n";
 			}
-			echo "\t\t\t\t\t</th>\n";
+			echo "</th>\n";
 
 			/* TITLE */
 
-			echo "\t\t\t\t\t<th>".Security::remove_XSS($title)."</th>\n";
-			echo "\t\t\t\t\t<th>" . get_lang("SentTo") . " : &nbsp; ";
+			echo "<th>".Security::remove_XSS($title)."</th>\n";
+			echo "<th>" . get_lang("SentTo") . " : &nbsp; ";
 
 			$sent_to=sent_to("announcement", $myrow['id']);
 			$sent_to_form=sent_to_form($sent_to);
 			$user_info=api_get_user_info($myrow['insert_user_id']);
 
 			echo '&nbsp;&nbsp;&nbsp;'.get_lang('By').' : &nbsp;'.str_replace(' ', '&nbsp;', api_get_person_name($user_info['firstName'], $user_info['lastName']));
-			echo "\t\t\t\t\t</th>\n","\t\t\t\t</tr>\n";
-			echo "\t\t\t\t<tr class='row_odd'>\n\t\t\t\t\t<td class=\"announcements_datum\" colspan=\"3\">";
+			echo "</th></tr>";
+			echo "<tr class='row_odd'>\n<td class=\"announcements_datum\" colspan=\"3\">";
 			echo get_lang('AnnouncementPublishedOn')," : ", api_convert_and_format_date($last_post_datetime, DATE_FORMAT_LONG, date_default_timezone_get());
-			echo "</td>\n\t\t\t\t</tr>\n";
+			echo "</td>\n</tr>\n";
 
 			/* CONTENT */
 
-			echo "\t\t\t\t<tr class=\"$text_style\">\n\t\t\t\t\t<td colspan=\"3\">\n";
-			echo $content."\t\t\t\t\t</td>\n\t\t\t\t</tr>\n";
+			echo "<tr class=\"$text_style\">\n<td colspan=\"3\">\n";
+			echo $content."</td>\n</tr>";
 
 			/* RESOURCES */
 
-			echo "<tr class='row_odd'>\n<td colspan=\"3\">\n";
+			echo "<tr class='row_odd'><td colspan=\"3\">";
 
 			if (check_added_resources("Ad_Valvas", $myrow["id"])) {
 				echo "<i>".get_lang('AddedResources')."</i><br />";
@@ -1448,7 +1448,7 @@ if ($display_announcement_list && !$surveyid) {
 				}
 
 
-				echo "</td>\n</tr>\n";
+				echo "</td></tr>";
 
 				$iterator ++;
 			} else { // end of is_allowed_to_edit
diff --git a/main/announcements/download.php b/main/announcements/download.php
index 921d53eb79..1ec5e3eb2d 100755
--- a/main/announcements/download.php
+++ b/main/announcements/download.php
@@ -1,48 +1,25 @@
-<?php // $Id: announcements.php 2009-11-13 10:57:03Z aportugal $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2009 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
-	info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This file is responsible for  passing requested documents to the browser.
 *	Html files are parsed to fix a few problems with URLs,
 *	but this code will hopefully be replaced soon by an Apache URL
 *	rewrite mechanism.
 *
-*	@package dokeos.announcements
-==============================================================================
+*	@package chamilo.announcements
 */
 
 /*
-==============================================================================
 		MAIN CODE
-==============================================================================
 */
 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
 $this_section=SECTION_COURSES;
-
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once 'announcements.inc.php';
+
 // IMPORTANT to avoid caching of documents
 header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
 header('Cache-Control: public');

From 70248bc6849420235f8182e474450163635f5c99 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 13:06:54 +0200
Subject: [PATCH 48/63] More code cleaning, removing old global definitions,
 removing die() function, removing tags \t \n

---
 main/announcements/announcements.inc.php | 63 +++++++++---------------
 main/announcements/announcements.php     | 23 ++++-----
 2 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 3b9d2b0ba2..27591735a7 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -10,26 +10,22 @@ $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATT
 		DISPLAY FUNCTIONS
 */
 /**
-* displays one specific announcement
+* Displays one specific announcement
 * @param $announcement_id, the id of the announcement you want to display
-* @todo remove globals
-* @todo more security checking
 */
-function display_announcement($announcement_id) {
-	global $_user, $dateFormatLong;
+function display_announcement($announcement_id) {	
 	if ($announcement_id != strval(intval($announcement_id))) { return false; } // potencial sql injection
 
 	$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
 	$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
-	if ($_user['user_id'])
-	{
+	if (api_get_user_id() != 0) {
 		$sql_query = "	SELECT announcement.*, toolitemproperties.*
 						FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
 						WHERE announcement.id = toolitemproperties.ref
 						AND announcement.id = '$announcement_id'
 						AND toolitemproperties.tool='announcement'
-						AND (toolitemproperties.to_user_id='".intval($_user['user_id'])."' OR toolitemproperties.to_group_id='0')
+						AND (toolitemproperties.to_user_id='".api_get_user_id()."' OR toolitemproperties.to_group_id='0')
 						AND toolitemproperties.visibility='1'
 						ORDER BY display_order DESC";
 
@@ -43,7 +39,7 @@ function display_announcement($announcement_id) {
 						AND toolitemproperties.visibility='1'";
 	}
 	$sql_result = Database::query($sql_query);
-	$result = Database::fetch_array($sql_result);
+	$result		= Database::fetch_array($sql_result);
 
 	if ($result !== false) { // A sanity check.
 		$title		 = $result['title'];
@@ -62,7 +58,7 @@ function display_announcement($announcement_id) {
 }
 
 /*
-	          SHOW_TO_FORM
+	SHOW_TO_FORM
 */
 /**
 * this function shows the form for sending a message to a specific group or user.
@@ -165,8 +161,7 @@ function construct_not_selected_select_form($group_list=null, $user_list=null,$t
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
-function construct_selected_select_form($group_list=null, $user_list=null,$to_already_selected)
-{
+function construct_selected_select_form($group_list=null, $user_list=null,$to_already_selected) {
 	// we separate the $to_already_selected array (containing groups AND users into
 	// two separate arrays
 	$groupuser = array();
@@ -329,16 +324,14 @@ function get_course_groups()
 * This tools loads all the users and all the groups who have received
 * a specific item (in this case an announcement item)
 */
-function load_edit_users($tool, $id)
-{
-	global $_course;
+function load_edit_users($tool, $id) {	
 	global $tbl_item_property;
 
 	$tool = Database::escape_string($tool);
 	$id = Database::escape_string($id);
 
 	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
-	$result = Database::query($sql) or die(Database::error());
+	$result = Database::query($sql);
 	while ($row = Database::fetch_array($result))
 	{
 		$to_group=$row['to_group_id'];
@@ -736,18 +729,15 @@ function change_visibility_announcement($tool,$id)
 
 	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
 
-	$result = Database::query($sql) or die(Database::error());
+	$result = Database::query($sql);
 	$row = Database::fetch_array($result);
 
-	if ($row['visibility']=='1')
-	{
+	if ($row['visibility']=='1') {
 		$sql_visibility="UPDATE $tbl_item_property SET visibility='0' WHERE tool='$tool' AND ref='$id'";
-	}
-	else
-	{
+	} else {
 		$sql_visibility="UPDATE $tbl_item_property SET visibility='1' WHERE tool='$tool' AND ref='$id'";
 	}
-    $result=Database::query($sql_visibility);
+    $result = Database::query($sql_visibility);
     if ($result === false) {
         return false;
     }
@@ -778,7 +768,7 @@ function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = arra
 	$order = intval($order);
 
 	// store in the table announcement
-	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".intval($_SESSION['id_session']);
+	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
 	$result = Database::query($sql);
 	if ($result === false) {
 		return false;
@@ -834,8 +824,8 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 	$order = intval($order);
 
 	// store in the table announcement
-	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".intval($_SESSION['id_session']);
-	$result = Database::query($sql) or die(Database::error());
+	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
+	$result = Database::query($sql);
 	if ($result === false) {
 		return false;
 	}
@@ -884,8 +874,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 * This function stores the announcement Item in the table announcement
 * and updates the item_property also
 */
-function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $file_comment='')
-{
+function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $file_comment='') {
 
 	global $_course;
 	global $nameTools;
@@ -900,7 +889,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 
 	// store the modifications in the table announcement
  	$sql = "UPDATE $tbl_announcement SET content='$newContent', title = '$emailTitle' WHERE id='$id'";
-	$result = Database::query($sql) or die(Database::error());
+	$result = Database::query($sql);
 
 	// save attachment file
 	$row_attach = get_attachment($id);
@@ -916,7 +905,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 
 	// we remove everything from item_property for this
 	$sql_delete="DELETE FROM $tbl_item_property WHERE ref='$id' AND tool='announcement'";
-	$result = Database::query($sql_delete) or die(Database::error());
+	$result = Database::query($sql_delete);
 
 	// store in item_property (first the groups, then the users
 	if (!is_null($to)) // !is_null($to): when no user is selected we send it to everyone
@@ -972,10 +961,8 @@ function send_announcement_email($user_list, $course_code, $_course, $mail_title
 	}
 }
 
-function update_mail_sent($insert_id)
-{
-	global $_course;
-	global $tbl_announcement;
+function update_mail_sent($insert_id) {
+	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
 	if ($insert_id != strval(intval($insert_id))) { return false; }
 	$insert_id = Database::escape_string($insert_id);
 	// store the modifications in the table tbl_annoucement
@@ -989,8 +976,7 @@ function update_mail_sent($insert_id)
  * @param	int user id
  * @return	array html with the content and count of announcements or false otherwise
  */
-function get_all_annoucement_by_user_course($course_db, $user_id)
-{
+function get_all_annoucement_by_user_course($course_db, $user_id) {
 	if (empty($course_db) || empty($user_id)) {
 		return false;
 	}
@@ -1031,9 +1017,7 @@ function get_all_annoucement_by_user_course($course_db, $user_id)
 }
 
 /*
-==============================================================================
 		ATTACHMENT FUNCTIONS
-==============================================================================
 */
 
 /**
@@ -1155,7 +1139,6 @@ function edit_announcement_attachment_file($id_attach, $file, $file_comment) {
  *
  */
 function delete_announcement_attachment_file($id) {
-
 	global $_course;
 	$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 	$id=Database::escape_string($id);
@@ -1163,4 +1146,4 @@ function delete_announcement_attachment_file($id) {
 	$result=Database::query($sql);
 	// update item_property
 	//api_item_property_update($_course, 'announcement_attachment',  $id,'AnnouncementAttachmentDeleted', api_get_user_id());
-}
+}
\ No newline at end of file
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 634b63e0dd..0285b4132b 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -3,10 +3,11 @@
 /**
  * @author Frederik Vermeire <frederik.vermeire@pandora.be>, UGent Internship
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: code cleaning
+ * @author Julio MMontoya <gugli100@gmail.com>, MORE code cleaning
  * @abstract The task of the internship was to integrate the 'send messages to specific users' with the
  *			 Announcements tool and also add the resource linker here. The database also needed refactoring
  *			 as there was no title field (the title was merged into the content field)
- * @package dokeos.announcements
+ * @package chamilo.announcements
  * @todo make AWACS out of the configuration settings
  * @todo this file is 1200+ lines without any functions -> needs to be split into
  * multiple functions
@@ -15,9 +16,7 @@
 		INIT SECTION
 */
 // name of the language file that needs to be included
-$language_file[] = 'announcements';
-$language_file[] = 'group';
-$language_file[] = 'survey';
+$language_file[] = array('announcements', 'group', 'survey');
 
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
@@ -25,10 +24,8 @@ $use_anonymous = true;
 // setting the global file that gets the general configuration, the databases, the languages, ...
 require_once '../inc/global.inc.php';
 $this_section=SECTION_COURSES;
-
 $nameTools = get_lang('ToolAnnouncement');
 
-
 //session
 if(isset($_GET['id_session'])) {
 	$_SESSION['id_session'] = intval($_GET['id_session']);
@@ -92,9 +89,7 @@ if (!empty($_POST['addresources'])) // When the "Add Resource" button is clicked
 	{
 		header("Location: ../resourcelinker/resourcelinker.php?source_id=7&action=$action&id=$id&originalresource=no&publish_survey=$surveyid&db_name=$db_name&cidReq=$cidReq");
 		exit;
-	}
-	else
-	{
+	} else {
 		header("Location: ../resourcelinker/resourcelinker.php?source_id=7&action=$action&id=$id&originalresource=no");
 		exit;
 	}
@@ -500,7 +495,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 			if ($ctok == $_POST['sec_token']) {
 
 				if (!$surveyid) {
-					$result = Database::query("SELECT MAX(display_order) FROM $tbl_announcement WHERE session_id=".intval($_SESSION['id_session'])." OR session_id=0");
+					$result = Database::query("SELECT MAX(display_order) FROM $tbl_announcement WHERE session_id=".api_get_session_id()." OR session_id=0");
 					list($orderMax) = Database::fetch_row($result);
 					$order = $orderMax + 1;
 					$file = $_FILES['user_upload'];
@@ -625,7 +620,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 										 INNER JOIN $tbl_session_course_user
 										 	ON $tbl_user.user_id = $tbl_session_course_user.id_user
 											AND $tbl_session_course_user.course_code = '".$_course['id']."'
-											AND $tbl_session_course_user.id_session = ".intval($_SESSION['id_session']);
+											AND $tbl_session_course_user.id_session = ".api_get_session();
 
 			    		}
 			    	}
@@ -981,7 +976,7 @@ if ($display_form == true) {
 			// we want to remind inactive users. The $_GET['since'] parameter determines which users have to be warned (i.e the users who have been inactive for x days or more
 			$since = isset($_GET['since']) ? intval($_GET['since']) : 6;
 			// getting the users who have to be reminded
-			$to = Tracking :: get_inactives_students_in_course($_course['id'],$since, $_SESSION['id_session']);
+			$to = Tracking :: get_inactives_students_in_course($_course['id'],$since, api_get_session_id());
 			// setting the variables for the form elements: the users who need to receive the message
 			foreach($to as &$user) {
 				$user = 'USER:'.$user;
@@ -1272,7 +1267,7 @@ if ($display_announcement_list && !$surveyid) {
 						$cond_user_id
 						$condition_session
 						AND ip.visibility='1'
-						AND announcement.session_id IN(0,".intval($_SESSION['id_session']).")
+						AND announcement.session_id IN(0,".api_get_session_id().")
 						ORDER BY display_order DESC";
 				} else {
 
@@ -1290,7 +1285,7 @@ if ($display_announcement_list && !$surveyid) {
 						$cond_user_id
 						$condition_session
 						AND ip.visibility='1'
-						AND announcement.session_id IN(0,".intval($_SESSION['id_session']).")";
+						AND announcement.session_id IN(0,".api_get_session_id().")";
 				}
 			}
 

From db356b9846f627c374dd21bffada7259d732e83c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 15:12:26 +0200
Subject: [PATCH 49/63] Cleaning code

---
 main/inc/lib/main_api.lib.php | 78 +++++++++++++++--------------------
 1 file changed, 34 insertions(+), 44 deletions(-)

diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index cb17a2f322..a7b472f5b4 100755
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -2319,19 +2319,20 @@ function api_get_item_visibility($_course, $tool, $id) {
 function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $user_id, $to_group_id = 0, $to_user_id = null, $start_visible = 0, $end_visible = 0, $session_id = 0) {
 
 	// Definition of variables
-	$tool = Database::escape_string($tool);
-	$item_id = Database::escape_string($item_id);
-	$lastedit_type = Database::escape_string($lastedit_type);
-	$user_id = Database::escape_string($user_id);
-	$to_group_id = Database::escape_string($to_group_id);
-	$to_user_id = Database::escape_string($to_user_id);
-	$start_visible = Database::escape_string($start_visible);
-	$end_visible = Database::escape_string($end_visible);
-	$start_visible = ($start_visible == 0) ? '0000-00-00 00:00:00' : $start_visible;
-	$end_visible = ($end_visible == 0) ? '0000-00-00 00:00:00' : $end_visible;
-	$to_filter = '';
-	$time = time();
-	$time = date('Y-m-d H:i:s', $time);
+	$tool 			= Database::escape_string($tool);
+	$item_id 		= Database::escape_string($item_id);
+	$lastedit_type 	= Database::escape_string($lastedit_type);
+	$user_id 		= Database::escape_string($user_id);
+	$to_group_id 	= Database::escape_string($to_group_id);
+	$to_user_id 	= Database::escape_string($to_user_id);
+	$start_visible 	= Database::escape_string($start_visible);
+	$end_visible	= Database::escape_string($end_visible);
+	$start_visible 	= ($start_visible == 0) ? '0000-00-00 00:00:00' : $start_visible;
+	$end_visible 	= ($end_visible == 0) ? '0000-00-00 00:00:00' : $end_visible;
+	$to_filter 		= '';
+	$time 			= time();
+	$time 			= date('Y-m-d H:i:s', $time);
+	
 	if (!empty($session_id)) {
 		$session_id = intval($session_id);
 	} else {
@@ -2379,8 +2380,10 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us
 			$to_filter = " AND to_group_id='$to_group_id' $condition_session"; // Set filter to intended group
 		}
 	}
+	
 	// Update if possible
 	$set_type = '';
+	
 	switch ($lastedit_type) {
 		case 'delete' : // delete = make item only visible for the platform admin
 			$visibility = '2';
@@ -2395,18 +2398,14 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us
 							SET lastedit_type='".str_replace('_', '', ucwords($tool))."Deleted', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility', id_session = '$session_id' $set_type
 							WHERE $filter";
 				} else {
-
-					$sql = "INSERT INTO $TABLE_ITEMPROPERTY
-						   		  			(tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
-						         	VALUES 	('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
+					$sql = "INSERT INTO $TABLE_ITEMPROPERTY (tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
+							VALUES 	('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
 				}
 
 			} else {
-				$sql = "UPDATE $TABLE_ITEMPROPERTY
-										SET lastedit_type='".str_replace('_', '', ucwords($tool))."Deleted', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
-										WHERE $filter";
+				$sql = "UPDATE $TABLE_ITEMPROPERTY SET lastedit_type='".str_replace('_', '', ucwords($tool))."Deleted', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
+						WHERE $filter";
 			}
-
 			break;
 		case 'visible' : // Change item to visible
 			$visibility = '1';
@@ -2421,18 +2420,14 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us
 							SET lastedit_type='".str_replace('_', '', ucwords($tool))."Visible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility', id_session = '$session_id' $set_type
 							WHERE $filter";
 				} else {
-
-					$sql = "INSERT INTO $TABLE_ITEMPROPERTY
-						   		  			(tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
-						         	VALUES 	('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
+					$sql = "INSERT INTO $TABLE_ITEMPROPERTY (tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
+						    VALUES ('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
 				}
-
-			}	else {
+			} else {
 				$sql = "UPDATE $TABLE_ITEMPROPERTY
-										SET lastedit_type='".str_replace('_', '', ucwords($tool))."Visible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
-										WHERE $filter";
+						SET lastedit_type='".str_replace('_', '', ucwords($tool))."Visible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
+						WHERE $filter";
 			}
-
 			break;
 		case 'invisible' : // Change item to invisible
 			$visibility = '0';
@@ -2447,34 +2442,29 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us
 							SET lastedit_type='".str_replace('_', '', ucwords($tool))."Invisible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility', id_session = '$session_id' $set_type
 							WHERE $filter";
 				} else {
-
-					$sql = "INSERT INTO $TABLE_ITEMPROPERTY
-						   		  			(tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
-						         	VALUES 	('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
+					$sql = "INSERT INTO $TABLE_ITEMPROPERTY (tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
+						    VALUES ('$tool','$item_id','$time', '$user_id', '$time',	'$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
 				}
 
 			} else {
 				$sql = "UPDATE $TABLE_ITEMPROPERTY
-										SET lastedit_type='".str_replace('_', '', ucwords($tool))."Invisible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
-										WHERE $filter";
+						SET lastedit_type='".str_replace('_', '', ucwords($tool))."Invisible', lastedit_date='$time', lastedit_user_id='$user_id', visibility='$visibility' $set_type
+						WHERE $filter";
 			}
-
 			break;
 		default : // The item will be added or updated
 			$set_type = ", lastedit_type='$lastedit_type' ";
 			$visibility = '1';
 			$filter .= $to_filter;
 			$sql = "UPDATE $TABLE_ITEMPROPERTY
-										SET lastedit_date='$time', lastedit_user_id='$user_id' $set_type
-										WHERE $filter";
-	}
-
+					SET lastedit_date='$time', lastedit_user_id='$user_id' $set_type
+					WHERE $filter";
+	}	
 	$res = Database::query($sql);
 	// Insert if no entries are found (can only happen in case of $lastedit_type switch is 'default')
 	if (Database::affected_rows() == 0) {
-		$sql = "INSERT INTO $TABLE_ITEMPROPERTY
-						   		  			(tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type,   lastedit_user_id,$to_field,  visibility,   start_visible,   end_visible, id_session)
-						         	VALUES 	('$tool','$item_id','$time',    '$user_id',	   '$time',		 '$lastedit_type','$user_id',	   '$to_value','$visibility','$start_visible','$end_visible', '$session_id')";
+		$sql = "INSERT INTO $TABLE_ITEMPROPERTY (tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type,   lastedit_user_id,$to_field,  visibility,   start_visible,   end_visible, id_session)
+				VALUES 	('$tool','$item_id','$time',    '$user_id',	   '$time',		 '$lastedit_type','$user_id',	   '$to_value','$visibility','$start_visible','$end_visible', '$session_id')";
 		$res = Database::query($sql);
 		if (!$res) {
 			return false;

From 73dba3b815d3c785668c7140276f273192f1b326 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 15:25:53 +0200
Subject: [PATCH 50/63] More cleaning code

---
 main/announcements/announcements.inc.php | 630 +++++++++++------------
 main/announcements/announcements.php     |  24 +-
 2 files changed, 303 insertions(+), 351 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 27591735a7..71d9b77f00 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -6,6 +6,268 @@
 */
 
 $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+
+/**
+ * Store an announcement in the database (including its attached file if any)
+ * @param string    Announcement title (pure text)
+ * @param string    Content of the announcement (can be HTML)
+ * @param int       Display order in the list of announcements
+ * @param array     Array of users and groups to send the announcement to
+ * @param array	    uploaded file $_FILES
+ * @param string    Comment describing the attachment
+ * @return int      false on failure, ID of the announcement on success
+ */
+function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = array(), $file_comment='') {
+	global $_course;	
+
+	$tbl_announcement  = Database::get_course_table(TABLE_ANNOUNCEMENT);
+	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
+
+	// filter data
+	$emailTitle = Database::escape_string($emailTitle);
+	$newContent = Database::escape_string($newContent);
+	$order = intval($order);
+
+	// store in the table announcement
+	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
+	$result = Database::query($sql);
+	if ($result === false) {
+		return false;
+	} else {
+		//Store the attach file
+		$last_id = Database::insert_id();
+		if (!empty($file)) {
+			$save_attachment = add_announcement_attachment_file($last_id, $file_comment, $_FILES['user_upload']);
+		}
+	
+		// store in item_property (first the groups, then the users
+		if (!is_null($to)) {
+			 // !is_null($to): when no user is selected we send it to everyone			 
+			$send_to=separate_users_groups($to);
+			// storing the selected groups
+			if (is_array($send_to['groups'])) {
+				foreach ($send_to['groups'] as $group) {
+					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
+				}
+			}
+	
+			// storing the selected users
+			if (is_array($send_to['users'])) {
+				foreach ($send_to['users'] as $user) {
+					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
+				}
+			}
+		} else {
+			// the message is sent to everyone, so we set the group to 0
+			api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '0');
+		}
+		return $last_id;
+	}
+}
+
+/*
+	   STORE ANNOUNCEMENT  GROUP ITEM
+*/
+function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_users, $file = array(), $file_comment='') {
+	global $_course;	
+
+	// database definitions
+	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
+
+	$newContent=stripslashes($newContent);
+	$emailTitle = Database::escape_string($emailTitle);
+	$newContent = Database::escape_string($newContent);
+	$order = intval($order);
+
+	// store in the table announcement
+	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
+	$result = Database::query($sql);
+	if ($result === false) {
+		return false;
+	}
+
+	//store the attach file
+	$last_id = Database::insert_id();
+	if (empty($file)) {
+		$save_attachment = add_announcement_attachment_file($last_id, $file_comment, $file);
+	}
+
+
+	// store in item_property (first the groups, then the users
+	if (!isset($to_users)) // !isset($to): when no user is selected we send it to everyone
+	{
+		$send_to=separate_users_groups($to);
+		// storing the selected groups
+		if (is_array($send_to['groups']))
+		{
+			foreach ($send_to['groups'] as $group)
+			{
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
+			}
+		}
+	}
+	else // the message is sent to everyone, so we set the group to 0
+	{
+		// storing the selected users
+		if (is_array($to_users))
+		{
+			foreach ($to_users as $user)
+			{
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
+			}
+		}
+	}
+	return $last_id;
+}
+
+
+/*
+	           EDIT ANNOUNCEMENT 
+*/
+/**
+* This function stores the announcement item in the announcement table 
+* and updates the item_property table
+* 
+* @param int 	id of the announcement
+* @param string email 
+* @param string content
+* @param array 	users that will receive the announcement
+* @param mixed 	attachment 
+* @param string file comment
+* 
+*/
+function edit_advalvas_item($id, $emailTitle,$newContent,$to,$file = array(), $file_comment='') {	
+	global $_course;	
+	$tbl_item_property  = Database::get_course_table(TABLE_ITEM_PROPERTY);	
+	$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
+
+	$emailTitle = Database::escape_string($emailTitle);
+	$newContent = Database::escape_string($newContent);
+	$id = intval($id);
+	
+	// store the modifications in the table announcement
+ 	$sql = "UPDATE $tbl_announcement SET content='$newContent', title = '$emailTitle' WHERE id='$id'";
+	$result = Database::query($sql);
+
+	// save attachment file
+	$row_attach = get_attachment($id);
+	$id_attach = intval($row_attach['id']);
+
+	if (!empty($file)) {
+		if (empty($id_attach)) {
+			add_announcement_attachment_file($id,$file_comment,$file);
+		} else {
+			edit_announcement_attachment_file($id_attach,$file,$file_comment);
+		}
+	}
+
+	// we remove everything from item_property for this
+	$sql_delete="DELETE FROM $tbl_item_property WHERE ref='$id' AND tool='announcement'";
+	$result = Database::query($sql_delete);
+
+	// store in item_property (first the groups, then the users
+	if (!is_null($to)) {
+		// !is_null($to): when no user is selected we send it to everyone
+		
+		$send_to=separate_users_groups($to);
+		// storing the selected groups
+		if (is_array($send_to['groups'])) {
+			foreach ($send_to['groups'] as $group) {
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), $group);
+			}
+		}
+		// storing the selected users
+		if (is_array($send_to['users'])) {
+			foreach ($send_to['users'] as $user) {
+					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), 0, $user);
+			}
+		}
+	} else {
+		// the message is sent to everyone, so we set the group to 0
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), '0');
+	}
+}
+
+
+/*
+		MAIL FUNCTIONS
+*/
+
+/**
+* Sends an announcement by email to a list of users.
+* Emails are sent one by one to try to avoid antispam.
+*/
+function send_announcement_email($user_list, $course_code, $_course, $mail_title, $mail_content) {
+	global $_user;
+	foreach ($user_list as $this_user) {
+		
+		$mail_subject = get_lang('professorMessage').' - '.$_course['official_code'].' - '.$mail_title;
+		$mail_body = '['.$_course['official_code'].'] - ['.$_course['name']."]\n";
+		$mail_body .= api_get_person_name($this_user['firstname'], $this_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$this_user["email"]."> \n\n".stripslashes($mail_title)."\n\n".trim(stripslashes(api_html_entity_decode(strip_tags(str_replace(array('<p>','</p>','<br />'),array('',"\n","\n"),$mail_content)), ENT_QUOTES, api_get_system_encoding())))." \n\n-- \n";
+		$mail_body .= api_get_person_name($_user['firstname'], $_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS).' ';
+		$mail_body .= '<'.$_user['mail'].">\n";
+		$mail_body .= $_course['official_code'].' '.$_course['name'];
+
+		@api_mail(api_get_person_name($this_user['firstname'], $this_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $this_user['email'], $mail_subject, $mail_body, api_get_person_name($_SESSION['_user']['firstname'], $_SESSION['_user']['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $_SESSION['_user']['mail']);
+	}
+}
+
+function update_mail_sent($insert_id) {
+	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+	if ($insert_id != strval(intval($insert_id))) { return false; }
+	$insert_id = Database::escape_string($insert_id);
+	// store the modifications in the table tbl_annoucement
+	$sql = "UPDATE $tbl_announcement SET email_sent='1' WHERE id='$insert_id'";
+	Database::query($sql);
+}
+
+/**
+ * Gets all announcements from a user by course
+ * @param	string course db
+ * @param	int user id
+ * @return	array html with the content and count of announcements or false otherwise
+ */
+function get_all_annoucement_by_user_course($course_db, $user_id) {
+	if (empty($course_db) || empty($user_id)) {
+		return false;
+	}
+	$tbl_announcement		= Database::get_course_table(TABLE_ANNOUNCEMENT, $course_db);
+	$tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY, $course_db);
+	if (!empty($user_id) && is_numeric($user_id)) {
+		$user_id = intval($user_id);
+		$sql="SELECT DISTINCT announcement.title, announcement.content
+						FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
+						WHERE announcement.id = toolitemproperties.ref
+						AND toolitemproperties.tool='announcement'
+						AND (toolitemproperties.insert_user_id='$user_id' AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id is null))
+						AND toolitemproperties.visibility='1'
+						AND announcement.session_id  = 0
+						ORDER BY display_order DESC";
+		$rs = Database::query($sql);
+		$num_rows = Database::num_rows($rs);
+		$content = '';
+		$i=0;
+		$result = array();
+		if ($num_rows>0) {
+			while ($myrow = Database::fetch_array($rs)) {
+				//if ($i<=4) {
+					$content.= '<strong>'.$myrow['title'].'</strong><br /><br />';
+					$content.= $myrow['content'];
+				/*} else {
+					break;
+				}*/
+				$i++;
+			}
+			$result['content'] = $content;
+			$result['count'] = $i;
+			return $result;
+		}
+		return false;
+	}
+	return false;
+}
+
 /*
 		DISPLAY FUNCTIONS
 */
@@ -231,14 +493,10 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
-function show_to_form_group($group_id)
-{
-
+function show_to_form_group($group_id) {
 	echo "<table id=\"recipient_list\" style=\"display: none;\">";
 	echo "<tr>";
-
 	echo "<td>";
-
 	echo "<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>";
 	$group_users = GroupManager::get_subscribed_users($group_id);
 	foreach ($group_users as $user){
@@ -324,19 +582,17 @@ function get_course_groups()
 * This tools loads all the users and all the groups who have received
 * a specific item (in this case an announcement item)
 */
-function load_edit_users($tool, $id) {	
-	global $tbl_item_property;
+function load_edit_users($tool, $id) {
+	$tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
 	$tool = Database::escape_string($tool);
 	$id = Database::escape_string($id);
 
 	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
 	$result = Database::query($sql);
-	while ($row = Database::fetch_array($result))
-	{
+	while ($row = Database::fetch_array($result)) {
 		$to_group=$row['to_group_id'];
-		switch ($to_group)
-		{
+		switch ($to_group) {
 			// it was send to one specific user
 			case null:
 				$to[]="USER:".$row['to_user_id'];
@@ -362,8 +618,7 @@ function load_edit_users($tool, $id) {
 * returns the javascript for setting a filter
 * this goes into the $htmlHeadXtra[] array
 */
-function user_group_filter_javascript()
-{
+function user_group_filter_javascript() {
 	return "<script language=\"JavaScript\" type=\"text/JavaScript\">
 	<!--
 	function jumpMenu(targ,selObj,restore)
@@ -385,8 +640,7 @@ function user_group_filter_javascript()
 * setting the target people/groups
 * this goes into the $htmlHeadXtra[] array
 */
-function to_javascript()
-{
+function to_javascript() {
 	return "<script type=\"text/javascript\" language=\"JavaScript\">
 
 	<!-- Begin javascript menu swapper
@@ -548,76 +802,57 @@ function plus_attachment() {
 *			containing all the id's of the groups (resp. users) who have received this message.
 * @author Patrick Cool <patrick.cool@>
 */
-function sent_to_form($sent_to_array)
-{
+function sent_to_form($sent_to_array) {
 	// we find all the names of the groups
 	$group_names=get_course_groups();
-
 	count($sent_to_array);
 
 	// we count the number of users and the number of groups
-	if (isset($sent_to_array['users']))
-	{
+	if (isset($sent_to_array['users'])) {
 		$number_users=count($sent_to_array['users']);
-	}
-	else
-	{
+	} else {
 		$number_users=0;
 	}
-	if (isset($sent_to_array['groups']))
-	{
+	if (isset($sent_to_array['groups'])) {
 		$number_groups=count($sent_to_array['groups']);
-	}
-	else
-	{
+	} else {
 			$number_groups=0;
 	}
 	$total_numbers=$number_users+$number_groups;
 
 	// starting the form if there is more than one user/group
-	if ($total_numbers >1)
-	{
+	if ($total_numbers >1) {
 		$output="<select name=\"sent to\">";
 		$output.="<option>".get_lang("SentTo")."</option>";
 		// outputting the name of the groups
-		if (is_array($sent_to_array['groups']))
-		{
-			foreach ($sent_to_array['groups'] as $group_id)
-			{
+		if (is_array($sent_to_array['groups'])) {
+			foreach ($sent_to_array['groups'] as $group_id) {
 				$output.="<option value=\"\">G: ".$group_names[$group_id]['name']."</option>";
 			}
 		}
 
-		if (isset($sent_to_array['users']))
-		{
-			if (is_array($sent_to_array['users']))
-			{
-				foreach ($sent_to_array['users'] as $user_id)
-				{
+		if (isset($sent_to_array['users'])) {
+			if (is_array($sent_to_array['users'])) {
+				foreach ($sent_to_array['users'] as $user_id) {
 					$user_info = api_get_user_info($user_id);
 					$output.="<option value=\"\">".api_get_person_name($user_info['firstname'], $user_info['lastname'])."</option>";
 				}
 			}
 		}
-
 		// ending the form
 		$output.="</select>";
-	}
-	else // there is only one user/group
-	{
-		if (isset($sent_to_array['users']) and is_array($sent_to_array['users']))
-		{
+	} else {
+		// there is only one user/group
+		if (isset($sent_to_array['users']) and is_array($sent_to_array['users'])) {
 			$user_info = api_get_user_info($sent_to_array['users'][0]);
 			echo api_get_person_name($user_info['firstname'], $user_info['lastname']);
 		}
-		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]!==0)
-		{
+		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]!==0) {
 			$group_id=$sent_to_array['groups'][0];
 			echo $group_names[$group_id]['name'];
 		}
-		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]==0)
-		{
-			echo get_lang("Everybody");
+		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]==0) {
+			echo get_lang('Everybody');
 		}
 	}
 	if(!empty($output))
@@ -637,8 +872,7 @@ function sent_to_form($sent_to_array)
 * @param    array   Array of strings that define the type and id of each destination
 * @return   array   Array of groups and users (each an array of IDs)
 */
-function separate_users_groups($to)
-{
+function separate_users_groups($to) {
 	foreach($to as $to_item) {
 		list($type, $id) = explode(':', $to_item);
 		switch($type) {
@@ -659,7 +893,7 @@ function separate_users_groups($to)
 
 
 /*
-	 			SENT_TO()
+	 SENT_TO()
 */
 /**
 * Returns all the users and all the groups a specific announcement item
@@ -668,8 +902,7 @@ function separate_users_groups($to)
 * @param    int     ID of the element of the corresponding type
 * @return   array   Array of users and groups to whom the element has been sent
 */
-function sent_to($tool, $id)
-{
+function sent_to($tool, $id) {
 	global $_course;
 	global $tbl_item_property;
 
@@ -719,11 +952,9 @@ function sent_to($tool, $id)
 * @param    int     ID of the element of the corresponding type
 * @return   bool    False on failure, True on success
 */
-function change_visibility_announcement($tool,$id)
-{
-	global $_course;
-	global $tbl_item_property;
-
+function change_visibility_announcement($tool,$id) {
+	global $_course;	
+	$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 	$tool = Database::escape_string($tool);
 	$id = Database::escape_string($id);
 
@@ -744,277 +975,6 @@ function change_visibility_announcement($tool,$id)
     return true;
 }
 
-/**
- * Store an announcement in the database (including its attached file if any)
- * @param string    Announcement title (pure text)
- * @param string    Content of the announcement (can be HTML)
- * @param int       Display order in the list of announcements
- * @param array     Array of users and groups to send the announcement to
- * @param array	    uploaded file $_FILES
- * @param string    Comment describing the attachment
- * @return int      false on failure, ID of the announcement on success
- */
-function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = array(), $file_comment='') {
-
-	global $_course;
-	global $nameTools;	
-
-	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
-
-	// filter data
-	$emailTitle = Database::escape_string($emailTitle);
-	$newContent = Database::escape_string($newContent);
-	$order = intval($order);
-
-	// store in the table announcement
-	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
-	$result = Database::query($sql);
-	if ($result === false) {
-		return false;
-	}
-
-	//store the attach file
-	$last_id = Database::insert_id();
-	if (!empty($file)) {
-		$save_attachment = add_announcement_attachment_file($last_id, $file_comment, $_FILES['user_upload']);
-	}
-
-	// store in item_property (first the groups, then the users
-	if (!is_null($to)) // !is_null($to): when no user is selected we send it to everyone
-	{
-		$send_to=separate_users_groups($to);
-		// storing the selected groups
-		if (is_array($send_to['groups']))
-		{
-			foreach ($send_to['groups'] as $group)
-			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
-			}
-		}
-
-		// storing the selected users
-		if (is_array($send_to['users']))
-		{
-			foreach ($send_to['users'] as $user)
-			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
-			}
-		}
-	}
-	else // the message is sent to everyone, so we set the group to 0
-	{
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '0');
-	}
-	return $last_id;
-}
-
-
-function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_users, $file = array(), $file_comment='') {
-	global $_course;
-	global $nameTools;
-
-	// database definitions
-	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
-
-	$newContent=stripslashes($newContent);
-	$emailTitle = Database::escape_string($emailTitle);
-	$newContent = Database::escape_string($newContent);
-	$order = intval($order);
-
-	// store in the table announcement
-	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".api_get_session_id();
-	$result = Database::query($sql);
-	if ($result === false) {
-		return false;
-	}
-
-	//store the attach file
-	$last_id = Database::insert_id();
-	if (empty($file)) {
-		$save_attachment = add_announcement_attachment_file($last_id, $file_comment, $file);
-	}
-
-
-	// store in item_property (first the groups, then the users
-	if (!isset($to_users)) // !isset($to): when no user is selected we send it to everyone
-	{
-		$send_to=separate_users_groups($to);
-		// storing the selected groups
-		if (is_array($send_to['groups']))
-		{
-			foreach ($send_to['groups'] as $group)
-			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), $group);
-			}
-		}
-	}
-	else // the message is sent to everyone, so we set the group to 0
-	{
-		// storing the selected users
-		if (is_array($to_users))
-		{
-			foreach ($to_users as $user)
-			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $last_id, "AnnouncementAdded", api_get_user_id(), '', $user);
-			}
-		}
-	}
-
-	return $last_id;
-
-}
-
-
-/*==================================================
-	           EDIT_VALVAS_ITEM
-==================================================*/
-/**
-* This function stores the announcement Item in the table announcement
-* and updates the item_property also
-*/
-function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $file_comment='') {
-
-	global $_course;
-	global $nameTools;
-	
-	global $tbl_announcement;
-	global $tbl_item_property;
-
-	$newContent=stripslashes($newContent);
-	$emailTitle = Database::escape_string(Security::remove_XSS($emailTitle));
-	$newContent = Database::escape_string(Security::remove_XSS($newContent,COURSEMANAGERLOWSECURITY));
-	$order = intval($order);
-
-	// store the modifications in the table announcement
- 	$sql = "UPDATE $tbl_announcement SET content='$newContent', title = '$emailTitle' WHERE id='$id'";
-	$result = Database::query($sql);
-
-	// save attachment file
-	$row_attach = get_attachment($id);
-	$id_attach = intval($row_attach['id']);
-
-	if (!empty($file)) {
-		if (empty($id_attach)) {
-		add_announcement_attachment_file($id,$file_comment,$file);
-		} else {
-			edit_announcement_attachment_file($id_attach,$file,$file_comment);
-		}
-	}
-
-	// we remove everything from item_property for this
-	$sql_delete="DELETE FROM $tbl_item_property WHERE ref='$id' AND tool='announcement'";
-	$result = Database::query($sql_delete);
-
-	// store in item_property (first the groups, then the users
-	if (!is_null($to)) // !is_null($to): when no user is selected we send it to everyone
-	{
-		$send_to=separate_users_groups($to);
-		// storing the selected groups
-		if (is_array($send_to['groups']))
-		{
-			foreach ($send_to['groups'] as $group)
-			{
-				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), $group);
-			}
-		}
-		// storing the selected users
-		if (is_array($send_to['users']))
-		{
-			foreach ($send_to['users'] as $user)
-			{
-					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), 0, $user);
-			}
-		}
-	}
-	else // the message is sent to everyone, so we set the group to 0
-	{
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), '0');
-	}
-}
-
-
-/*
-		MAIL FUNCTIONS
-*/
-
-/**
-* Sends an announcement by email to a list of users.
-* Emails are sent one by one to try to avoid antispam.
-*/
-function send_announcement_email($user_list, $course_code, $_course, $mail_title, $mail_content)
-{
-	global $_user;
-
-	foreach ($user_list as $this_user) {
-
-		$mail_subject = get_lang('professorMessage').' - '.$_course['official_code'].' - '.$mail_title;
-
-		$mail_body = '['.$_course['official_code'].'] - ['.$_course['name']."]\n";
-		$mail_body .= api_get_person_name($this_user['firstname'], $this_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$this_user["email"]."> \n\n".stripslashes($mail_title)."\n\n".trim(stripslashes(api_html_entity_decode(strip_tags(str_replace(array('<p>','</p>','<br />'),array('',"\n","\n"),$mail_content)), ENT_QUOTES, api_get_system_encoding())))." \n\n-- \n";
-		$mail_body .= api_get_person_name($_user['firstname'], $_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS).' ';
-		$mail_body .= '<'.$_user['mail'].">\n";
-		$mail_body .= $_course['official_code'].' '.$_course['name'];
-
-		@api_mail(api_get_person_name($this_user['firstname'], $this_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $this_user['email'], $mail_subject, $mail_body, api_get_person_name($_SESSION['_user']['firstname'], $_SESSION['_user']['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $_SESSION['_user']['mail']);
-	}
-}
-
-function update_mail_sent($insert_id) {
-	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-	if ($insert_id != strval(intval($insert_id))) { return false; }
-	$insert_id = Database::escape_string($insert_id);
-	// store the modifications in the table tbl_annoucement
-	$sql = "UPDATE $tbl_announcement SET email_sent='1' WHERE id='$insert_id'";
-	Database::query($sql);
-}
-
-/**
- * Gets all announcements from a user by course
- * @param	string course db
- * @param	int user id
- * @return	array html with the content and count of announcements or false otherwise
- */
-function get_all_annoucement_by_user_course($course_db, $user_id) {
-	if (empty($course_db) || empty($user_id)) {
-		return false;
-	}
-	$tbl_announcement		= Database::get_course_table(TABLE_ANNOUNCEMENT, $course_db);
-	$tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY, $course_db);
-	if (!empty($user_id) && is_numeric($user_id)) {
-		$user_id = intval($user_id);
-		$sql="SELECT DISTINCT announcement.title, announcement.content
-						FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
-						WHERE announcement.id = toolitemproperties.ref
-						AND toolitemproperties.tool='announcement'
-						AND (toolitemproperties.insert_user_id='$user_id' AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id is null))
-						AND toolitemproperties.visibility='1'
-						AND announcement.session_id  = 0
-						ORDER BY display_order DESC";
-		$rs = Database::query($sql);
-		$num_rows = Database::num_rows($rs);
-		$content = '';
-		$i=0;
-		$result = array();
-		if ($num_rows>0) {
-			while ($myrow = Database::fetch_array($rs)) {
-				//if ($i<=4) {
-					$content.= '<strong>'.$myrow['title'].'</strong><br /><br />';
-					$content.= $myrow['content'];
-				/*} else {
-					break;
-				}*/
-				$i++;
-			}
-			$result['content'] = $content;
-			$result['count'] = $i;
-			return $result;
-		}
-		return false;
-	}
-	return false;
-}
 
 /*
 		ATTACHMENT FUNCTIONS
@@ -1029,14 +989,13 @@ function get_all_annoucement_by_user_course($course_db, $user_id) {
  */
 
 function get_attachment($announcement_id) {
-
 	$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 	$announcement_id=Database::escape_string($announcement_id);
 	$row=array();
 	$sql = 'SELECT id,path, filename,comment FROM '. $tbl_announcement_attachment.' WHERE announcement_id = '.(int)$announcement_id.'';
 	$result=Database::query($sql);
 	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result,ASSOC);
+		$row = Database::fetch_array($result,'ASSOC');
 	}
 	return $row;
 }
@@ -1050,8 +1009,7 @@ function get_attachment($announcement_id) {
  */
 
 function add_announcement_attachment_file($announcement_id, $file_comment, $file) {
-
-	global $_course;
+	global $_course;	
 	$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 	$return = 0;
 	$announcement_id = intval($announcement_id);
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 0285b4132b..187b60ce2f 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -16,7 +16,7 @@
 		INIT SECTION
 */
 // name of the language file that needs to be included
-$language_file[] = array('announcements', 'group', 'survey');
+$language_file = array('announcements', 'group', 'survey');
 
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
@@ -224,21 +224,20 @@ if (!empty($_SESSION['formelements']) and !empty($_GET['originalresource']) and
 
 	$email_ann				= $form_elements['emailoption'];
 }
-if(!empty($_GET['remind_inactive']))
-{
+if(!empty($_GET['remind_inactive'])) {
 	$to[] = 'USER:'.intval($_GET['remind_inactive']);
 }
 /*
 	Survey
 */
 $surveyid = 0;
-if(!empty($_REQUEST['publish_survey']))
-{
-	$surveyid=Database::escape_string(Security::remove_XSS($_REQUEST['publish_survey']));
+if(!empty($_REQUEST['publish_survey'])) {
+	$surveyid=intval($_REQUEST['publish_survey']);
 }
+
+//@todo fix those request values 
 $cidReq=Database::escape_string($_REQUEST['cidReq']);
-if($surveyid)
-{
+if($surveyid) {
 	$db_name=Database::escape_string($_REQUEST['db_name']);
 	$sql_temp = "SELECT * FROM $db_name.survey WHERE survey_id='$surveyid'";
 	$res_temp = Database::query($sql_temp);
@@ -1140,8 +1139,6 @@ if ($display_form == true) {
 
 } // displayform
 
-
-
 /*
 		DISPLAY ANNOUNCEMENT LIST
 */
@@ -1478,11 +1475,8 @@ if ($display_announcement_list && !$surveyid) {
 echo "</table>";
 if (!empty($display_specific_announcement)) display_announcement($announcement_id);
 
-
-/*
-		FOOTER
-*/
+/*		FOOTER		*/
 if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
 	//we are not in learnpath tool
 	Display::display_footer();
-}
+}
\ No newline at end of file

From 43943de3800b83946344a5cb7e0ed73a8e2a57e7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 15:44:01 +0200
Subject: [PATCH 51/63] Fixing itemproperty when adding an announcement to
 \"everyone\" see #303

---
 main/announcements/announcements.inc.php | 67 ++++++++++--------------
 1 file changed, 28 insertions(+), 39 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 71d9b77f00..b8d4122062 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -41,9 +41,10 @@ function store_advalvas_item($emailTitle, $newContent, $order, $to, $file = arra
 		}
 	
 		// store in item_property (first the groups, then the users
+		
 		if (!is_null($to)) {
 			 // !is_null($to): when no user is selected we send it to everyone			 
-			$send_to=separate_users_groups($to);
+			$send_to = separate_users_groups($to);
 			// storing the selected groups
 			if (is_array($send_to['groups'])) {
 				foreach ($send_to['groups'] as $group) {
@@ -72,10 +73,9 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 	global $_course;	
 
 	// database definitions
-	$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+	$tbl_announcement  = Database::get_course_table(TABLE_ANNOUNCEMENT);
 	$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
-
-	$newContent=stripslashes($newContent);
+	
 	$emailTitle = Database::escape_string($emailTitle);
 	$newContent = Database::escape_string($newContent);
 	$order = intval($order);
@@ -93,7 +93,6 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 		$save_attachment = add_announcement_attachment_file($last_id, $file_comment, $file);
 	}
 
-
 	// store in item_property (first the groups, then the users
 	if (!isset($to_users)) // !isset($to): when no user is selected we send it to everyone
 	{
@@ -123,7 +122,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 
 
 /*
-	           EDIT ANNOUNCEMENT 
+	EDIT ANNOUNCEMENT 
 */
 /**
 * This function stores the announcement item in the announcement table 
@@ -137,7 +136,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 * @param string file comment
 * 
 */
-function edit_advalvas_item($id, $emailTitle,$newContent,$to,$file = array(), $file_comment='') {	
+function edit_advalvas_item($id, $emailTitle, $newContent, $to, $file = array(), $file_comment='') {	
 	global $_course;	
 	$tbl_item_property  = Database::get_course_table(TABLE_ITEM_PROPERTY);	
 	$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
@@ -167,10 +166,12 @@ function edit_advalvas_item($id, $emailTitle,$newContent,$to,$file = array(), $f
 	$result = Database::query($sql_delete);
 
 	// store in item_property (first the groups, then the users
+
 	if (!is_null($to)) {
 		// !is_null($to): when no user is selected we send it to everyone
 		
-		$send_to=separate_users_groups($to);
+		$send_to = separate_users_groups($to);
+
 		// storing the selected groups
 		if (is_array($send_to['groups'])) {
 			foreach ($send_to['groups'] as $group) {
@@ -180,7 +181,7 @@ function edit_advalvas_item($id, $emailTitle,$newContent,$to,$file = array(), $f
 		// storing the selected users
 		if (is_array($send_to['users'])) {
 			foreach ($send_to['users'] as $user) {
-					api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), 0, $user);
+				api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id(), 0, $user);
 			}
 		}
 	} else {
@@ -325,39 +326,31 @@ function display_announcement($announcement_id) {
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
-function show_to_form($to_already_selected) {
-	$user_list=get_course_users();
-	$group_list=get_course_groups();
+function show_to_form($to_already_selected) {	
+	
+	$user_list	= get_course_users();
+	$group_list = get_course_groups();
 
-	if ($to_already_selected == "")
-          $to_already_selected = array();
+	if ($to_already_selected == '' || $to_already_selected == 'everyone')  {
+		$to_already_selected = array();
+	}
 
 	echo "<table id=\"recipient_list\" style=\"display: none;\">";
-	echo "\t<tr>";
+	echo '<tr>';
 
 	// the form containing all the groups and all the users of the course
-	echo "<td>";
+	echo '<td>';
 	echo "<strong>".get_lang('Users')."</strong><br />";
 	construct_not_selected_select_form($group_list,$user_list,$to_already_selected);
 	echo "</td>";
 
 	// the buttons for adding or removing groups/users
 	echo "<td valign=\"middle\">";
-	/*echo "<input	type=\"button\"	",
-				"onClick=\"javascript: move(this.form.elements[0],this.form.elements[3])\" ",// 7 & 4 : fonts
-				"value=\"   >>   \">",
-
-				"<p>&nbsp;</p>",
-
-				"<input	type=\"button\"",
-				"onClick=\"javascript: move(this.form.elements[3],this.form.elements[0])\" ",
-				"value=\"   <<   \">";*/
-
-?>
-<button class="arrowr" type="button" onClick="javascript: move(this.form.elements[0], this.form.elements[3])" onClick="javascript: move(this.form.elements[0], this.form.elements[3])"></button>
-<br /> <br />
-<button class="arrowl" type="button" onClick="javascript: move(this.form.elements[3], this.form.elements[0])" onClick="javascript: move(this.form.elements[3], this.form.elements[0])"></button>
-<?php
+	?>
+	<button class="arrowr" type="button" onClick="javascript: move(this.form.elements[0], this.form.elements[3])" onClick="javascript: move(this.form.elements[0], this.form.elements[3])"></button>
+	<br /> <br />
+	<button class="arrowl" type="button" onClick="javascript: move(this.form.elements[3], this.form.elements[0])" onClick="javascript: move(this.form.elements[3], this.form.elements[0])"></button>
+	<?php
 	echo "</td>";
 	echo "<td>";
 
@@ -376,15 +369,12 @@ function show_to_form($to_already_selected) {
 /**
 * this function shows the form for sending a message to a specific group or user.
 */
-function construct_not_selected_select_form($group_list=null, $user_list=null,$to_already_selected)
-{
+function construct_not_selected_select_form($group_list=null, $user_list=null,$to_already_selected) {
 
 	echo "<select name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>";
 	// adding the groups to the select form
-	if ($group_list)
-	{
-		foreach($group_list as $this_group)
-		{
+	if ($group_list){
+		foreach($group_list as $this_group) {
 			if (is_array($to_already_selected))
 			{
 				if (!in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
@@ -427,8 +417,7 @@ function construct_selected_select_form($group_list=null, $user_list=null,$to_al
 	// we separate the $to_already_selected array (containing groups AND users into
 	// two separate arrays
 	$groupuser = array();
-	if (is_array($to_already_selected))
-	{
+	if (is_array($to_already_selected)) {
 		$groupuser=separate_users_groups($to_already_selected);
 	}
 	$groups_to_already_selected=$groupuser['groups'];

From 610251d18645864063195cb76cef0749736da36a Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 15:44:29 +0200
Subject: [PATCH 52/63] Cosmetic changes

---
 main/announcements/announcements.php | 141 ++++++++++++---------------
 1 file changed, 60 insertions(+), 81 deletions(-)

diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 187b60ce2f..dcacce57c7 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -3,7 +3,7 @@
 /**
  * @author Frederik Vermeire <frederik.vermeire@pandora.be>, UGent Internship
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: code cleaning
- * @author Julio MMontoya <gugli100@gmail.com>, MORE code cleaning
+ * @author Julio Montoya <gugli100@gmail.com>, MORE code cleaning
  * @abstract The task of the internship was to integrate the 'send messages to specific users' with the
  *			 Announcements tool and also add the resource linker here. The database also needed refactoring
  *			 as there was no title field (the title was merged into the content field)
@@ -67,11 +67,10 @@ $tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 $_SESSION['source_type']="Ad_Valvas";
 include '../resourcelinker/resourcelinker.inc.php';
 
-if (!empty($_POST['addresources'])) // When the "Add Resource" button is clicked we store all the form data into a session
-{
-	include('announcements.inc.php');
-
-    $form_elements= array ('emailTitle'=>stripslashes($emailTitle), 'newContent'=>stripslashes($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
+if (!empty($_POST['addresources'])) {
+	// When the "Add Resource" button is clicked we store all the form data into a session
+	require_once 'announcements.inc.php';
+    $form_elements= array ('emailTitle'=>Security::remove_XSS($emailTitle), 'newContent'=>Security::remove_XSS($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
     $_SESSION['formelements']=$form_elements;
 
     if($id) // this is to correctly handle edits
@@ -314,9 +313,9 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		}
 	}
 
-/*
-	Delete announcement
-*/
+	/*
+		Delete announcement
+	*/
 	if (!empty($_GET['action']) AND $_GET['action']=='delete' AND isset($_GET['id'])) {
 		//Database::query("DELETE FROM  $tbl_announcement WHERE id='$delete'");
 		$id=intval(addslashes($_GET['id']));
@@ -341,17 +340,15 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		}
 	}
 
-/*
-	Delete all announcements
-*/
+	/*
+		Delete all announcements
+	*/
 	if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
 
 		//Database::query("DELETE FROM $tbl_announcement");
 		if (api_is_allowed_to_edit()) {
 			Database::query("UPDATE $tbl_item_property SET visibility='2' WHERE tool='".TOOL_ANNOUNCEMENT."'");
-
 			delete_all_resources_type("Ad_Valvas");
-
 			$id = null;
 			$emailTitle = null;
 			$newContent = null;
@@ -360,9 +357,9 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		}
 	}
 
-/*
-	Modify announcement
-*/
+	/*
+		Modify announcement
+	*/
 	if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
 		if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 			api_not_allowed();
@@ -402,9 +399,10 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 
 	}
 
-/*
-	Move announcement up/down
-*/
+	/*
+		Move announcement up/down
+	*/
+	
 	if ($ctok == $_GET['sec_token']) {
 		if (!empty($_GET['down'])) {
 			$thisAnnouncementId = intval($_GET['down']);
@@ -458,9 +456,9 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		$message = get_lang('AnnouncementMoved');
 	}
 
-/*
-	Submit announcement
-*/
+	/*
+		Submit announcement
+	*/
 	//if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
 
 	$emailTitle=(!empty($_POST['emailTitle'])?$safe_emailTitle:'');
@@ -483,7 +481,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 			if ($ctok == $_POST['sec_token']) {
 				$file_comment = $_POST['file_comment'];
 				$file = $_FILES['user_upload'];
-				$edit_id = edit_advalvas_item($id,$emailTitle,$newContent,$_POST['selectedform'],$file,$file_comment);
+				$edit_id = edit_advalvas_item($id,	$emailTitle, $newContent, $_POST['selectedform'], $file, $file_comment);
 				if (!$delete) {
 				    update_added_resources("Ad_Valvas", $id);
 				}
@@ -500,18 +498,17 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 					$file = $_FILES['user_upload'];
 					$file_comment = $_POST['file_comment'];
 					if (!empty($_SESSION['toolgroup'])) {
-						$insert_id=store_advalvas_group_item($safe_emailTitle,$safe_newContent,$order,array('GROUP:'.$_SESSION['toolgroup']),$_POST['selectedform'],$file,$file_comment);
+						$insert_id = store_advalvas_group_item($safe_emailTitle,$safe_newContent,$order,array('GROUP:'.$_SESSION['toolgroup']),$_POST['selectedform'],$file,$file_comment);
 					} else {
-						$insert_id=store_advalvas_item($safe_emailTitle,$safe_newContent,$order,$_POST['selectedform'],$file,$file_comment);
+						
+						$insert_id = store_advalvas_item($safe_emailTitle, $safe_newContent, $order, $_POST['selectedform'], $file, $file_comment);
 					}
 				    store_resources($_SESSION['source_type'],$insert_id);
 				    $_SESSION['select_groupusers']="hide";
 				    $message = get_lang('AnnouncementAdded');
 				}
 
-/*
-		MAIL WHEN USER COMES FROM SURVEY
-*/
+				/*		MAIL WHEN USER COMES FROM SURVEY	*/
 
 				if ($_POST['emailsAdd']) {
 
@@ -569,9 +566,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 					}
 				}
 
-/*
-		MAIL FUNCTION
-*/
+				/*		MAIL FUNCTION	*/
 
 				if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
 
@@ -581,16 +576,11 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 
 			        // groepen omzetten in users
 			        if ($grouplist) {
-
 						$grouplist = "'".implode("', '",$grouplist)."'";	//protect individual elements with surrounding quotes
 						$sql = "SELECT user_id
 								FROM $tbl_groupUser gu
 								WHERE gu.group_id IN (".$grouplist.")";
-
-
 						$groupMemberResult = Database::query($sql);
-
-
 						if ($groupMemberResult) {
 							while ($u = Database::fetch_array($groupMemberResult)) {
 								$userlist [] = $u ['user_id']; // complete the user id list ...
@@ -598,48 +588,39 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 						}
 					}
 
-
 				    if (is_array($userlist)) {
 				    	$userlist = "'".implode("', '", array_unique($userlist) )."'";
 
 				    	// send to the created 'userlist'
 					    $sqlmail = "SELECT user_id, lastname, firstname, email
-						       					 FROM $tbl_user
-						       					 WHERE user_id IN (".$userlist.")";
+									FROM $tbl_user
+						       		WHERE user_id IN (".$userlist.")";
 				    } else if (empty($_POST['not_selected_form'])) {
 			    		if(empty($_SESSION['id_session']) || api_get_setting('use_session_mode')=='false') {
 				    		// send to everybody
 				    		$sqlmail = "SELECT user.user_id, user.email, user.lastname, user.firstname
-					                     FROM $tbl_course_user, $tbl_user
-					                     WHERE course_code='".Database::escape_string($_course['sysCode'])."'
-					                     AND course_rel_user.user_id = user.user_id AND relation_type <>".COURSE_RELATION_TYPE_RRHH." ";
+					                    FROM $tbl_course_user, $tbl_user
+					                    WHERE course_code='".Database::escape_string($_course['sysCode'])."'
+					                    AND course_rel_user.user_id = user.user_id AND relation_type <>".COURSE_RELATION_TYPE_RRHH." ";
 			    		} else {
 			    			$sqlmail = "SELECT user.user_id, user.email, user.lastname, user.firstname
-					                     FROM $tbl_user
-										 INNER JOIN $tbl_session_course_user
-										 	ON $tbl_user.user_id = $tbl_session_course_user.id_user
-											AND $tbl_session_course_user.course_code = '".$_course['id']."'
-											AND $tbl_session_course_user.id_session = ".api_get_session();
+					                    FROM $tbl_user
+										INNER JOIN $tbl_session_course_user
+										ON $tbl_user.user_id = $tbl_session_course_user.id_user
+										AND $tbl_session_course_user.course_code = '".$_course['id']."'
+										AND $tbl_session_course_user.id_session = ".api_get_session();
 
 			    		}
 			    	}
 
 					if ($sqlmail != '') {
 						$rs_mail = Database::query($sqlmail);
-				    	/*=================================================================================
-							    				send email one by one to avoid antispam
-					    =================================================================================*/
+						
+				    	/*	Send email one by one to avoid antispam */
+				    	
 						$db_name = Database::get_course_table(TABLE_MAIN_SURVEY);
 						while ($myrow = Database::fetch_array($rs_mail)) {
-							/*    Header : Bericht van uw lesgever - GES ($_cid)
-
-								  Body :   John Doe (prenom + nom) <john_doe@hotmail.com> (email)
-
-								  		   Morgen geen les!! (emailTitle)
-
-								  		   Morgen is er geen les, de les wordt geschrapt wegens vergadering (newContent)
-						    */
-
+							
 							$emailSubject = "[" . $_course['official_code'] . "] " . $emailTitle;
 
 	                        if ($surveyid) {
@@ -652,39 +633,38 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	                			$message=stripslashes($newContentsix);
 							    $sender_name = api_get_person_name($_SESSION['_user']['lastName'], $_SESSION['_user']['firstName'], null, PERSON_NAME_EMAIL_ADDRESS);
 							    $email = $_SESSION['_user']['mail'];
-								$headers="From:$sender_name\r\nReply-to: $email";
-								//@mail($myrow["email"],stripslashes($emailTitle),$message,$headers);
+								$headers="From:$sender_name\r\nReply-to: $email";							
 								@api_mail('',$myrow["email"],stripslashes($emailTitle),$message,$sender_name,$email);
 	                        } else {
 	                            // intro of the email: receiver name and subject
-                                    $mail_body = api_get_person_name($myrow["lastname"], $myrow["firstname"], null, PERSON_NAME_EMAIL_ADDRESS)."<br />\n".stripslashes($emailTitle)."<br />";
+                                $mail_body = api_get_person_name($myrow["lastname"], $myrow["firstname"], null, PERSON_NAME_EMAIL_ADDRESS)."<br />\n".stripslashes($emailTitle)."<br />";
 
-	                            // main part of the email
+	                            // Main part of the email
 	                            $mail_body .= trim(stripslashes($newContent));
-                                    // signature of email: sender name and course URL after -- line
+                                // Signature of email: sender name and course URL after -- line
 	                            $mail_body .= "<br />-- <br />";
 	                            $mail_body .= api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS)." \n";
 	                            $mail_body .= "<br /> \n<a href=\"".api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq()."\">";
 	                            $mail_body .= $_course['official_code'].' '.$_course['name'] . "</a>";
 
-                                    $recipient_name	= api_get_person_name($myrow["firstname"], $myrow["lastname"], null, PERSON_NAME_EMAIL_ADDRESS);
-                                    $mailid = $myrow["email"];
+                                $recipient_name	= api_get_person_name($myrow["firstname"], $myrow["lastname"], null, PERSON_NAME_EMAIL_ADDRESS);
+                                $mailid = $myrow["email"];
 
-                                    $sender_name = api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
-                                    $sender_email = $_SESSION['_user']['mail'];
+                                $sender_name = api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
+                                $sender_email = $_SESSION['_user']['mail'];
 
-                                    // send attachment file
-                                    $data_file = array();
-                                    $sql = 'SELECT path, filename FROM '.$tbl_announcement_attachment.' WHERE announcement_id = "'.$insert_id.'"';
-                                    $rs_attach = Database::query($sql);
-                                    if (Database::num_rows($rs_attach) > 0) {
-                                            $row_attach  = Database::fetch_array($rs_attach);
-                                            $path_attach = api_get_path(SYS_COURSE_PATH).$_course['path'].'/upload/announcements/'.$row_attach['path'];
-                                            $filename_attach = $row_attach['filename'];
-                                            $data_file = array('path' => $path_attach,'filename' => $filename_attach);
-                                    }
+                                // send attachment file
+                                $data_file = array();
+                                $sql = 'SELECT path, filename FROM '.$tbl_announcement_attachment.' WHERE announcement_id = "'.$insert_id.'"';
+                                $rs_attach = Database::query($sql);
+                                if (Database::num_rows($rs_attach) > 0) {
+                                        $row_attach  = Database::fetch_array($rs_attach);
+                                        $path_attach = api_get_path(SYS_COURSE_PATH).$_course['path'].'/upload/announcements/'.$row_attach['path'];
+                                        $filename_attach = $row_attach['filename'];
+                                        $data_file = array('path' => $path_attach,'filename' => $filename_attach);
+                                }
 
-                                    @api_mail_html($recipient_name, $mailid, stripslashes($emailSubject), $mail_body, $sender_name, $sender_email, null, $data_file, true);
+                                @api_mail_html($recipient_name, $mailid, stripslashes($emailSubject), $mail_body, $sender_name, $sender_email, null, $data_file, true);
 	                        }
 
 							$sql_date="SELECT * FROM $db_name WHERE survey_id='$surveyid'";
@@ -717,7 +697,6 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 						update_mail_sent($insert_id);
 						$message = $added_and_sent;
 					}
-
 				} // $email_ann*/
 			} // end condition token
 		}	// isset

From 010725b5d77622e55f5551008f85fa698cdaf825 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 15:57:37 +0200
Subject: [PATCH 53/63] Adding the AnnouncementUpdated when modifying the
 visibility in the itempropety table

---
 main/announcements/announcements.inc.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index b8d4122062..3a07713626 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -930,9 +930,9 @@ function sent_to($tool, $id) {
 }
 
 
-/*===================================================
+/*
 	           CHANGE_VISIBILITY($tool,$id)
-  =================================================*/
+*/
 /**
 * This functions swithes the visibility a course resource
 * using the visibility field in 'item_property'
@@ -941,16 +941,18 @@ function sent_to($tool, $id) {
 * @param    int     ID of the element of the corresponding type
 * @return   bool    False on failure, True on success
 */
-function change_visibility_announcement($tool,$id) {
+function change_visibility_announcement($tool, $id) {
 	global $_course;	
 	$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
-	$tool = Database::escape_string($tool);
-	$id = Database::escape_string($id);
+	$tool	= Database::escape_string($tool);
+	$id 	= Database::escape_string($id);
 
-	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
+	$sql = "SELECT visibility FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
 
 	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
+	$row 	= Database::fetch_array($result, 'ASSOC');
+	//Adding the AnnouncementUpdated when modifying the visibility 
+	api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id());
 
 	if ($row['visibility']=='1') {
 		$sql_visibility="UPDATE $tbl_item_property SET visibility='0' WHERE tool='$tool' AND ref='$id'";

From 6b532e362fb46b202ea3900383751b5bed5500a4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 16:02:47 +0200
Subject: [PATCH 54/63] Adding headers

---
 main/resourcelinker/resourcelinker.inc.php | 34 +++-------------------
 main/resourcelinker/resourcelinker.php     | 34 ++--------------------
 2 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/main/resourcelinker/resourcelinker.inc.php b/main/resourcelinker/resourcelinker.inc.php
index c0480bed34..aebe182e1e 100755
--- a/main/resourcelinker/resourcelinker.inc.php
+++ b/main/resourcelinker/resourcelinker.inc.php
@@ -1,42 +1,18 @@
 <?php // $Id: resourcelinker.inc.php 20468 2009-05-11 08:48:25Z ivantcholakov $
-/*
-==============================================================================
-	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) Patrick Cool (patrick.cool@ugent.be)
-	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
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	@author Patrick Cool - original version
 *	@author Denes Nagy - further improvements for learning path builder
 *	@author Roan Embrechts - refactoring to improve code organisation
-*	@package dokeos.resourcelinker
+*	@package chamilo.resourcelinker
 *   @todo use the constants for the tools
 * 	@todo use Database API instead of creating table names locally.
-==============================================================================
+*   @this is still use?
+
 */
 
 /*
-==============================================================================
 		INIT SECTION
-==============================================================================
 */
 
 // name of the language file that needs to be included
@@ -48,9 +24,7 @@ include_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
 include(api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php');
 
 /*
-==============================================================================
 		FUNCTIONS
-==============================================================================
 */
 
 function unset_session_resources()
diff --git a/main/resourcelinker/resourcelinker.php b/main/resourcelinker/resourcelinker.php
index 91ffd28a2d..38149b295d 100755
--- a/main/resourcelinker/resourcelinker.php
+++ b/main/resourcelinker/resourcelinker.php
@@ -1,42 +1,16 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2005 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Patrick Cool (patrick.cool@ugent.be)
-	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
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * @author Patrick Cool, original code
 * @author Denes Nagy - many bugfixes and improvements, adjusted for learning path
 * @author Roan Embrechts - refactoring, code cleaning
 * @package dokeos.resourcelinker
 * @todo reorganise code,
 * use Database API instead of creating table names locally.
-==============================================================================
 */
 
 /*
-==============================================================================
 		INIT SECTION
-==============================================================================
 */
 // name of the language file that needs to be included
 //$language_file = 'resourcelinker';// TODO: Repeated deleting and moving the rest of this lang file to trad4all
@@ -1037,11 +1011,7 @@ if ($showresources)
 echo "</td></tr></table>";
 
 /*
-==============================================================================
 		FOOTER
-==============================================================================
 */
-
 Display :: display_footer();
-?>
-
+?>
\ No newline at end of file

From 503f3885b6730cdd3fe9ee7927cda6deb079cb84 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 16:32:55 +0200
Subject: [PATCH 55/63] Adding database::escape_string

---
 main/inc/lib/events.lib.inc.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php
index 49c4d72250..7fc440704b 100755
--- a/main/inc/lib/events.lib.inc.php
+++ b/main/inc/lib/events.lib.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: events.lib.inc.php 22205 2009-07-17 21:11:52Z cfasanando $
+<?php
 /* See license terms in /license.txt */
 /**
 * EVENTS LIBRARY
@@ -178,7 +178,8 @@ function event_access_tool($tool, $id_session=0)
 	global $_course;
 	global $TABLETRACK_LASTACCESS; //for "what's new" notification
 	
-	$id_session = api_get_session_id();	
+	$id_session = api_get_session_id();
+	$tool = Database::escape_string($tool);	
 	$reallyNow = time();
 	$user_id = $_user['user_id'] ? "'".$_user['user_id']."'" : "0"; // no one
 	// record information
@@ -201,7 +202,7 @@ function event_access_tool($tool, $id_session=0)
 				VALUES
 					(".$user_id.",".// Don't add ' ' around value, it's already done.
 					"'".$_cid."' ,
-					'".htmlspecialchars($tool, ENT_QUOTES)."',
+					'".$tool."',
 					FROM_UNIXTIME(".$reallyNow."), 
 					'".$id_session."')";
 		$res = Database::query($sql);
@@ -209,14 +210,11 @@ function event_access_tool($tool, $id_session=0)
 	// "what's new" notification
 	$sql = "UPDATE $TABLETRACK_LASTACCESS
 			SET access_date = FROM_UNIXTIME($reallyNow)
-			WHERE access_user_id = ".$user_id." AND access_cours_code = '".$_cid."' AND access_tool = '".htmlspecialchars($tool, ENT_QUOTES)."' AND access_session_id=".$id_session;
+			WHERE access_user_id = ".$user_id." AND access_cours_code = '".$_cid."' AND access_tool = '".$tool."' AND access_session_id=".$id_session;
 	$res = Database::query($sql);
-	if (Database::affected_rows() == 0)
-	{
-		$sql = "INSERT INTO $TABLETRACK_LASTACCESS
-					(access_user_id,access_cours_code,access_tool, access_date, access_session_id)
-				VALUES
-					(".$user_id.", '".$_cid."' , '".htmlspecialchars($tool, ENT_QUOTES)."', FROM_UNIXTIME($reallyNow), $id_session)";
+	if (Database::affected_rows() == 0) {
+		$sql = "INSERT INTO $TABLETRACK_LASTACCESS (access_user_id,access_cours_code,access_tool, access_date, access_session_id)
+				VALUES (".$user_id.", '".$_cid."' , '".$tool."', FROM_UNIXTIME($reallyNow), $id_session)";
 		$res = Database::query($sql);
 	}
 	return 1;

From 44cb9081c784a604a3294c42fa810450efa35369 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 16:45:43 +0200
Subject: [PATCH 56/63] Adding api_get_group_id() (Not social network group)

---
 main/inc/lib/main_api.lib.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index a7b472f5b4..7ba588f7be 100755
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -1436,13 +1436,22 @@ class api_failure {
 /*	CONFIGURATION SETTINGS */
 
 /**
- * Gets the current Chamilo (not PHP/cookie) session ID, if active
+ * Gets the current Chamilo (not PHP/cookie) session ID
  * @return  int     O if no active session, the session ID otherwise
  */
 function api_get_session_id() {
-	return empty($_SESSION['id_session']) ? 0 : (int)$_SESSION['id_session'];
+	return empty($_SESSION['id_session']) ? 0 : intval($_SESSION['id_session']);
 }
 
+/**
+ * Gets the current Chamilo (not social network) group ID
+ * @return  int     O if no active session, the session ID otherwise
+ */
+function api_get_group_id() {
+	return empty($_SESSION['_gid']) ? 0 : intval($_SESSION['_gid']);	
+}
+
+
 /**
  * Gets the current or given session name
  * @param   int     Session ID (optional)

From b0eb14e38ec10d0744a401f18351a1cbfd455a52 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 16:49:50 +0200
Subject: [PATCH 57/63] Fixing bugs when item property is changed

---
 main/announcements/announcements.inc.php | 31 +++------
 main/announcements/announcements.php     | 89 ++++++++++--------------
 2 files changed, 45 insertions(+), 75 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 3a07713626..685a6f2e58 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -941,31 +941,20 @@ function sent_to($tool, $id) {
 * @param    int     ID of the element of the corresponding type
 * @return   bool    False on failure, True on success
 */
-function change_visibility_announcement($tool, $id) {
-	global $_course;	
-	$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
-	$tool	= Database::escape_string($tool);
-	$id 	= Database::escape_string($id);
-
-	$sql = "SELECT visibility FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
-
-	$result = Database::query($sql);
-	$row 	= Database::fetch_array($result, 'ASSOC');
-	//Adding the AnnouncementUpdated when modifying the visibility 
-	api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, "AnnouncementUpdated", api_get_user_id());
-
-	if ($row['visibility']=='1') {
-		$sql_visibility="UPDATE $tbl_item_property SET visibility='0' WHERE tool='$tool' AND ref='$id'";
+function change_visibility_announcement($id) {
+	global $_course;
+	$item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $id);
+	if ($item_visibility == '1') {
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'invisible', api_get_user_id());
 	} else {
-		$sql_visibility="UPDATE $tbl_item_property SET visibility='1' WHERE tool='$tool' AND ref='$id'";
-	}
-    $result = Database::query($sql_visibility);
-    if ($result === false) {
-        return false;
-    }
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'visible', api_get_user_id());
+	}	
     return true;
 }
 
+function delete_announcement($_course, $id) {	
+	api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'delete', api_get_user_id());
+}
 
 /*
 		ATTACHMENT FUNCTIONS
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index dcacce57c7..f4338c16d1 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -64,8 +64,9 @@ $tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 /*
 	Resource linker
 */
+
 $_SESSION['source_type']="Ad_Valvas";
-include '../resourcelinker/resourcelinker.inc.php';
+require_once '../resourcelinker/resourcelinker.inc.php';
 
 if (!empty($_POST['addresources'])) {
 	// When the "Add Resource" button is clicked we store all the form data into a session
@@ -73,19 +74,17 @@ if (!empty($_POST['addresources'])) {
     $form_elements= array ('emailTitle'=>Security::remove_XSS($emailTitle), 'newContent'=>Security::remove_XSS($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
     $_SESSION['formelements']=$form_elements;
 
-    if($id) // this is to correctly handle edits
-	{
-		  $action="edit";
-    }else
-    {
-		  $action="add";
+    if($id) {
+    	// this is to correctly handle edits
+		$action="edit";
+    } else {
+		$action="add";
     }
 
 	// ============== //
 	// 7 = Ad_Valvas	//
 	// ============== //
-	if($surveyid)
-	{
+	if($surveyid) {
 		header("Location: ../resourcelinker/resourcelinker.php?source_id=7&action=$action&id=$id&originalresource=no&publish_survey=$surveyid&db_name=$db_name&cidReq=$cidReq");
 		exit;
 	} else {
@@ -95,15 +94,12 @@ if (!empty($_POST['addresources'])) {
 	exit;
 }
 
-/*
-	Tracking
-*/
+/*	Tracking	*/
 event_access_tool(TOOL_ANNOUNCEMENT);
 
 
-/*
-	Libraries
-*/
+/*	Libraries	*/
+
 $lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
 require_once $lib.'groupmanager.lib.php';
 require_once $lib.'mail.lib.inc.php';
@@ -112,21 +108,18 @@ require_once $lib.'tracking.lib.php';
 require_once $lib.'fckeditor/fckeditor.php';
 require_once $lib.'fileUpload.lib.php';
 require_once 'announcements.inc.php';
-/*
-	POST TO
-*/
+/*	POST TO	*/
 
 $safe_emailTitle = $_POST['emailTitle'];
 $safe_newContent = $_POST['newContent'];
 
-if (!empty($_POST['To']))
-{
+if (!empty($_POST['To'])) {
 	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 		api_not_allowed();
 	}
 	$display_form = true;
 
-	$form_elements = array ('emailTitle'=>$safe_emailTitle, 'newContent'=>$safe_newContent, 'id'=>Security::remove_XSS($_POST['id']), 'emailoption'=>Security::remove_XSS($_POST['email_ann']));
+	$form_elements = array ('emailTitle'=>$safe_emailTitle, 'newContent'=>$safe_newContent, 'id'=>$_POST['id'], 'emailoption'=>$_POST['email_ann']);
     $_SESSION['formelements'] = $form_elements;
 
     $form_elements            	= $_SESSION['formelements'];
@@ -140,17 +133,14 @@ if (!empty($_POST['To']))
 */
 
 $setting_select_groupusers = true;
-if (empty($_POST['To']) and !$_SESSION['select_groupusers'])
-{
+if (empty($_POST['To']) and !$_SESSION['select_groupusers']) {
 	$_SESSION['select_groupusers'] = "hide";
 }
 $select_groupusers_status=$_SESSION['select_groupusers'];
-if (!empty($_POST['To']) and ($select_groupusers_status=="hide"))
-{
+if (!empty($_POST['To']) and ($select_groupusers_status=="hide")) {
 	$_SESSION['select_groupusers'] = "show";
 }
-if (!empty($_POST['To']) and ($select_groupusers_status=="show"))
-{
+if (!empty($_POST['To']) and ($select_groupusers_status=="show")) {
 	$_SESSION['select_groupusers'] = "hide";
 }
 
@@ -198,7 +188,7 @@ if(!empty($_GET['toolgroup'])){
 	if($_GET['toolgroup'] == strval(intval($_GET['toolgroup']))){ //check is integer
 		$toolgroup = $_GET['toolgroup'];
 		$_SESSION['select_groupusers'] = 'hide';
-	}else{
+	} else {
 		$toolgroup = 0;
 	}
 	api_session_register("toolgroup");
@@ -212,15 +202,13 @@ if(!empty($_GET['toolgroup'])){
 $ctok = $_SESSION['sec_token'];
 $stok = Security::get_token();
 
-if (!empty($_SESSION['formelements']) and !empty($_GET['originalresource']) and $_GET['originalresource'] == 'no')
-{
+if (!empty($_SESSION['formelements']) and !empty($_GET['originalresource']) and $_GET['originalresource'] == 'no') {
 	$form_elements			= $_SESSION['formelements'];
 	$title_to_modify		= $form_elements['emailTitle'];
 	$content_to_modify		= $form_elements['newContent'];
 	$announcement_to_modify	= $form_elements['id'];
 	$to						= $form_elements['to'];
 	//load_edit_users('announcement',$announcement_to_modify);
-
 	$email_ann				= $form_elements['emailoption'];
 }
 if(!empty($_GET['remind_inactive'])) {
@@ -235,7 +223,7 @@ if(!empty($_REQUEST['publish_survey'])) {
 }
 
 //@todo fix those request values 
-$cidReq=Database::escape_string($_REQUEST['cidReq']);
+$cidReq = Database::escape_string($_REQUEST['cidReq']);
 if($surveyid) {
 	$db_name=Database::escape_string($_REQUEST['db_name']);
 	$sql_temp = "SELECT * FROM $db_name.survey WHERE survey_id='$surveyid'";
@@ -267,10 +255,9 @@ if (!empty($_SESSION['toolgroup'])){
 // showing the header if we are not in the learning path, if we are in
 // the learning path, we do not include the banner so we have to explicitly
 // include the stylesheet, which is normally done in the header
-if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')
-{
+if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
 	//we are not in the learning path
-	Display::Display_header($nameTools,"Announcements");
+	Display::display_header($nameTools,get_lang('Announcements'));
 } else {
 	//we are in the learning path, only display central data and change css
 	$display_title_list = false;
@@ -278,8 +265,6 @@ if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')
 	$display_specific_announcement = true;
 	$announcement_id = $_REQUEST['ann_id'];
 	?> <link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CODE_PATH).'css/'.$my_style; ?>/default.css">
-	<!-- css file for announcements -->
-	<link href="../css/<?php echo $my_style; ?>/announcements.css" rel="stylesheet" type="text/css">
 	<?php
 }
 
@@ -302,12 +287,10 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 			if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 				api_not_allowed();
 			}
-
-			$id=intval($_GET['id']);
-			if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
+			if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])) {
 				if ($ctok == $_GET['sec_token']) {
-					change_visibility_announcement(TOOL_ANNOUNCEMENT,$id);
-					$message = get_lang("VisibilityChanged");
+					change_visibility_announcement($_GET['id']);
+					$message = get_lang('VisibilityChanged');
 				}
 			}
 		}
@@ -316,9 +299,9 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	/*
 		Delete announcement
 	*/
-	if (!empty($_GET['action']) AND $_GET['action']=='delete' AND isset($_GET['id'])) {
+	if (!empty($_GET['action']) && $_GET['action']=='delete' && isset($_GET['id'])) {
 		//Database::query("DELETE FROM  $tbl_announcement WHERE id='$delete'");
-		$id=intval(addslashes($_GET['id']));
+		$id=intval($_GET['id']);
 		if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 			api_not_allowed();
 		}
@@ -326,16 +309,14 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
 
 			// tooledit : visibility = 2 : only visibile for platform administrator
-			if ($ctok == $_GET['sec_token']) {
-				Database::query("UPDATE $tbl_item_property SET visibility='2' WHERE tool='".TOOL_ANNOUNCEMENT."' and ref='".$id."'");
-
+			if ($ctok == $_GET['sec_token']) {				
+				delete_announcement($_course, $id);
 				delete_added_resource("Ad_Valvas", $delete);
 
 				$id = null;
 				$emailTitle = null;
 				$newContent = null;
-
-				$message = get_lang("AnnouncementDeleted");
+				$message = get_lang('AnnouncementDeleted');
 			}
 		}
 	}
@@ -344,8 +325,6 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		Delete all announcements
 	*/
 	if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
-
-		//Database::query("DELETE FROM $tbl_announcement");
 		if (api_is_allowed_to_edit()) {
 			Database::query("UPDATE $tbl_item_property SET visibility='2' WHERE tool='".TOOL_ANNOUNCEMENT."'");
 			delete_all_resources_type("Ad_Valvas");
@@ -353,7 +332,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 			$emailTitle = null;
 			$newContent = null;
 
-			$message = get_lang("AnnouncementDeletedAll");
+			$message = get_lang('AnnouncementDeletedAll');
 		}
 	}
 
@@ -1207,7 +1186,7 @@ if ($display_announcement_list && !$surveyid) {
 			}
 		}
 	} else {
-	//STUDENT
+		//STUDENT
 			if (is_array($group_memberships) && count($group_memberships)>0) {
 
 				if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
@@ -1452,7 +1431,9 @@ if ($display_announcement_list && !$surveyid) {
 }	// end: if ($displayAnnoucementList)
 
 echo "</table>";
-if (!empty($display_specific_announcement)) display_announcement($announcement_id);
+if (!empty($display_specific_announcement)) {
+	display_announcement($announcement_id);
+}
 
 /*		FOOTER		*/
 if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {

From ecd2c86952febab626856e1e3000be68423b3cf4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 21 May 2010 19:33:41 +0200
Subject: [PATCH 58/63] Adding the AnnouncementManager class

---
 main/announcements/announcements.inc.php | 233 ++++++++++++++---------
 main/announcements/announcements.php     | 148 ++++++++------
 2 files changed, 234 insertions(+), 147 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 685a6f2e58..bd5928cdd2 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -5,7 +5,138 @@
 * @package chamilo.announcements
 */
 
-$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+class AnnouncementManager  {
+	
+	private function __construct() {
+	}	
+		
+	/**
+	 * Gets all announcements from a course 
+	 * @param	string course db
+	 * @param	int session id
+	 * @return	array html with the content and count of announcements or false otherwise
+	 */
+	public static function get_all_annoucement_by_course($course_db, $session = 0) {
+		if (empty($course_db)) {
+			return false;
+		}
+		$tbl_announcement	= Database::get_course_table(TABLE_ANNOUNCEMENT, $course_db['db_name']);
+		$tbl_item_property  = Database::get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
+		/*
+		if (empty($group_id)) {
+			$group_condition = "AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id is null)";
+		} else {
+			$group_condition = "AND (toolitemproperties.to_group_id='$group_id')";
+		}
+		$group_condition
+		*/
+			
+		$sql="SELECT DISTINCT announcement.id, announcement.title, announcement.content
+				FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
+				WHERE announcement.id = toolitemproperties.ref
+				AND toolitemproperties.tool='announcement'				
+				AND announcement.session_id  = '$session'
+				ORDER BY display_order DESC";
+		$rs = Database::query($sql);
+		$num_rows = Database::num_rows($rs);
+		$result = array();
+		if ($num_rows>0) {
+			$list = array();
+			while ($row = Database::fetch_array($rs)) {
+				$list[] = $row;		
+			}		
+			return $list;
+		}		
+		return false;
+	}
+		
+		
+	/**
+	* This functions swithes the visibility a course resource
+	* using the visibility field in 'item_property'
+	* @param    array	the course array
+	* @param    int     ID of the element of the corresponding type
+	* @return   bool    False on failure, True on success
+	*/
+	public static function change_visibility_announcement($_course, $id) {
+		$item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $id);
+		if ($item_visibility == '1') {
+			api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'invisible', api_get_user_id());
+		} else {
+			api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'visible', api_get_user_id());
+		}	
+	    return true;
+	}
+		
+	/**
+	 * Deletes an announcement
+	 * @param array the course array
+	 * @param int 	the announcement id
+	 */	
+	public static function delete_announcement($_course, $id) {	
+		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'delete', api_get_user_id());
+	}
+	
+	/**
+	 * Deletes all announcements by course
+	 * @param array the course array
+	 */
+	public static function delete_all_announcements($_course) {	
+		$announcements = self::get_all_annoucement_by_course($_course, api_get_session_id());
+		
+		foreach ($announcements  as $annon) {
+			api_item_property_update($_course, TOOL_ANNOUNCEMENT, $annon['id'], 'delete', api_get_user_id());	
+		}	
+	}
+	
+	/**
+	* Displays one specific announcement
+	* @param $announcement_id, the id of the announcement you want to display
+	*/
+	public static function display_announcement($announcement_id) {	
+		if ($announcement_id != strval(intval($announcement_id))) { return false; } // potencial sql injection
+	
+		$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
+		$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
+	
+		if (api_get_user_id() != 0) {
+			$sql_query = "	SELECT announcement.*, toolitemproperties.*
+							FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
+							WHERE announcement.id = toolitemproperties.ref
+							AND announcement.id = '$announcement_id'
+							AND toolitemproperties.tool='announcement'
+							AND (toolitemproperties.to_user_id='".api_get_user_id()."' OR toolitemproperties.to_group_id='0')
+							AND toolitemproperties.visibility='1'
+							ORDER BY display_order DESC";
+	
+		} else {
+			$sql_query = "	SELECT announcement.*, toolitemproperties.*
+							FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
+							WHERE announcement.id = toolitemproperties.ref
+							AND announcement.id = '$announcement_id'
+							AND toolitemproperties.tool='announcement'
+							AND toolitemproperties.to_group_id='0'
+							AND toolitemproperties.visibility='1'";
+		}
+		$sql_result = Database::query($sql_query);
+		$result		= Database::fetch_array($sql_result);
+	
+		if ($result !== false) { // A sanity check.
+			$title		 = $result['title'];
+			$content	 = $result['content'];
+			$content     = make_clickable($content);
+			$content     = text_filter($content);
+			$last_post_datetime = $result['insert_date'];// post time format  datetime de mysql
+			list($last_post_date, $last_post_time) = split(" ", $last_post_datetime);
+		}
+	
+		echo "<table height=\"100\" width=\"100%\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\" id=\"agenda_list\">";
+		echo "<tr class=\"data\"><td>" . $title . "</td></tr>";
+		echo "<tr><td class=\"announcements_datum\">" . get_lang('AnnouncementPublishedOn') . " : " . api_convert_and_format_date($last_post_datetime, null, date_default_timezone_get()) . "</td></tr>";
+		echo "<tr class=\"text\"><td>$content</td></tr>";
+		echo "</table>";
+	}	
+}
 
 /**
  * Store an announcement in the database (including its attached file if any)
@@ -252,12 +383,8 @@ function get_all_annoucement_by_user_course($course_db, $user_id) {
 		$result = array();
 		if ($num_rows>0) {
 			while ($myrow = Database::fetch_array($rs)) {
-				//if ($i<=4) {
 					$content.= '<strong>'.$myrow['title'].'</strong><br /><br />';
 					$content.= $myrow['content'];
-				/*} else {
-					break;
-				}*/
 				$i++;
 			}
 			$result['content'] = $content;
@@ -269,56 +396,6 @@ function get_all_annoucement_by_user_course($course_db, $user_id) {
 	return false;
 }
 
-/*
-		DISPLAY FUNCTIONS
-*/
-/**
-* Displays one specific announcement
-* @param $announcement_id, the id of the announcement you want to display
-*/
-function display_announcement($announcement_id) {	
-	if ($announcement_id != strval(intval($announcement_id))) { return false; } // potencial sql injection
-
-	$tbl_announcement 	= Database::get_course_table(TABLE_ANNOUNCEMENT);
-	$tbl_item_property	= Database::get_course_table(TABLE_ITEM_PROPERTY);
-
-	if (api_get_user_id() != 0) {
-		$sql_query = "	SELECT announcement.*, toolitemproperties.*
-						FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
-						WHERE announcement.id = toolitemproperties.ref
-						AND announcement.id = '$announcement_id'
-						AND toolitemproperties.tool='announcement'
-						AND (toolitemproperties.to_user_id='".api_get_user_id()."' OR toolitemproperties.to_group_id='0')
-						AND toolitemproperties.visibility='1'
-						ORDER BY display_order DESC";
-
-	} else {
-		$sql_query = "	SELECT announcement.*, toolitemproperties.*
-						FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
-						WHERE announcement.id = toolitemproperties.ref
-						AND announcement.id = '$announcement_id'
-						AND toolitemproperties.tool='announcement'
-						AND toolitemproperties.to_group_id='0'
-						AND toolitemproperties.visibility='1'";
-	}
-	$sql_result = Database::query($sql_query);
-	$result		= Database::fetch_array($sql_result);
-
-	if ($result !== false) { // A sanity check.
-		$title		 = $result['title'];
-		$content	 = $result['content'];
-		$content     = make_clickable($content);
-		$content     = text_filter($content);
-		$last_post_datetime = $result['insert_date'];// post time format  datetime de mysql
-		list($last_post_date, $last_post_time) = split(" ", $last_post_datetime);
-	}
-
-	echo "<table height=\"100\" width=\"100%\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\" id=\"agenda_list\">";
-	echo "<tr class=\"data\"><td>" . $title . "</td></tr>";
-	echo "<tr><td class=\"announcements_datum\">" . get_lang('AnnouncementPublishedOn') . " : " . api_convert_and_format_date($last_post_datetime, null, date_default_timezone_get()) . "</td></tr>";
-	echo "<tr class=\"text\"><td>$content</td></tr>";
-	echo "</table>";
-}
 
 /*
 	SHOW_TO_FORM
@@ -532,8 +609,7 @@ function show_to_form_group($group_id) {
 * this function gets all the users of the course,
 * including users from linked courses
 */
-function get_course_users()
-{
+function get_course_users() {
 	//this would return only the users from real courses:
 	//$user_list = CourseManager::get_user_list_from_course_code(api_get_course_id());
 	$session_id = api_get_session_id();
@@ -551,10 +627,8 @@ function get_course_users()
 * this function gets all the groups of the course,
 * not including linked courses
 */
-function get_course_groups()
-{	
-	$session_id = api_get_session_id();
-	
+function get_course_groups() {	
+	$session_id = api_get_session_id();	
 	if ($session_id != 0) {
 		$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($session_id));
 	} else {	
@@ -810,6 +884,7 @@ function sent_to_form($sent_to_array) {
 	$total_numbers=$number_users+$number_groups;
 
 	// starting the form if there is more than one user/group
+	
 	if ($total_numbers >1) {
 		$output="<select name=\"sent to\">";
 		$output.="<option>".get_lang("SentTo")."</option>";
@@ -836,14 +911,14 @@ function sent_to_form($sent_to_array) {
 			$user_info = api_get_user_info($sent_to_array['users'][0]);
 			echo api_get_person_name($user_info['firstname'], $user_info['lastname']);
 		}
-		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]!==0) {
+		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and isset($sent_to_array['groups'][0]) and $sent_to_array['groups'][0]!==0) {
 			$group_id=$sent_to_array['groups'][0];
-			echo $group_names[$group_id]['name'];
+			echo "&nbsp;".$group_names[$group_id]['name'];
 		}
-		if (isset($sent_to_array['groups']) and is_array($sent_to_array['groups']) and $sent_to_array['groups'][0]==0) {
-			echo get_lang('Everybody');
+		if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) {
+			echo "&nbsp;".get_lang('Everybody');
 		}
-	}
+	}	
 	if(!empty($output))
 	{
 		echo $output;
@@ -933,32 +1008,8 @@ function sent_to($tool, $id) {
 /*
 	           CHANGE_VISIBILITY($tool,$id)
 */
-/**
-* This functions swithes the visibility a course resource
-* using the visibility field in 'item_property'
-* values: 0 = invisibility for
-* @param    string  The tool (announcement, agenda, ...)
-* @param    int     ID of the element of the corresponding type
-* @return   bool    False on failure, True on success
-*/
-function change_visibility_announcement($id) {
-	global $_course;
-	$item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $id);
-	if ($item_visibility == '1') {
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'invisible', api_get_user_id());
-	} else {
-		api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'visible', api_get_user_id());
-	}	
-    return true;
-}
 
-function delete_announcement($_course, $id) {	
-	api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'delete', api_get_user_id());
-}
-
-/*
-		ATTACHMENT FUNCTIONS
-*/
+/*		ATTACHMENT FUNCTIONS	*/
 
 /**
  * Show a list with all the attachments according to the post's id
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index f4338c16d1..4f47383673 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1,9 +1,10 @@
-<?php //$Id: announcements.php 2009-11-13 18:56:45Z aportugal $
+<?php
 /* For licensing terms, see /license.txt */
 /**
  * @author Frederik Vermeire <frederik.vermeire@pandora.be>, UGent Internship
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: code cleaning
  * @author Julio Montoya <gugli100@gmail.com>, MORE code cleaning
+ * 
  * @abstract The task of the internship was to integrate the 'send messages to specific users' with the
  *			 Announcements tool and also add the resource linker here. The database also needed refactoring
  *			 as there was no title field (the title was merged into the content field)
@@ -61,6 +62,18 @@ $tbl_announcement		= Database::get_course_table(TABLE_ANNOUNCEMENT);
 $tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 $tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
+
+/*	Libraries	*/
+
+$lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
+require_once $lib.'groupmanager.lib.php';
+require_once $lib.'mail.lib.inc.php';
+require_once $lib.'debug.lib.inc.php';
+require_once $lib.'tracking.lib.php';
+require_once $lib.'fckeditor/fckeditor.php';
+require_once $lib.'fileUpload.lib.php';
+require_once 'announcements.inc.php';
+
 /*
 	Resource linker
 */
@@ -69,11 +82,9 @@ $_SESSION['source_type']="Ad_Valvas";
 require_once '../resourcelinker/resourcelinker.inc.php';
 
 if (!empty($_POST['addresources'])) {
-	// When the "Add Resource" button is clicked we store all the form data into a session
-	require_once 'announcements.inc.php';
+	// When the "Add Resource" button is clicked we store all the form data into a session	
     $form_elements= array ('emailTitle'=>Security::remove_XSS($emailTitle), 'newContent'=>Security::remove_XSS($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
     $_SESSION['formelements']=$form_elements;
-
     if($id) {
     	// this is to correctly handle edits
 		$action="edit";
@@ -98,16 +109,7 @@ if (!empty($_POST['addresources'])) {
 event_access_tool(TOOL_ANNOUNCEMENT);
 
 
-/*	Libraries	*/
 
-$lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
-require_once $lib.'groupmanager.lib.php';
-require_once $lib.'mail.lib.inc.php';
-require_once $lib.'debug.lib.inc.php';
-require_once $lib.'tracking.lib.php';
-require_once $lib.'fckeditor/fckeditor.php';
-require_once $lib.'fileUpload.lib.php';
-require_once 'announcements.inc.php';
 /*	POST TO	*/
 
 $safe_emailTitle = $_POST['emailTitle'];
@@ -289,7 +291,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 			}
 			if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])) {
 				if ($ctok == $_GET['sec_token']) {
-					change_visibility_announcement($_GET['id']);
+					AnnouncementManager::change_visibility_announcement($_course, $_GET['id']);
 					$message = get_lang('VisibilityChanged');
 				}
 			}
@@ -310,7 +312,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 
 			// tooledit : visibility = 2 : only visibile for platform administrator
 			if ($ctok == $_GET['sec_token']) {				
-				delete_announcement($_course, $id);
+				AnnouncementManager::delete_announcement($_course, $id);
 				delete_added_resource("Ad_Valvas", $delete);
 
 				$id = null;
@@ -325,13 +327,11 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		Delete all announcements
 	*/
 	if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
-		if (api_is_allowed_to_edit()) {
-			Database::query("UPDATE $tbl_item_property SET visibility='2' WHERE tool='".TOOL_ANNOUNCEMENT."'");
-			delete_all_resources_type("Ad_Valvas");
+		if (api_is_allowed_to_edit()) {			
+			AnnouncementManager::delete_all_announcements($_course);
 			$id = null;
 			$emailTitle = null;
 			$newContent = null;
-
 			$message = get_lang('AnnouncementDeletedAll');
 		}
 	}
@@ -587,7 +587,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 										INNER JOIN $tbl_session_course_user
 										ON $tbl_user.user_id = $tbl_session_course_user.id_user
 										AND $tbl_session_course_user.course_code = '".$_course['id']."'
-										AND $tbl_session_course_user.id_session = ".api_get_session();
+										AND $tbl_session_course_user.id_session = ".api_get_session_id();
 
 			    		}
 			    	}
@@ -730,13 +730,20 @@ $condition_session = api_get_session_condition($session_id);
 if(api_is_allowed_to_edit(false,true))  {
  	// check teacher status
   	if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-
+  		
+  		if (api_get_group_id() == 0) {
+			$group_condition = "";
+		} else {
+			$group_condition = "AND (ip.to_group_id='".api_get_group_id()."' OR ip.to_group_id = 0)";
+		}
+		
 		$sql="SELECT
 				announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
 				FROM $tbl_announcement announcement, $tbl_item_property ip
 				WHERE announcement.id = ip.ref
 				AND ip.tool='announcement'
 				AND ip.visibility<>'2'
+				$group_condition
 				$condition_session
 				GROUP BY ip.ref
 				ORDER BY display_order DESC
@@ -745,18 +752,28 @@ if(api_is_allowed_to_edit(false,true))  {
 } else {
 	// students only get to see the visible announcements
 
-
 		if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
 			$group_memberships=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
 
 			if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-				$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
+				
+				if (api_get_group_id() == 0) {
+					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
 						"OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
+				} else {
+					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'  
+					OR ip.to_group_id IN (0, ".api_get_group_id()."))";
+				}
 			} else {
-				$cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
-						"OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+				if (api_get_group_id() == 0) {
+						$cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
+							"OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+					} else {
+						$cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
+							"OR ip.to_group_id IN (0, ".api_get_group_id().")) ";
+					}
 			}
-
+			
 			// the user is member of several groups => display personal announcements AND his group announcements AND the general announcements
 			if (is_array($group_memberships) && count($group_memberships)>0) {
 				$sql="SELECT
@@ -836,11 +853,13 @@ if (!$surveyid) {
 	}
 
 	if (api_is_allowed_to_edit() && $announcement_number > 1) {
-		if (!$show_actions)
-			echo '<div class="actions">';
-		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete_all\" onclick=\"javascript:if(!confirm('".get_lang("ConfirmYourChoice")."')) return false;\">".Display::return_icon('valvesdelete.gif',get_lang('AnnouncementDeleteAll')).get_lang('AnnouncementDeleteAll')."</a>\n";	}	// if announcementNumber > 1
-	if ($show_actions)
-		echo '</div>';
+		if (api_get_group_id() == 0 ) {
+			if (!$show_actions)
+				echo '<div class="actions">';
+			echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete_all\" onclick=\"javascript:if(!confirm('".get_lang("ConfirmYourChoice")."')) return false;\">".Display::return_icon('valvesdelete.gif',get_lang('AnnouncementDeleteAll')).get_lang('AnnouncementDeleteAll')."</a>\n";	}	// if announcementNumber > 1			
+		}
+		if ($show_actions)
+				echo '</div>';
 }
 
 if (empty($_GET['origin']) OR $_GET['origin'] !== 'learnpath') {
@@ -927,8 +946,8 @@ if ($display_form == true) {
 		} elseif (isset($_GET['remind_inactive'])) {
 			$email_ann = '1';
 			$_SESSION['select_groupusers']="show";
-			$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'),api_get_setting('siteName'), 7);
-			$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'),api_get_setting('siteName'));
+			$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'), api_get_setting('siteName'), 7);
+			$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
 		} elseif (isset($_GET['remindallinactives']) && $_GET['remindallinactives']=='true') {
 			// we want to remind inactive users. The $_GET['since'] parameter determines which users have to be warned (i.e the users who have been inactive for x days or more
 			$since = isset($_GET['since']) ? intval($_GET['since']) : 6;
@@ -1018,7 +1037,6 @@ if ($display_form == true) {
 					<span class="form_required">*</span> '.get_lang('EmailTitle').'
 				</div>
 				<div class="formw">
-
 					<input type="text" id="emailTitle" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
 				</div>
 			</div>';
@@ -1101,24 +1119,28 @@ if ($display_form == true) {
 		DISPLAY ANNOUNCEMENT LIST
 */
 
-
 if ($display_announcement_list && !$surveyid) {
 	// by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter
-	$user_id=$_user['user_id'];
+	//$user_id=$_user['user_id'];	
 	if (isset($_SESSION['user'])) {
-		$user_id=$_SESSION['user'];
+		//$user_id=$_SESSION['user'];
 	}
+	$user_id = api_get_user_id();
+	
 	if (isset($_SESSION['group'])) {
-		$group_id=$_SESSION['group'];
+		//$group_id=$_SESSION['group'];
 	}
+	$group_id = api_get_group_id();
 
 	//$group_memberships=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
-	$group_memberships=GroupManager::get_group_ids($_course['dbName'],$_user['user_id']);
-
+	
+	$group_memberships = GroupManager::get_group_ids($_course['dbName'],api_get_user_id());
+			
 	if (api_is_allowed_to_edit(false,true)) {
 		// A.1. you are a course admin with a USER filter
 		// => see only the messages of this specific user + the messages of the group (s)he is member of.
-		if (isset($_SESSION['user'])) {
+		if (!empty($_SESSION['user'])) {
+			
 			if (is_array($group_memberships) && count($group_memberships)>0) {
 				$sql="SELECT
 					announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
@@ -1141,15 +1163,15 @@ if ($display_announcement_list && !$surveyid) {
 					ORDER BY display_order DESC";
 
 			}
-		} elseif (isset($_SESSION['group'])) {
+		} elseif (api_get_group_id() !=0 ) {			
 			// A.2. you are a course admin with a GROUP filter
 			// => see only the messages of this specific group
-
 			$sql="SELECT
 				announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
 				FROM $tbl_announcement announcement, $tbl_item_property ip
 				WHERE announcement.id = ip.ref
 				AND ip.tool='announcement'
+				AND ip.visibility<>'2'
 				AND (ip.to_group_id=$group_id OR ip.to_group_id='0')
 				$condition_session
 				GROUP BY ip.ref
@@ -1160,7 +1182,6 @@ if ($display_announcement_list && !$surveyid) {
 			// => see all the messages of all the users and groups without editing possibilities
 
 			if (isset($isStudentView) and $isStudentView=="true") {
-
 				$sql="SELECT
 					announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
 					FROM $tbl_announcement announcement, $tbl_item_property ip
@@ -1182,17 +1203,30 @@ if ($display_announcement_list && !$surveyid) {
 					$condition_session
 					GROUP BY ip.ref
 					ORDER BY display_order DESC";
-
 			}
 		}
 	} else {
 		//STUDENT
 			if (is_array($group_memberships) && count($group_memberships)>0) {
-
+				
 				if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-					$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )) ";
+					
+					if (api_get_group_id() == 0) {
+						//No group
+						$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
+										"OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
+					} else {
+						$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'  
+						OR ip.to_group_id IN (0, ".api_get_group_id()."))";
+					}						
+					//$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )) ";
+					
 				} else {
-					$cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+					if (api_get_group_id() == 0) {
+						$cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
+					} else {
+						$cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".api_get_group_id()."))";
+					}					
 				}
 
 				$sql="SELECT
@@ -1204,6 +1238,7 @@ if ($display_announcement_list && !$surveyid) {
 					$condition_session
 					AND ip.visibility='1'
 					ORDER BY display_order DESC";
+				
 			} else {
 
 				if ($_user['user_id']) {
@@ -1245,9 +1280,9 @@ if ($display_announcement_list && !$surveyid) {
 			}
 
 	}
-
-	$result = Database::query($sql);
-	$num_rows = Database::num_rows($result);
+	
+	$result		= Database::query($sql);
+	$num_rows 	= Database::num_rows($result);
 
 /*
 		DISPLAY: NO ITEMS
@@ -1311,10 +1346,11 @@ if ($display_announcement_list && !$surveyid) {
 			echo "<th>".Security::remove_XSS($title)."</th>\n";
 			echo "<th>" . get_lang("SentTo") . " : &nbsp; ";
 
-			$sent_to=sent_to("announcement", $myrow['id']);
-			$sent_to_form=sent_to_form($sent_to);
-			$user_info=api_get_user_info($myrow['insert_user_id']);
-
+			$sent_to		= sent_to('announcement', $myrow['id']);
+						
+			$sent_to_form	= sent_to_form($sent_to);
+			$user_info		= api_get_user_info($myrow['insert_user_id']);
+			
 			echo '&nbsp;&nbsp;&nbsp;'.get_lang('By').' : &nbsp;'.str_replace(' ', '&nbsp;', api_get_person_name($user_info['firstName'], $user_info['lastName']));
 			echo "</th></tr>";
 			echo "<tr class='row_odd'>\n<td class=\"announcements_datum\" colspan=\"3\">";
@@ -1432,7 +1468,7 @@ if ($display_announcement_list && !$surveyid) {
 
 echo "</table>";
 if (!empty($display_specific_announcement)) {
-	display_announcement($announcement_id);
+	AnnouncementManager::display_announcement($announcement_id);
 }
 
 /*		FOOTER		*/

From 4cbf4cec0b34a803db2a192411e9d98dceecab05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Sat, 22 May 2010 18:09:17 +0200
Subject: [PATCH 59/63] improve swf, pdf and mp3 visualization by document tool

---
 main/document/document.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 99f8a18981..f49e535d8e 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -130,7 +130,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 		$ext = explode('.', $path);
 		$ext = strtolower($ext[sizeof($ext) - 1]);
 		// "htmlfiles" are shown in a frameset
-		if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png') {
+		if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3') {
 			$url = 'showinframes.php?'.api_get_cidreq().'&amp;file='.$url_path.$req_gid;
 		} else {
 			// url-encode for problematic characters (we may not call them dangerous characters...)

From 3f84684b5679485f12428153808329d10f9ecc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Sat, 22 May 2010 18:12:16 +0200
Subject: [PATCH 60/63] return to the site from where it was called

---
 main/document/edit_document.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index 34762caec0..891873f314 100755
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -592,8 +592,8 @@ function nav_to_slideshow($slide_id) {
 	$path = Security::remove_XSS($_GET['curdirpath']);
 	$pathurl = urlencode($path);
 	echo '<div class="actions">';
-	echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png').get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>&nbsp;';
-	//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 '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png').get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>&nbsp;';
+	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>';
 }
 

From 1bbed635fefc8e1132738785234156502340cf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Sun, 23 May 2010 19:16:04 +0200
Subject: [PATCH 61/63] commented temporarily because of problems with utf8
 remove 'words' that don't consist of alphanumerical characters or
 punctuation, and remove one-letter 'words' that consist only of punctuation

---
 main/wiki/wiki.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 91b2dcbb4c..75a9ccf586 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -958,12 +958,12 @@ function word_count($document) {
   	# strip all html tags
   	$wc = strip_tags($document);
 
+	//remove words and remove one letter words commented temporarily because of problems with utf8 support
   	# remove 'words' that don't consist of alphanumerical characters or punctuation
-  	$pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]+#";
-  	$wc = trim(preg_replace($pattern, " ", $wc));
-
+  	//$pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]+#";
+  	//$wc = trim(preg_replace($pattern, " ", $wc));
   	# remove one-letter 'words' that consist only of punctuation
-  	$wc = trim(preg_replace("#\s*[(\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]\s*#", " ", $wc));
+  	//$wc = trim(preg_replace("#\s*[(\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]\s*#", " ", $wc)); //
 
   	# remove superfluous whitespace
   	$wc = preg_replace("/\s\s+/", " ", $wc);

From dce3e4cec605ccd10097586716203ee9a182171d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Sun, 23 May 2010 19:18:33 +0200
Subject: [PATCH 62/63] a bit comment

---
 main/wiki/wiki.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 75a9ccf586..1491e75252 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -958,7 +958,7 @@ function word_count($document) {
   	# strip all html tags
   	$wc = strip_tags($document);
 
-	//remove words and remove one letter words commented temporarily because of problems with utf8 support
+	//remove words and remove one letter words commented temporarily because of problems with utf8 support. TODO: fix and enable
   	# remove 'words' that don't consist of alphanumerical characters or punctuation
   	//$pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]+#";
   	//$wc = trim(preg_replace($pattern, " ", $wc));

From 30fa963439fae56a67baf495c48196439fdc9c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Sun, 23 May 2010 20:34:59 +0200
Subject: [PATCH 63/63] In new pages go to new page

---
 main/wiki/index.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/wiki/index.php b/main/wiki/index.php
index 941b882ac6..a20d4d7638 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -452,6 +452,13 @@ if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recen
 	echo '</div>';
 }
 
+
+//In new pages go to new page
+if (isset($_POST['SaveWikiNew']))
+{
+	display_wiki_entry(Security::remove_XSS($_POST['reflink']));
+}
+
 /////////////////////// more options /////////////////////// Juan Carlos Raña Trabado
 
 //more for export to course document area. See display_wiki_entry
@@ -2346,12 +2353,6 @@ if ($_GET['action']=='discuss')
 	}
 }
 
-///in new pages go to new page
-if ($_POST['SaveWikiNew'])
-{
-	display_wiki_entry(Security::remove_XSS($_POST['reflink']));
-}
-
 echo "</div>"; // echo "<div id='mainwiki'>";
 
 echo "</div>"; // echo "<div id='wikiwrapper'>";