From a2dd7f1ff5fba1d57e72c19a805aa0793b6cefd7 Mon Sep 17 00:00:00 2001
From: Patrick Cool <patrick.cool@ugent.be>
Date: Mon, 23 Nov 2009 15:47:56 +0100
Subject: [PATCH 01/22] bugfix: Administration -> Reporting -> Latest Access ->
 enter date -> change sorting => all results are gone bugfix: list did not
 display the last accesses but the accesses that were done prior to x days

---
 main/admin/statistics/statistics.lib.php | 65 ++++++++++++------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/main/admin/statistics/statistics.lib.php b/main/admin/statistics/statistics.lib.php
index 6dba3b4363..f9ca789c9f 100644
--- a/main/admin/statistics/statistics.lib.php
+++ b/main/admin/statistics/statistics.lib.php
@@ -413,45 +413,44 @@ class Statistics
 		$form->add_textfield('date_diff',get_lang('Days'),true);
 		$form->addRule('date_diff','InvalidNumber','numeric');
 		$form->addElement('submit','ok',get_lang('Ok'));
-		$defaults['date_diff'] = 60;
+		if (!isset($_GET['date_diff'])) {
+			$defaults['date_diff'] = 60;
+		} else {
+			$defaults['date_diff'] = Security::Remove_XSS($_GET['date_diff']);
+		}
 		$form->setDefaults($defaults);
-		if($form->validate()) {
-			$form->display();
-			$values = $form->exportValues();
-			$date_diff = $values['date_diff'];
-			$table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
-			$sql = "SELECT * FROM $table GROUP BY access_cours_code HAVING access_cours_code <> '' AND DATEDIFF( NOW() , access_date ) >= ". $date_diff;
-			$res = Database::query($sql,__FILE__,__LINE__);
-			$number_of_courses = Database::num_rows($res);
-			$sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction];
-			$from = ($page_nr -1) * $per_page;
-			$sql .= ' LIMIT '.$from.','.$per_page;
-			echo '<p>'.get_lang('LastAccess').' &gt;= '.$date_diff.' '.get_lang('Days').'</p>';
-			$res = Database::query($sql, __FILE__, __LINE__);
-			if (Database::num_rows($res) > 0)
-			{
-				$courses = array ();
-				while ($obj = Database::fetch_object($res))
-				{
-					$course = array ();
-					$course[]= '<a href="'.api_get_path(WEB_PATH).'courses/'.$obj->access_cours_code.'">'.$obj->access_cours_code.' <a>';
-					$course[] = $obj->access_date;
-					$courses[] = $course;
-				}
-				$parameters['action'] = 'courselastvisit';
-				$parameters['date_diff'] = $date_diff;
-				$table_header[] = array ("Coursecode", true);
-				$table_header[] = array ("Last login", true);
-				Display :: display_sortable_table($table_header, $courses, array ('column'=>$column,'direction'=>$direction), array (), $parameters);
-			}
-			else
+		$form->display();
+		$values = $form->exportValues();
+		$date_diff = $values['date_diff'];
+		$table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
+		$sql = "SELECT * FROM $table GROUP BY access_cours_code HAVING access_cours_code <> '' AND DATEDIFF( NOW() , access_date ) <= ". $date_diff;
+		$res = Database::query($sql,__FILE__,__LINE__);
+		$number_of_courses = Database::num_rows($res);
+		$sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction];
+		$from = ($page_nr -1) * $per_page;
+		$sql .= ' LIMIT '.$from.','.$per_page;
+		echo '<p>'.get_lang('LastAccess').' &gt;= '.$date_diff.' '.get_lang('Days').'</p>';
+		$res = Database::query($sql, __FILE__, __LINE__);
+		if (Database::num_rows($res) > 0)
+		{
+			$courses = array ();
+			while ($obj = Database::fetch_object($res))
 			{
-				echo get_lang('NoSearchResults');
+				$course = array ();
+				$course[]= '<a href="'.api_get_path(WEB_PATH).'courses/'.$obj->access_cours_code.'">'.$obj->access_cours_code.' <a>';
+				$course[] = $obj->access_date;
+				$courses[] = $course;
 			}
+			$parameters['action'] = 'courselastvisit';
+			$parameters['date_diff'] = $date_diff;
+			$parameters['action'] = 'courselastvisit';
+			$table_header[] = array ("Coursecode", true);
+			$table_header[] = array ("Last login", true);
+			Display :: display_sortable_table($table_header, $courses, array ('column'=>$column,'direction'=>$direction), array (), $parameters);
 		}
 		else
 		{
-			$form->display();
+			echo get_lang('NoSearchResults');
 		}
 	}
 }

From e158bc4fe50a44b205e77000a4f0d0a547c24b0d Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 10:39:27 -0500
Subject: [PATCH 02/22] improved chat for group, log file is now save into
 group folder - partial DT#5496

---
 main/chat/chat_chat.php    | 42 +++++++++++++++++++++++---------------
 main/chat/chat_hidden.php  | 17 +++++++++++----
 main/chat/chat_message.php | 41 ++++++++++++++++++++++---------------
 3 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/main/chat/chat_chat.php b/main/chat/chat_chat.php
index 8c0580067d..eab3f09009 100755
--- a/main/chat/chat_chat.php
+++ b/main/chat/chat_chat.php
@@ -33,9 +33,10 @@
 define('FRAME','chat');
 
 $language_file = array ('chat');
-require('../inc/global.inc.php');
-include(api_get_path(LIBRARY_PATH).'document.lib.php');
-include (api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
+require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'document.lib.php';
+require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 //$course=api_get_course_id();
 
 $course=$_GET['cidReq'];
@@ -56,10 +57,17 @@ if (!empty($course))
 	$isMaster=$is_courseAdmin?true:false;
 
 
-	$dateNow=date('Y-m-d');
+	$dateNow=date('Y-m-d');	
+	$basepath_chat = '';		
+	$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+	if (!empty($group_id)) {
+		$group_info = GroupManager :: get_group_properties($group_id);
+		$basepath_chat = $group_info['directory'].'/chat_files';		
+	} else {
+		$basepath_chat = '/chat_files';				
+	}
+	$chatPath=$documentPath.$basepath_chat.'/';
 
-	$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$chatPath=$documentPath.'chat_files/';
 	$TABLEITEMPROPERTY= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
 	if(!is_dir($chatPath))
@@ -74,11 +82,13 @@ if (!empty($course))
 			$perm = octdec(!empty($perm)?$perm:'0770');
 			@mkdir($chatPath,$perm);
 			@chmod($chatPath,$perm);
-			
-			/*
-			$doc_id=add_document($_course,'/chat_files','folder',0,'chat_files');
-			Database::query("INSERT INTO ".$TABLEITEMPROPERTY . " (tool,insert_user_id,insert_te,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$doc_id,'DocumentAdded',1,0,NULL,0)");
-			*/
+			// save chat files document for group into item property			
+			if (!empty($group_id)) {
+				$doc_id=add_document($_course,$basepath_chat,'folder',0,'chat_files');
+				$sql = "INSERT INTO $TABLEITEMPROPERTY (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility)
+						VALUES ('document',1,NOW(),NOW(),$doc_id,'FolderCreated',1,$group_id,NULL,0)";
+				Database::query($sql,__FILE__,__LINE__);		
+			}
 		}
 	}
 
@@ -95,10 +105,10 @@ if (!empty($course))
 	{
 		@fclose(fopen($chatPath.$filename_chat,'w'));
 		if (!api_is_anonymous()) {
-			$doc_id=add_document($_course,'/chat_files/'.$filename_chat,'file',0,$filename_chat);
+			$doc_id=add_document($_course,$basepath_chat.'/'.$filename_chat,'file',0,$filename_chat);
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'],$group_id,null,null,null,$session_id);			
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'],$group_id,null,null,null,$session_id);
-			item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
+			item_property_update_on_folder($_course,$basepath_chat, $_user['user_id']);
 		}
 	}
 
@@ -124,13 +134,13 @@ if (!empty($course))
 
 		@fclose(fopen($chatPath.$basename_chat.'.log.html','w'));
 
-		$doc_id=add_document($_course,'/chat_files/'.$basename_chat.'-'.$i.'.log.html','file',filesize($chatPath.$basename_chat.'-'.$i.'.log.html'),$basename_chat.'-'.$i.'.log.html');
+		$doc_id=add_document($_course,$basepath_chat.'/'.$basename_chat.'-'.$i.'.log.html','file',filesize($chatPath.$basename_chat.'-'.$i.'.log.html'),$basename_chat.'-'.$i.'.log.html');
 
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'],$group_id,null,null,null,$session_id);
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'],$group_id,null,null,null,$session_id);
-		item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
+		item_property_update_on_folder($_course,$basepath_chat, $_user['user_id']);
 
-		$doc_id = DocumentManager::get_document_id($_course,'/chat_files/'.$basename_chat.'.log.html');
+		$doc_id = DocumentManager::get_document_id($_course,$basepath_chat.'/'.$basename_chat.'.log.html');
 
 		update_existing_document($_course, $doc_id,0);
 	}
diff --git a/main/chat/chat_hidden.php b/main/chat/chat_hidden.php
index 814a01f64b..9e80241348 100755
--- a/main/chat/chat_hidden.php
+++ b/main/chat/chat_hidden.php
@@ -34,8 +34,9 @@ define('FRAME','hidden');
 
 $language_file = array ('chat');
 
-require('../inc/global.inc.php');
-include_once '../inc/lib/course.lib.php';
+require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 require_once 'chat_functions.lib.php';
 //$tbl_user=$mainDbName."`.`user";
 //$tbl_chat_connected=$_course['dbNameGlu'].'chat_connected';
@@ -69,9 +70,17 @@ if (!empty($group_id)) {
 	$extra_condition = $session_condition;
 }
 
-$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-$chatPath=$documentPath.'chat_files/';
+// get chat path
+$chatPath = '';
+$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+if (!empty($group_id)) {
+	$group_info = GroupManager :: get_group_properties($group_id);
+	$chatPath=$documentPath.$group_info['directory'].'/chat_files/';
+} else {		
+	$chatPath=$documentPath.'/chat_files/';			
+}
 
+// get chat file
 $basename_chat = '';
 if (!empty($group_id)) {
 	$basename_chat = 'messages-'.$dateNow.'_gid-'.$group_id;
diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php
index 312b99d262..be8dee1d99 100755
--- a/main/chat/chat_message.php
+++ b/main/chat/chat_message.php
@@ -40,14 +40,14 @@ define('FRAME','message');
 
 $language_file = array ('chat');
 
-require('../inc/global.inc.php');
-
+require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 $course=api_get_course_id();
 $session_id = intval($_SESSION['id_session']);
 $group_id 	= intval($_SESSION['_gid']);
 
 /////
-// Juan Carlos Ra�a insert smileys and self-closing window
+// Juan Carlos Raña insert smileys and self-closing window
 ////
 ?>
 <script language="javascript" type="text/javascript">
@@ -121,9 +121,17 @@ if (!empty($course) && !empty($_user['user_id']))
 	$lastname=Database::result($result,0,'lastname');
 
 	$dateNow=date('Y-m-d');
-
-	$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$chatPath=$documentPath.'chat_files/';
+	
+	$basepath_chat = '';		
+	$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+	if (!empty($group_id)) {
+		$group_info = GroupManager :: get_group_properties($group_id);
+		$basepath_chat = $group_info['directory'].'/chat_files';		
+	} else {
+		$basepath_chat = '/chat_files';				
+	}
+	$chatPath=$documentPath.$basepath_chat.'/';
+	
 	$TABLEITEMPROPERTY= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
 	if(!is_dir($chatPath)) {
@@ -135,12 +143,13 @@ if (!empty($course) && !empty($_user['user_id']))
 			$perm = octdec(!empty($perm)?$perm:'0770');
 			@mkdir($chatPath,$perm);
 			@chmod($chatPath,$perm);
-			
-			/*
-			$doc_id=add_document($_course,'/chat_files','folder',0,'chat_files');
-			$sql_insert = "INSERT INTO ".$TABLEITEMPROPERTY . " (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$doc_id,'DocumentAdded',1,0,NULL,0)";
-			Database::query($sql_insert ,__FILE__,__LINE__);
-			*/
+			// save chat files document for group into item property	
+			if (!empty($group_id)) {
+				$doc_id=add_document($_course,$basepath_chat,'folder',0,'chat_files');
+				$sql = "INSERT INTO $TABLEITEMPROPERTY (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility)
+						VALUES ('document',1,NOW(),NOW(),$doc_id,'FolderCreated',1,$group_id,NULL,0)";
+				Database::query($sql,__FILE__,__LINE__);		
+			}			
 		}
 	}
 
@@ -245,15 +254,15 @@ if (!empty($course) && !empty($_user['user_id']))
 
 				if(!file_exists($chatPath.$basename_chat.'.log.html'))
 				{
-					$doc_id=add_document($_course,'/chat_files/'.$basename_chat.'.log.html','file',0,$basename_chat.'.log.html');
+					$doc_id=add_document($_course,$basepath_chat.'/'.$basename_chat.'.log.html','file',0,$basename_chat.'.log.html');
 
 					api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'],$group_id,null,null,null,$session_id);
 					api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'],$group_id,null,null,null,$session_id);
-					item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
+					item_property_update_on_folder($_course,$basepath_chat, $_user['user_id']);
 				}
 				else
 				{
-					$doc_id = DocumentManager::get_document_id($_course,'/chat_files/'.$basename_chat.'.log.html');
+					$doc_id = DocumentManager::get_document_id($_course,$basepath_chat.'/'.$basename_chat.'.log.html');
 				}
 
 				$fp=fopen($chatPath.$basename_chat.'.log.html','a');
@@ -275,7 +284,7 @@ if (!empty($course) && !empty($_user['user_id']))
 				$chat_size=filesize($chatPath.$basename_chat.'.log.html');
 
 				update_existing_document($_course, $doc_id,$chat_size);
-				item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
+				item_property_update_on_folder($_course,$basepath_chat, $_user['user_id']);
 			}
 		}
 	}

From 738cea1bb139a97edfd753c8befc436435f12715 Mon Sep 17 00:00:00 2001
From: Arthur Portugal <yukiportu@msn.com>
Date: Mon, 23 Nov 2009 11:23:10 -0500
Subject: [PATCH 03/22] Fixed align in exercises for browser safari and IE (all
 css) DT#5496

---
 main/css/academica/default.css          | 13 +++++++++++--
 main/css/baby_orange/default.css        | 14 ++++++++++++--
 main/css/blue_lagoon/default.css        | 13 +++++++++++--
 main/css/cool_blue/default.css          | 13 +++++++++++--
 main/css/corporate/default.css          | 13 +++++++++++--
 main/css/cosmic_campus/default.css      | 13 +++++++++++--
 main/css/delicious_bordeaux/default.css | 13 +++++++++++--
 main/css/dokeos_classic/default.css     | 13 +++++++++++--
 main/css/dokeos_classic_2D/default.css  | 13 +++++++++++--
 main/css/empire_green/default.css       | 13 +++++++++++--
 main/css/fruity_orange/default.css      | 13 +++++++++++--
 main/css/medical/default.css            | 12 +++++++++++-
 main/css/public_admin/default.css       | 14 ++++++++++++--
 main/css/royal_purple/default.css       | 13 +++++++++++--
 main/css/silver_line/default.css        | 13 +++++++++++--
 main/css/sober_brown/default.css        | 13 +++++++++++--
 main/css/steel_grey/default.css         | 13 +++++++++++--
 main/css/tasty_olive/default.css        | 13 +++++++++++--
 18 files changed, 200 insertions(+), 35 deletions(-)

diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index 2be9c8a84e..320d2ced86 100644
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -484,7 +484,13 @@ form span.form_error {
 	border-bottom:1px solid #4171b5;
 	border-top:1px solid #4171b5;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2045,7 +2051,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2057,6 +2063,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 6fc1554458..8be89302f3 100644
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -478,7 +478,6 @@ form span.form_error {
 	border-bottom:1px solid #4171b5;
 	border-top:1px solid #4171b5;
 	background-color:#efefef;
-	height:100%;
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -491,6 +490,14 @@ form span.form_error {
 	padding-right:12px;
 	text-align:center;
 }
+.content_table {
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+
 .actions img {
 	vertical-align:middle;
 }
@@ -2034,7 +2041,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2046,6 +2053,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 1ce2a5edd9..7d5787834d 100644
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -2120,7 +2120,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2441,7 +2447,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2452,6 +2458,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css
index c73a19080a..e71420d491 100644
--- a/main/css/cool_blue/default.css
+++ b/main/css/cool_blue/default.css
@@ -2114,7 +2114,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2436,7 +2442,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2447,6 +2453,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index db0f2575e2..13e0c38c1e 100644
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -498,7 +498,13 @@ form span.form_error {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2033,7 +2039,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2045,6 +2051,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css
index 989f528aba..14358bb525 100644
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@@ -526,7 +526,13 @@ form span.form_error {
 	border-bottom:1px solid #7171b7;
 	border-top:1px solid #7171b7;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2071,7 +2077,7 @@ button.back {
 	background-image:url(images/button_back.gif);
 }
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2083,6 +2089,9 @@ button.back {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css
index ce45248600..2e305230f5 100644
--- a/main/css/delicious_bordeaux/default.css
+++ b/main/css/delicious_bordeaux/default.css
@@ -2131,7 +2131,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2453,7 +2459,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2464,6 +2470,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index fe09467d41..d43b3c5b30 100644
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -2189,7 +2189,13 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2750,7 +2756,7 @@ button.upload {
 
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2762,6 +2768,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css
index 2fce88bd52..c2614138a6 100644
--- a/main/css/dokeos_classic_2D/default.css
+++ b/main/css/dokeos_classic_2D/default.css
@@ -2222,7 +2222,6 @@ input.forms	{
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2235,6 +2234,13 @@ input.forms	{
 	padding-right:12px;
 	text-align:center;
 }
+.content_table {
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
 .actions img {
 	vertical-align:middle;
 }
@@ -2784,7 +2790,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2796,6 +2802,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css
index 5bf2b6ef67..8e385d6c75 100644
--- a/main/css/empire_green/default.css
+++ b/main/css/empire_green/default.css
@@ -2130,7 +2130,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2452,7 +2458,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2463,6 +2469,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css
index 699b33facb..3b6513a93b 100644
--- a/main/css/fruity_orange/default.css
+++ b/main/css/fruity_orange/default.css
@@ -2130,7 +2130,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2452,7 +2458,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2463,6 +2469,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/medical/default.css b/main/css/medical/default.css
index 746efd9bd4..70dad89b89 100644
--- a/main/css/medical/default.css
+++ b/main/css/medical/default.css
@@ -2147,6 +2147,13 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float:left;
 	width:100%;
 }
+.content_table {
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
 .actionsbig a {
 	float:left;
 	padding-left:12px;
@@ -2708,7 +2715,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2720,6 +2727,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index 83a6a02070..f47a224714 100644
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -2163,7 +2163,13 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2719,13 +2725,14 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:10em;
 	text-align: center;
 	padding-right: 5px;
 	padding-left: 5px;
 }
+
 #expire_session div {
 	float:left;
 	padding-left:15px;
@@ -2760,6 +2767,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css
index f4a06f292e..1d31683cff 100644
--- a/main/css/royal_purple/default.css
+++ b/main/css/royal_purple/default.css
@@ -2126,7 +2126,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2448,7 +2454,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:9em;
 	text-align: center;
 	padding-top: 3px;
@@ -2459,6 +2465,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css
index e501e8bf36..7de8a2bad6 100644
--- a/main/css/silver_line/default.css
+++ b/main/css/silver_line/default.css
@@ -1877,7 +1877,13 @@ div.system_announcement {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2439,7 +2445,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2451,6 +2457,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css
index 1354a9ffc5..9ce21c92ad 100644
--- a/main/css/sober_brown/default.css
+++ b/main/css/sober_brown/default.css
@@ -2180,7 +2180,13 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2741,7 +2747,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	cursor:hand;
 	height:8em;
 	text-align: center;
@@ -2753,6 +2759,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css
index 0e77a7fe87..9187d2c455 100644
--- a/main/css/steel_grey/default.css
+++ b/main/css/steel_grey/default.css
@@ -2132,7 +2132,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2454,7 +2460,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2465,6 +2471,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;
diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css
index 5121580a0b..b6542b29f9 100644
--- a/main/css/tasty_olive/default.css
+++ b/main/css/tasty_olive/default.css
@@ -2106,7 +2106,13 @@ div.comments {
 	border-bottom:1px solid #999999;
 	border-top:1px solid #999999;
 	background-color:#efefef;
-	height:100%;
+	padding:2px;
+	margin-bottom: 5px;
+	vertical-align:middle;
+	float:left;
+	width:100%;
+}
+.content_table {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
@@ -2453,7 +2459,7 @@ button.upload {
 }
 
 .icon_image_content {
-	width:70px;
+	width:80px;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
@@ -2464,6 +2470,9 @@ button.upload {
 .question_menu {
 	list-style:none;
 	float:left;
+	padding:0px;
+	margin:-2px;
+	min-height:100px;
 }
 .question_menu li {
 	float:left;

From 07167d0fffbd7829ac65dd83b2fb3006ca08c77a Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 12:20:32 -0500
Subject: [PATCH 04/22] minor - fixed alignment of div html due to floating
 icon - partial DT#5508

---
 main/auth/profile.php       | 5 +++--
 main/inc/lib/social.lib.php | 7 +++++--
 main/social/home.php        | 5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/main/auth/profile.php b/main/auth/profile.php
index 15c64e422c..3863252d2b 100644
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -711,14 +711,15 @@ if (api_get_setting('extended_profile') == 'true') {
 		echo '<a href="/main/messages/inbox.php">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
 	}	
 	$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
-	echo '<span style="float:right; padding-top:7px;">';
+	
+	//echo '<span style="float:right; padding-top:7px;">';
 				 
 	if (isset($_GET['type']) && $_GET['type'] == 'extended') {
 		echo '<a href="profile.php?type=reduced'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</a>';
 	} else {
 		echo '<a href="profile.php?type=extended'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</a>';
 	}
-	echo '</span>';
+	//echo '</span>';
 
 	echo '</div>';
 }
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 6f8a32e0d6..7c935f1aad 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -571,10 +571,13 @@ class SocialManager extends UserManager {
 			echo '<a href="/main/social/friends.php">'.Display::return_icon('lp_users.png').' '.get_lang('Friends').'</a>';
 			echo '<a href="/main/social/invitations.php">'.Display::return_icon('lp_users.png').' '.get_lang('Invitations').'</a>';
 			echo '<a href="/main/social/groups.php">'.Display::return_icon('group.gif').' '.get_lang('MyGroups').'</a>';
-			echo '<a href="/main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a>';	
+			echo '<a href="/main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a>';
+			echo '<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';	
+			/*
 			echo '<span style="float:right; padding-top:7px;">'.
 				 '<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
-				 '</span>';		 
+				 '</span>';
+			*/		 
 		echo '</div>';
 	}
 }
\ No newline at end of file
diff --git a/main/social/home.php b/main/social/home.php
index f046a7d69f..ba0f47779a 100644
--- a/main/social/home.php
+++ b/main/social/home.php
@@ -265,10 +265,13 @@ echo '<a href="../messages/inbox.php">'.Display::return_icon('inbox.png').' '.ge
 echo '<a href="group.php">'.Display::return_icon('group.gif').' '.get_lang('MyGroups').'</a>';
 echo '<a href="/main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a>';
 
+echo '<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
+
+/*
 echo '<span style="float:right; padding-top:7px;">'.
 	 '<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
 	 '</span>';
-	 
+*/	 
 echo '</div>';
 
 

From cc51cbf16f0247004ef247424fd5b11d54776b45 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 13:25:23 -0500
Subject: [PATCH 05/22] Fixing more issues from the link delete function see
 #5229

---
 main/exercice/exercice.php        | 12 +++++++-----
 main/gradebook/gradebook.php      | 30 +++++++++++++++++------------
 main/gradebook/index.php          | 32 ++++++++++++++++++-------------
 main/newscorm/learnpath.class.php | 11 ++++++++---
 4 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index f623dae576..eaa9bae674 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -532,11 +532,13 @@ if ($is_allowedToEdit) {
 					$sql = 'SELECT gl.id FROM ' . $tbl_grade_link . ' gl WHERE gl.type="1" AND gl.ref_id="' . $exerciseId . '";';
 					$result = Database::query($sql, __FILE__, __LINE__);
 					$row = Database :: fetch_array($result, 'ASSOC');
-
-					$link = LinkFactory :: load($row['id']);
-					if ($link[0] != null) {
-						$link[0]->delete();
-					}
+					//see 
+					if (!empty($row['id'])) {
+                 		$link = LinkFactory :: load($row['id']);
+                     		if ($link[0] != null) {
+                            	$link[0]->delete();
+                     		}
+           			}
 					Display :: display_confirmation_message(get_lang('ExerciseDeleted'));
 					break;
 				case 'enable' : // enables an exercise
diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php
index 56e57179dc..a5f4cb1168 100644
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@@ -269,15 +269,18 @@ if (isset ($_GET['visiblelink'])) {
 }
 if (isset ($_GET['deletelink'])) {
 	block_students();
-	$link= LinkFactory :: load(Security::remove_XSS($_GET['deletelink']));
-	if ($link[0] != null) {
-		$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.Security::remove_XSS($_GET['deletelink']).');';
-		Database::query($sql);
-		$link[0]->delete();
+	//fixing #5229
+	if (!empty($_GET['deletelink'])) {	
+		$link= LinkFactory :: load(Security::remove_XSS($_GET['deletelink']));
+		if ($link[0] != null) {
+			$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.Security::remove_XSS($_GET['deletelink']).');';
+			Database::query($sql);
+			$link[0]->delete();
+		}
+		unset ($link);
+		$confirmation_message = get_lang('LinkDeleted');
+		$filter_confirm_msg = false;
 	}
-	unset ($link);
-	$confirmation_message = get_lang('LinkDeleted');
-	$filter_confirm_msg = false;
 }
 $course_to_crsind = isset ($course_to_crsind) ? $course_to_crsind : '';
 if ($course_to_crsind && !isset($_GET['confirm'])) {
@@ -328,11 +331,14 @@ if (isset ($_POST['action'])) {
 						$number_of_deleted_evaluations++;
 					}
 					if (api_substr($indexstr, 0, 4) == 'LINK') {
-						$link= LinkFactory :: load(api_substr($indexstr, 4));
-						if ($link[0] != null) {
-							$link[0]->delete();
+						$id = api_substr($indexstr, 4);
+						if (!empty($id)) {
+							$link= LinkFactory :: load();
+							if ($link[0] != null) {
+								$link[0]->delete();
+							}
+							$number_of_deleted_links++;
 						}
-						$number_of_deleted_links++;
 					}
 				}
 				$confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 003387d08f..321070a03a 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -327,15 +327,18 @@ if (isset ($_GET['visiblelink'])) {
 if (isset ($_GET['deletelink'])) {
 	block_students();
 	$get_delete_link=Security::remove_XSS($_GET['deletelink']);
-	$link= LinkFactory :: load($get_delete_link);
-	if ($link[0] != null) {
-		$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.$get_delete_link.');';
-		Database::query($sql);
-		$link[0]->delete();
+	//fixing #5229
+	if (!empty($get_delete_link)) {
+		$link= LinkFactory :: load($get_delete_link);
+		if ($link[0] != null) {
+			$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.$get_delete_link.');';
+			Database::query($sql);
+			$link[0]->delete();
+		}
+		unset ($link);
+		$confirmation_message = get_lang('LinkDeleted');
+		$filter_confirm_msg = false;
 	}
-	unset ($link);
-	$confirmation_message = get_lang('LinkDeleted');
-	$filter_confirm_msg = false;
 }
 
 if (!empty($course_to_crsind) && !isset($_GET['confirm'])) {
@@ -387,12 +390,15 @@ if (isset ($_POST['action'])) {
 						$number_of_deleted_evaluations++;
 					}
 					if (substr($indexstr, 0, 4) == 'LINK') {
-						$link= LinkFactory :: load(substr($indexstr, 4));
-						if ($link[0] != null) {
-							$link[0]->delete();
+						//fixing #5229
+						$id = substr($indexstr, 4);
+						if (!empty($id)) {
+							$link= LinkFactory :: load($id);
+							if ($link[0] != null) {
+								$link[0]->delete();
+							}
+							$number_of_deleted_links++;
 						}
-
-						$number_of_deleted_links++;
 					}
 				}
 				$confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 46b631ee9e..2c059279f5 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -883,10 +883,15 @@ class learnpath {
 		$sql = 'SELECT gl.id FROM ' . $tbl_grade_link . ' gl WHERE gl.type="4" AND gl.ref_id="' . $id . '";';
 		$result = Database::query($sql, __FILE__, __LINE__);
 		$row = Database :: fetch_array($result, 'ASSOC');
-		$link = LinkFactory :: load($row['id']);
-		if ($link[0] != null) {
-			$link[0]->delete();
+		
+		//fixing gradebook link deleted see #5229
+		if (!empty($row['id'])) {
+	   		$link = LinkFactory :: load($row['id']);
+	    	if ($link[0] != null) {
+	       		$link[0]->delete();
+	    	}
 		}
+		
 		//TODO: also delete items and item-views
 		if (api_get_setting('search_enabled') == 'true') {
 			require_once (api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');

From d7600dc5cceb548a51058925b1e116b1d1a8b907 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 13:27:59 -0500
Subject: [PATCH 06/22] UI improvements - user groups see #5508

---
 main/admin/add_users_to_group.php         |  62 +++++------
 main/admin/add_users_to_session.php       |   2 +-
 main/admin/group_list.php                 |   6 +-
 main/css/blue_lagoon/default.css          |  12 ++
 main/img/unknown_50_50.jpg                | Bin 0 -> 1634 bytes
 main/img/unknown_group.png                | Bin 0 -> 3999 bytes
 main/inc/lib/group_portal_manager.lib.php | 129 ++++++++++------------
 main/inc/lib/usermanager.lib.php          |  19 +++-
 main/social/groups.php                    |  20 ++--
 9 files changed, 130 insertions(+), 120 deletions(-)
 create mode 100644 main/img/unknown_50_50.jpg
 create mode 100644 main/img/unknown_group.png

diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index f30b46287b..29ba17c402 100644
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -39,7 +39,7 @@ $tbl_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
 $tool_name = get_lang('SubscribeUsersToGroup');
 $group_id = intval($_GET['id']);
 
-$add_type = 'single';
+$add_type = 'multiple';
 if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
@@ -210,13 +210,17 @@ if($_POST['form_sent']) {
 	$UserList			= $_POST['sessionUsersList'];
 	$ClassList			= $_POST['sessionClassesList'];
 	
+	$group_id			= intval($_POST['id']);
+	
 	if(!is_array($UserList)) {
 		$UserList=array();
 	}
 
 	if ($form_sent == 1) {
-		//added a parameter to send emails when registering a user
-	//	SessionManager::suscribe_users_to_session($id_session,$UserList,true,true);
+		$result = GroupPortalManager::add_users_to_groups($UserList, array($group_id));
+		
+		
+		//SessionManager::suscribe_users_to_session($id_session,$UserList,true,true);
 
 		//adding the session to the access_url_rel_session table
 		/*global $_configuration;
@@ -269,7 +273,7 @@ if ($ajax_search) {
 				WHERE access_url_id = $access_url_id
 				$order_clause";
 		}
-	}
+	}	
 	$result=Database::query($sql,__FILE__,__LINE__);
 	$Users=Database::store_result($result);
 	foreach ($Users as $user) {
@@ -332,14 +336,12 @@ if ($ajax_search) {
 				LEFT JOIN $tbl_session_rel_user
 				ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session'
 				$where_filter
-			$order_clause";
-			
-		} else {
-			
+			$order_clause";			
+		} else {			
 			$sql="SELECT  u.user_id, lastname, firstname, username, group_id
 				FROM $tbl_user u
 				LEFT JOIN $tbl_group_rel_user gu
-				ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id
+				ON (gu.user_id = u.user_id) AND gu.group_id = $group_id
 			$order_clause";
 		}
 		
@@ -364,14 +366,14 @@ if ($ajax_search) {
 			if($user['group_id'] != $group_id)
 				$nosessionUsersList[$user['user_id']] = $user ;
 		}
-		var_dump($nosessionUsersList);
+		
 		$user_anonymous=api_get_anonymous_id();
-	/*	foreach($nosessionUsersList as $key_user_list =>$value_user_list) {
+		foreach($nosessionUsersList as $key_user_list =>$value_user_list) {
 			if ($nosessionUsersList[$key_user_list]['user_id']==$user_anonymous) {
 				unset($nosessionUsersList[$key_user_list]);
 			}
-		}*/
-		
+		}
+
 		//filling the correct users in list
 		$sql="SELECT u.user_id, lastname, firstname, username, group_id
 			FROM $tbl_user u
@@ -392,6 +394,7 @@ if ($ajax_search) {
 				$order_clause";
 			}
 		}
+		
 		$result=Database::query($sql,__FILE__,__LINE__);
 		$Users=Database::store_result($result);
 		
@@ -402,7 +405,7 @@ if ($ajax_search) {
 		}
 		
 		foreach ($Users as $user) {
-			if($user['group_id'] == $group_id){
+			if($user['group_id'] == $group_id) {
 				$sessionUsersList[$user['user_id']] = $user;
 				if (array_key_exists($user['user_id'],$nosessionUsersList))
 		            unset($nosessionUsersList[$user['user_id']]);
@@ -411,25 +414,21 @@ if ($ajax_search) {
 }
 
 if ($add_type == 'multiple') {
-	//$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-	//$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+	$link_add_type_unique = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
 } else {
-	//$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-	//$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
-	/*
-	 * <div class="actions">
-	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
-</div>
-	 */
+	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
+	$link_add_type_multiple = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
-
-
 ?>
 
+<div class="actions">
+	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
+</div>
 
 <?php echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info['name'].')</div></div><br/>'; ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']); ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $group_id; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
 
 <?php
 if ($add_type=='multiple') {
@@ -461,6 +460,7 @@ if ($add_type=='multiple') {
 ?>
 
 <input type="hidden" name="form_sent" value="1" />
+<input type="hidden" name="id" value="<?=$group_id?>" />
 <input type="hidden" name="add_type"  />
 
 <?php
@@ -537,7 +537,7 @@ if(!empty($errorMsg)) {
 	<?php
   }
   ?>
-	<br /><br /><br /><br /><br /><br />
+	<br /><br /><br /><br /><br />
   </td>
   <td align="center">
   <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:360px;">
@@ -559,13 +559,7 @@ unset($sessionUsersList);
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add'])) {
-			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
-        } else {
-            //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
-			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToGroup').'</button>';
-
-        }
+		echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToGroup').'</button>';
 		?>
 	</td>
 </tr>
diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php
index 45118252d7..e2ce57673a 100644
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
@@ -373,7 +373,7 @@ if ($ajax_search) {
 			$order_clause";
 			}
 		}
-
+		echo $sql;
 		$result=Database::query($sql,__FILE__,__LINE__);
 		$Users=Database::store_result($result);
 		//var_dump($_REQUEST['id_session']);
diff --git a/main/admin/group_list.php b/main/admin/group_list.php
index 57392b22be..5c72c03921 100644
--- a/main/admin/group_list.php
+++ b/main/admin/group_list.php
@@ -105,8 +105,8 @@ function get_group_data($from, $number_of_items, $column, $direction)
 
 	$users = array ();
     $t = time();
-	while ($group = Database::fetch_row($res)) {
-        // forget about the expiration date field		      
+	while ($group = Database::fetch_row($res)) {		
+		$group['1'] = '<a href="/main/social/groups.php?id='.$group['0'].'">'.$group['1'].'</a>';      
         $groups[] = $group;
 	}
 	return $groups;
@@ -180,8 +180,6 @@ function modify_filter($group_id,$url_params,$row)
 		$result .= '<a href="'.api_get_path(WEB_CODE_PATH).'admin/add_users_to_group.php?id='.$group_id.'">'.Display::return_icon('add_user_big.gif',get_lang('AddUsersToGroup')).'</a>';
 		$result .= '<a href="group_edit.php?id='.$group_id.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>&nbsp;&nbsp;';
 		$result .= '<a href="group_list.php?action=delete_group&amp;group_id='.$group_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>';
-		
-		
 	}
 	return $result;
 }
diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 1ce2a5edd9..ad5a4b6588 100644
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -2616,6 +2616,8 @@ input.arrowl {
 
 
 /* UI improvements */
+
+
 * {
 	outline :none;
 }
@@ -2641,3 +2643,13 @@ input, select, textarea {
 input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	background-image:url(images/shadow.gif);
 }
+
+
+
+.independent_course_item a {
+	font-size:120%;
+}
+
+.session_course_item a {
+	font-size:120%;
+}
diff --git a/main/img/unknown_50_50.jpg b/main/img/unknown_50_50.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..43979663987153f2f8b431e8ed0d5579f7f5d869
GIT binary patch
literal 1634
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
QW;c7y_@zFqZq?|204k{7r2qf`

literal 0
HcmV?d00001

diff --git a/main/img/unknown_group.png b/main/img/unknown_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fdfcbb3a79f4a097e6932d81c3d0fe18b6a0673
GIT binary patch
literal 3999
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
FV1h+og_r;U

literal 0
HcmV?d00001

diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 54250239fa..3db68a094c 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -4,7 +4,7 @@
 ==============================================================================
 *	This library provides functions for the access_url management.
 *	Include/require it in your code to use its functionality.
-*
+*	@author Julio Montoya <gugli100@gmail.com>
 *	@package dokeos.library
 ==============================================================================
 */
@@ -147,7 +147,10 @@ class GroupPortalManager
 	/**
 	 * Gets data of all groups
 	 * @author Julio Montoya
-	 * @return array
+	 * @param int	visibility
+	 * @param int	from which record the results will begin (use for pagination)
+	 * @param int	number of items
+	 * @return array	
 	 * */
 	function get_all_group_data($visibility = GROUP_PERMISSION_OPEN, $from=0, $number_of_items=10)	
 	{
@@ -163,6 +166,11 @@ class GroupPortalManager
 		return $data;
 	}
 	
+	/**
+	 * Gets the group data
+	 * 
+	 * 
+	 */
 	function get_group_data($group_id)	
 	{
 		$table	= Database :: get_main_table(TABLE_MAIN_GROUP);
@@ -177,6 +185,12 @@ class GroupPortalManager
 		return $item;
 	}
 	
+	/**
+	 * Gets the tags from a given group
+	 * @param int	group id
+	 * @param bool show group links or not 
+	 * 
+	 */
 	function get_group_tags($group_id, $show_tag_links = true)	
 	{
 		$tag					= Database :: get_main_table(TABLE_MAIN_TAG);
@@ -283,7 +297,7 @@ class GroupPortalManager
 		$array = array();
 		while ($row = Database::fetch_array($result, 'ASSOC')) {
 				if ($with_image == true) {
-					$picture = UserManager::get_picture_user($row['user_id'], $row['picture_uri'],80);
+					$picture = UserManager::get_picture_user($row['user_id'], $row['picture_uri'],80,'medium_');
 					$img = '<img src="'.$picture['file'].'" />';
 					$row['picture_uri'] = $img;
 				}
@@ -374,8 +388,9 @@ class GroupPortalManager
 	* @author Julio Montoya
 	* @param int user id
 	* @param int group_id
-	* @return boolean true if success
+	* @return int 0 if there are not relationship otherwise return GROUP_USER_PERMISSION_ADMIN or GROUP_USER_PERMISSION_READER constants
 	* */
+	
 	function get_user_group_role($user_id, $group_id)
 	{
 		$table_group_rel_user= Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
@@ -425,35 +440,6 @@ class GroupPortalManager
 	}
 
 
-	/**
-	 * Add a group of users into a group of URLs
-	 * @author Julio Montoya
-	 * @param  array of user_ids
-	 * @param  array of url_ids
-	 * */
-	function add_users_to_urls($user_list, $url_list)
-	{
-		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-		$result_array=array();
-
-		if (is_array($user_list) && is_array($url_list)){
-			foreach ($url_list as $url_id) {
-				foreach ($user_list as $user_id) {
-					$count = UrlManager::relation_url_user_exist($user_id,$url_id);
-					if ($count==0) {
-						$sql = "INSERT INTO $table_url_rel_user
-		               			SET user_id = ".Database::escape_string($user_id).", access_url_id = ".Database::escape_string($url_id);
-						$result = Database::query($sql, __FILE__, __LINE__);
-						if($result)
-							$result_array[$url_id][$user_id]=1;
-						else
-							$result_array[$url_id][$user_id]=0;
-					}
-				}
-			}
-		}
-		return 	$result_array;
-	}
 
 
 	/**
@@ -539,34 +525,40 @@ class GroupPortalManager
 		}
 		return $result;
 	}
-
-	function add_course_to_url($course_code, $url_id=1)
-	{
-		$table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-		if (empty($url_id)) $url_id=1;
-		$count = UrlManager::relation_url_course_exist($course_code,$url_id);
-		if (empty($count)) {
-			$sql = "INSERT INTO $table_url_rel_course
-           			SET course_code = '".Database::escape_string($course_code)."', access_url_id = ".Database::escape_string($url_id);
-			$result = Database::query($sql, __FILE__, __LINE__);
+	
+	
+	/**
+	 * Add a group of users into a group of URLs
+	 * @author Julio Montoya
+	 * @param  array of user_ids
+	 * @param  array of url_ids
+	 * */
+	function add_users_to_groups($user_list, $group_list, $relation_type = GROUP_USER_PERMISSION_READER) {
+		$table_url_rel_group = Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$result_array = array();
+		$relation_type = intval($relation_type);
+		
+		if (is_array($user_list) && is_array($group_list)) {
+			foreach ($group_list as $group_id) {
+				foreach ($user_list as $user_id) {
+					$role = self::get_user_group_role($user_id,$group_id);
+					if ($role == 0) {
+						$sql = "INSERT INTO $table_url_rel_group
+		               			SET user_id = ".intval($user_id).", group_id = ".intval($group_id).", relation_type = ".intval($relation_type)."";
+		               	
+						$result = Database::query($sql, __FILE__, __LINE__);
+						if ($result)
+							$result_array[$group_id][$user_id]=1;
+						else
+							$result_array[$group_id][$user_id]=0;
+					}
+				}
+			}
 		}
-		return $result;
+		return 	$result_array;
 	}
 
 
-	function add_session_to_url($session_id, $url_id=1)
-	{
-		$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-		if (empty($url_id)) $url_id=1;
-		$count = UrlManager::relation_url_session_exist($session_id,$url_id);
-		if (empty($count)) {
-			$sql = "INSERT INTO $table_url_rel_session
-           			SET session_id = ".Database::escape_string($session_id).", access_url_id = ".Database::escape_string($url_id);
-			$result = Database::query($sql, __FILE__, __LINE__);
-		}
-		return $result;
-	}
-
 
 	/**
 	* Deletes an url and user relationship
@@ -815,14 +807,14 @@ class GroupPortalManager
 	
 	
 	/**
-	 * Creates new user pfotos in various sizes of a user, or deletes user pfotos.
+	 * Creates new group pictures in various sizes of a user, or deletes user pfotos.
 	 * Note: This method relies on configuration setting from dokeos/main/inc/conf/profile.conf.php
-	 * @param int $user_id			The user internal identitfication number.
-	 * @param string $file			The common file name for the newly created pfotos. It will be checked and modified for compatibility with the file system.
+	 * @param	int	The group id 
+	 * @param	string $file			The common file name for the newly created pfotos. It will be checked and modified for compatibility with the file system.
 	 * If full name is provided, path component is ignored.
 	 * If an empty name is provided, then old user photos are deleted only, @see UserManager::delete_user_picture() as the prefered way for deletion.
-	 * @param string $source_file	The full system name of the image from which user photos will be created.
-	 * @return string/bool			Returns the resulting common file name of created images which usually should be stored in database.
+	 * @param	string		$source_file	The full system name of the image from which user photos will be created.
+	 * @return	string/bool	Returns the resulting common file name of created images which usually should be stored in database.
 	 * When deletion is recuested returns empty string. In case of internal error or negative validation returns FALSE.
 	 */
 	public static function update_group_picture($group_id, $file = null, $source_file = null) {
@@ -919,7 +911,7 @@ class GroupPortalManager
 	}
 	
 	/**
-	 * Get user picture URL or path from user ID (returns an array).
+	 * Gets the group picture URL or path from group ID (returns an array).
 	 * The return format is a complete path, enabling recovery of the directory
 	 * with dirname() or the file with basename(). This also works for the
 	 * functions dealing with the user's productions, as they are located in
@@ -981,7 +973,7 @@ class GroupPortalManager
 		return array('dir' => $dir, 'file' => $picture_filename);
 	}
 	
-	    /**
+	/**
 	 * Resize a picture
 	 *
 	 * @param  string file picture
@@ -1006,10 +998,11 @@ class GroupPortalManager
 		}
 		return $temp;
 	}
-	    /**
-     * Gets the current user image
-     * @param string user id
-     * @param string picture user name
+	
+	/**
+     * Gets the current group image
+     * @param string group id
+     * @param string picture group name
      * @param string height
      * @param string picture size it can be small_,  medium_  or  big_
      * @param string style css
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 12d80cc23e..749f6ee257 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -2208,8 +2208,18 @@ class UserManager
             $file = $image_array_sys['dir'].$picture_file;            
 			if (file_exists($file) && !is_dir($file)) {				
 				$picture['file'] = $image_array['dir'].$picture_file;
-			} else {				
-				$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
+			} else {
+				switch ($size_picture) {
+					case 'big_' : 
+						$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg'; break;
+					case 'medium_' : 
+						$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_50_50.jpg'; break;
+					case 'small_' : 
+						$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg'; break;
+					default:
+						$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg'; break;
+				}
+				
 			}
 		}
 		return $picture;
@@ -2565,10 +2575,9 @@ class UserManager
 			$where_field = " field_id = $field_id AND ";
 		}
 		// all the information of the field
-		 $sql = "SELECT u.user_id,u.username,firstname, lastname, email, tag, picture_uri FROM $table_user_tag ut INNER JOIN $table_user_tag_values uv ON (uv.tag_id=ut.id)
+		$sql = "SELECT u.user_id,u.username,firstname, lastname, email, tag, picture_uri FROM $table_user_tag ut INNER JOIN $table_user_tag_values uv ON (uv.tag_id=ut.id)
 				INNER JOIN $user_table u ON(uv.user_id =u.user_id)
-				WHERE $where_field tag LIKE '$tag%' ORDER BY tag";
-				
+				WHERE $where_field tag LIKE '$tag%' ORDER BY tag";				
 		$sql .= " LIMIT $from,$number_of_items";
 		
 		$result = Database::query($sql, __FILE__, __LINE__);
diff --git a/main/social/groups.php b/main/social/groups.php
index 7f123fb520..312225e471 100644
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -25,9 +25,13 @@ if ($group_id != 0 ) {
 	$picture	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
 	$tags		= GroupPortalManager::get_group_tags($group_id,true);
 	$users		= GroupPortalManager::get_users_by_group($group_id,true);
-		
-		
-	//var_dump($users);
+	
+	//@todo this must be move to default.css for dev use only
+	echo '<style> 		
+			#group_members { width:250px; height:300px; overflow-x:none; overflow-y: auto;}
+			.group_member_item { width:80px; float:left;}
+			
+	</style>';
 	
 	
 	//Group's title
@@ -60,13 +64,13 @@ if ($group_id != 0 ) {
 		echo '</div>';
 	}
 	
-	echo '<div id="group_members">';
-		echo get_lang('Members').' : ';
-		foreach($users as $user) {	
-			echo $user['picture_uri'].$user['firstname'].$user['lastname'].'<br />';
+	echo get_lang('Members').' : ';
+	echo '<div id="group_members">';		
+		foreach($users as $user) {			
+			echo '<div class="group_member_item">'.$user['picture_uri'].$user['firstname'].$user['lastname'].'</div>';
 		}
 	echo '</div>';
-		
+	
 		
 	echo '<div id="group_permissions">';
 	if (in_array(api_get_user_id(), $users)) {

From 1590ef200155f50135a5300a8df8a92e350783ae Mon Sep 17 00:00:00 2001
From: Arthur Portugal <yukiportu@msn.com>
Date: Mon, 23 Nov 2009 14:12:38 -0500
Subject: [PATCH 07/22] Fixed when add a new exercise the exam not save the
 time control DT#5496

---
 main/exercice/exercise.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 718fc4e87e..28d455aeaa 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -576,7 +576,7 @@ class Exercise
 			$cond1=Database::escape_string(Security::remove_XSS($exercise));
 			$cond2=Database::escape_string(Security::remove_XSS(api_html_entity_decode($description),COURSEMANAGERLOWSECURITY));
 		}*/
-			$sql="INSERT INTO $TBL_EXERCICES (start_time, end_time, title, description, sound, type, random,active, results_disabled, max_attempt, feedback_type, session_id)
+			$sql="INSERT INTO $TBL_EXERCICES (start_time, end_time, title, description, sound, type, random,active, results_disabled, max_attempt, feedback_type, expired_time, session_id)
 					VALUES(
 						'$start_time','$end_time',
 						'".Database::escape_string($exercise)."',
@@ -588,6 +588,7 @@ class Exercise
 						'".Database::escape_string($results_disabled)."',
 						'".Database::escape_string($attempts)."',
 						'".Database::escape_string($feedbacktype)."',
+						'".Database::escape_string($expired_time)."',
 						'".Database::escape_string($session_id)."'
 						)";
 			Database::query($sql,__FILE__,__LINE__);
@@ -983,7 +984,6 @@ class Exercise
       $form -> addElement('text', 'enabletimercontroltotalminutes',get_lang('ExerciseTotalDurationInMinutes'),array('style' => 'width : 35px'));
       
       
-      
       $form -> addElement('html','</div>');
 			//$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2'));        
       
@@ -1099,7 +1099,7 @@ class Exercise
 		$this -> updateType($form -> getSubmitValue('exerciseType'));
 		$this -> setRandom($form -> getSubmitValue('randomQuestions'));
 		$this -> updateResultsDisabled($form -> getSubmitValue('results_disabled'));
-    $this -> updateExpiredTime($form -> getSubmitValue('enabletimercontroltotalminutes'));
+    	$this -> updateExpiredTime($form -> getSubmitValue('enabletimercontroltotalminutes'));
 		if($form -> getSubmitValue('enabletimelimit')==1) {
            $start_time = $form -> getSubmitValue('start_time');
            $this->start_time = $start_time['Y'].'-'.$start_time['F'].'-'.$start_time['d'].' '.$start_time['H'].':'.$start_time['i'].':00';

From c9fe26d1eaf256d08ab96bc0efbdd20bc2f4d326 Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 14:13:00 -0500
Subject: [PATCH 08/22] minor - fixed warning from fckeditor, rule does not
 exist as a registered rule when you add an extra field user or nonexistent
 html element when you create a course - partial DT#5496

---
 main/admin/course_add.php      | 2 +-
 main/admin/user_fields_add.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index f5eb6cf355..491d236049 100644
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -74,8 +74,8 @@ $form->applyFilter('title','trim');
 $form->add_textfield( 'visual_code', get_lang('CourseCode'),false,array('size'=>'20','maxlength'=>20));
 $form->applyFilter('visual_code','api_strtoupper');
 $form->applyFilter('visual_code','html_filter');
+$form->addRule('visual_code',get_lang('Max'),'maxlength',$maxlength);
 
-$form->addRule('wanted_code',get_lang('Max'),'maxlength',$maxlength);
 $form->addElement('select', 'tutor_id', get_lang('CourseTitular'), $teachers);
 $form->applyFilter('tutor_id','html_filter');
 
diff --git a/main/admin/user_fields_add.php b/main/admin/user_fields_add.php
index 78c0aea90f..0a2a58b512 100644
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
@@ -162,7 +162,7 @@ $form->addElement('text','fieldlabel',get_lang('FieldLabel'));
 $form->applyFilter('fieldlabel','html_filter');
 $form->addRule('fieldlabel', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
 $form->addRule('fieldlabel', '', 'maxlength',20);
-$form->addRule('fieldlabel', get_lang('FieldTaken'), 'fieldlabel_available');
+//$form->addRule('fieldlabel', get_lang('FieldTaken'), 'fieldlabel_available');
 
 // Field options possible
 $form->addElement('text','fieldoptions',get_lang('FieldPossibleValues').Display::return_icon('info3.gif', get_lang('FieldPossibleValuesComment'), array('align' => 'absmiddle', 'hspace' => '3px')));

From ff6b34b53612537aa80f0dc2a956712b53574515 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Mon, 23 Nov 2009 14:22:19 -0500
Subject: [PATCH 09/22] minor add image user tag in user_fields_add.php

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

diff --git a/main/admin/user_fields_add.php b/main/admin/user_fields_add.php
index 0a2a58b512..0fbbee2dff 100644
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
@@ -81,7 +81,7 @@ function change_image_user_field (image_value) {
 		document.getElementById(\'options\').style.display = \'none\';
 		document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
 		$("div#id_image_user_field").html("&nbsp;");
-		$("div#id_image_user_field").html('."'<br />".Display::return_icon('userfield_divider.png', get_lang('UserTag'))."'".');
+		$("div#id_image_user_field").html('."'<br />".Display::return_icon('userfield_user_tag.png', get_lang('UserTag'))."'".');
 
 	}
 }
@@ -286,7 +286,7 @@ if(!empty($defaults['fieldtype'])) {
 	} else if ($image_value==9) {
 		echo '<br />'.Display::return_icon('userfield_divider.png', get_lang('AddUserFields'));
 	} else if ($image_value==10) {
-		echo '<br />'.Display::return_icon('userfield_divider.png', get_lang('UserTag'));
+		echo '<br />'.Display::return_icon('userfield_user_tag.png', get_lang('UserTag'));
 	}
 } else {
 	echo '<br />'.Display::return_icon('userfield_text.png', get_lang('AddUserFields'));

From 91bc3a7cd66fce112adf470fd7cfa53437db93b6 Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 14:24:20 -0500
Subject: [PATCH 10/22] Fixed - display correct values from extra field user
 into reporting - partial DT#5592

---
 main/tracking/courseLog.php | 42 ++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index e75b3e5c62..1c7cb920cf 100644
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -124,7 +124,7 @@ $nbStudents = count($a_students);
 if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) { 
 	//$additional_user_profile_info = get_addtional_profile_information_of_field($_GET['additional_profile_field']);
 	$user_array = array();
-	foreach($a_students as $key=>$item){
+	foreach ($a_students as $key=>$item) {
 		$user_array[] = $key;
 	}
 	//fetching only the user that are loaded NOT ALL user in the portal
@@ -662,10 +662,12 @@ if ($_GET['studentlist'] == 'false') {
 		$table -> set_header(6, get_lang('Student_publication'),false);
 		$table -> set_header(7, get_lang('Messages'),false);
 		$table -> set_header(8, get_lang('FirstLogin'), false, 'align="center"');
-		$table -> set_header(9, get_lang('LatestLogin'), false, 'align="center"');		
-		$table -> set_header(10, get_lang('Details'),false);
+		$table -> set_header(9, get_lang('LatestLogin'), false, 'align="center"');				
 		if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
-			$table -> set_header(11, get_lang('AdditionalProfileField'),false);
+			$table -> set_header(10, get_lang('AdditionalProfileField'),false);
+			$table -> set_header(11, get_lang('Details'),false);
+        } else {
+        	$table -> set_header(10, get_lang('Details'),false);
         }
 	    if ($export_csv) {
 			$csv_content[] = array ();
@@ -703,13 +705,15 @@ if ($_GET['studentlist'] == 'false') {
 			$row[] = Tracking :: get_first_connection_date_on_the_course($student_id, $course_code);
 			$row[] = Tracking :: get_last_connection_date_on_the_course($student_id, $course_code);
 
-			$row[] = '<center><a href="../mySpace/myStudents.php?student='.$student_id.'&details=true&course='.$course_code.'&origin=tracking_course"><img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a></center>';
-			
 			// we need to display an additional profile field
 			if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
-				if (is_array($additional_user_profile_info[$student_id]))
+				if (is_array($additional_user_profile_info[$student_id])) {
 					$row[]=implode(', ', $additional_user_profile_info[$student_id]);
+				} else {
+					$row[]='&nbsp;';
+				}
 			}
+			$row[] = '<center><a href="../mySpace/myStudents.php?student='.$student_id.'&details=true&course='.$course_code.'&origin=tracking_course"><img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a></center>';
 			if ($export_csv) {
 				$row[8] = strip_tags($row[8]);
 				$row[9] = strip_tags($row[9]);
@@ -904,10 +908,10 @@ function get_addtional_profile_information_of_field_by_user($field_id, $users){
 	// Database table definition
 	$table_user 				= Database::get_main_table(TABLE_MAIN_USER);
 	$table_user_field_values 	= Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);	
-	$result 					= UserManager::get_extra_field_information($field_id);	
-	
+	$result_extra_field 		= UserManager::get_extra_field_information($field_id);	
+
 	if (!empty($users)) {
-		if ($result['field_type'] == USER_FIELD_TYPE_TAG ) {	
+		if ($result_extra_field['field_type'] == USER_FIELD_TYPE_TAG ) {	
 			foreach($users as $user_id) {
 				$user_result = UserManager::get_user_tags($user_id, $field_id);
 				$tag_list = array();
@@ -929,6 +933,24 @@ function get_addtional_profile_information_of_field_by_user($field_id, $users){
 					
 			$result = api_sql_query($sql,__FILE__,__LINE__);
 			while($row = Database::fetch_array($result)) {
+				
+				if (!empty($row['field_value'])) {
+					if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DOUBLE_SELECT) {
+						$id_double_select = explode(';',$row['field_value']);
+						$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+						$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+						$row['field_value'] = ($value1.';'.$value2);
+					} else if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DATE) {
+						$datetime = explode(';',$row['field_value']);						
+						$time = mktime(0,0,0,$datetime[1],$datetime[0],$datetime[2]);
+						$row['field_value'] = date('Y-m-d',$time);						
+					} else if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DATETIME) {
+						$datetime = explode(';',$row['field_value']);						
+						$time = mktime($datetime[3],$datetime[4],0,$datetime[1],$datetime[0],$datetime[2]);
+						$row['field_value'] = date('Y-m-d H:i:s',$time);												
+					} 
+				}
+				
 				$return[$row['user_id']][] = $row['field_value'];
 			}
 		}

From 8348478f290e8c02987505d334e91977d7571808 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Mon, 23 Nov 2009 14:27:28 -0500
Subject: [PATCH 11/22] add image userfield_user_tag.png 5496

---
 main/img/userfield_user_tag.png | Bin 0 -> 29674 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 main/img/userfield_user_tag.png

diff --git a/main/img/userfield_user_tag.png b/main/img/userfield_user_tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd650f3eefccbc7ad3af0e244741f536c9a7ed2
GIT binary patch
literal 29674
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

literal 0
HcmV?d00001


From 5db738ede283b64aa4fdee2aa52bc4fc265c576b Mon Sep 17 00:00:00 2001
From: cfasanando <cfasanando@kyu>
Date: Mon, 23 Nov 2009 14:33:38 -0500
Subject: [PATCH 12/22] merge

---
 main/social/select_options.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main/social/select_options.php b/main/social/select_options.php
index a83d2eda5e..21eef07456 100755
--- a/main/social/select_options.php
+++ b/main/social/select_options.php
@@ -11,13 +11,19 @@ $current_date=date('Y-m-d H:i:s',time());
 $html_form='<select id="id_search_name" name="id_search_name" size="8"" style="width:350px;">';
 $user_id = api_get_user_id();
 $is_western_name_order = api_is_western_name_order();
+
+
 if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
+	
 	$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
 	FROM '.$tbl_my_user_friend.' uf ' .
  	'INNER JOIN '.$tbl_my_user.' AS u  ON uf.friend_user_id = u.user_id ' .
  	'WHERE relation_type<>6 AND friend_user_id<>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
+ 	
+ 	
 } elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
 	$valid=api_get_setting('time_limit_whosonline');
+	
 	$sql='SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
 	 FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id
 	 WHERE DATE_ADD(login_date,INTERVAL "'.$valid.'" MINUTE) >= "'.$current_date.'" AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';

From 47269b0ec2fc2c9ab69beca309b125b987354a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Mon, 23 Nov 2009 20:33:51 +0100
Subject: [PATCH 13/22] cleaning the filenames and add more security to files
 uploaded from ajaxfilemanager

---
 .../editor/plugins/ajaxfilemanager/inc/class.upload.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php
index 0b352cbc67..a24cf61130 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php
@@ -6,6 +6,7 @@
 	 * @since 22/April/2007
 	 *
 	 */
+	 require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';//from Dokeos
 class Upload
 {
 	var $fileType = ""; //the file type
@@ -203,7 +204,7 @@ class Upload
 		{
 			$this->fileBaseName = $fileBaseName;
 		}
-		$this->fileBaseName=str_replace(' ','_',$this->fileBaseName);// Juan Carlos Ra�a Because fix long names. See: ajaxfilemanager/inc/class.manager.php
+		$this->fileBaseName=disable_dangerous_file(replace_dangerous_char(str_replace(' ','_',$this->fileBaseName)));// Juan Carlos Raña replace space by _ because fix long names. See: ajaxfilemanager/inc/class.manager.php. And add cleaning from dokeos replace_dangerous_char() and disable_dangerous_file()
 		$fileName = $this->fileBaseName . $this->fileExtension;
 		$filePath = $dest . $fileName;
 

From 87445d81f68c6e3caee8d868ef97c8a34efab331 Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 14:49:27 -0500
Subject: [PATCH 14/22] minor - added check for avoiding possible warning -
 partial DT#5592

---
 main/tracking/courseLog.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index 1c7cb920cf..678dc3fe3e 100644
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -937,20 +937,25 @@ function get_addtional_profile_information_of_field_by_user($field_id, $users){
 				if (!empty($row['field_value'])) {
 					if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DOUBLE_SELECT) {
 						$id_double_select = explode(';',$row['field_value']);
-						$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
-						$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
-						$row['field_value'] = ($value1.';'.$value2);
+						if (is_array($id_double_select)) {
+							$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+							$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+							$row['field_value'] = ($value1.';'.$value2);
+						}
 					} else if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DATE) {
-						$datetime = explode(';',$row['field_value']);						
-						$time = mktime(0,0,0,$datetime[1],$datetime[0],$datetime[2]);
-						$row['field_value'] = date('Y-m-d',$time);						
+						$datetime = explode(';',$row['field_value']);	
+						if (is_array($datetime)) {					
+							$time = mktime(0,0,0,$datetime[1],$datetime[0],$datetime[2]);
+							$row['field_value'] = date('Y-m-d',$time);	
+						}					
 					} else if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DATETIME) {
-						$datetime = explode(';',$row['field_value']);						
-						$time = mktime($datetime[3],$datetime[4],0,$datetime[1],$datetime[0],$datetime[2]);
-						$row['field_value'] = date('Y-m-d H:i:s',$time);												
+						$datetime = explode(';',$row['field_value']);
+						if (is_array($datetime)) {						
+							$time = mktime($datetime[3],$datetime[4],0,$datetime[1],$datetime[0],$datetime[2]);
+							$row['field_value'] = date('Y-m-d H:i:s',$time);
+						}												
 					} 
-				}
-				
+				}				
 				$return[$row['user_id']][] = $row['field_value'];
 			}
 		}

From 27f8dc6dda2d730bec20d1c43af98306a6bce34f Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Mon, 23 Nov 2009 14:54:30 -0500
Subject: [PATCH 15/22] minor one message the email and password change see
 #5403

---
 main/auth/profile.php | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/main/auth/profile.php b/main/auth/profile.php
index 3863252d2b..9741b8739c 100644
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -534,30 +534,19 @@ $msg_is_not_password = false;
 if (!empty($_SESSION['change_email'])) {
 	$msg_fail_changue_email= ($_SESSION['change_email'] == 'success');
 	unset($_SESSION['change_email']);
-}
-
-if (!empty($_SESSION['is_not_password'])) {
+} elseif (!empty($_SESSION['is_not_password'])) {
 	$msg_is_not_password = ($_SESSION['is_not_password'] == 'success');
 	unset($_SESSION['is_not_password']);
-}
-
-if (!empty($_SESSION['profile_update'])) {
+} elseif (!empty($_SESSION['profile_update'])) {
 	$update_success = ($_SESSION['profile_update'] == 'success');
 	unset($_SESSION['profile_update']);
-}
-
-if (!empty($_SESSION['image_uploaded'])) {
+} elseif (!empty($_SESSION['image_uploaded'])) {
 	$upload_picture_success = ($_SESSION['image_uploaded'] == 'success');
 	unset($_SESSION['image_uploaded']);
-}
-
-if (!empty($_SESSION['production_uploaded'])) {
-
+} elseif (!empty($_SESSION['production_uploaded'])) {
 	$upload_production_success = ($_SESSION['production_uploaded'] == 'success');
 	unset($_SESSION['production_uploaded']);
-
 } elseif (isset($_POST['remove_production'])) {
-
 	foreach (array_keys($_POST['remove_production']) as $production) {
 		UserManager::remove_user_production($_user['user_id'], urldecode($production));
 	}
@@ -566,7 +555,6 @@ if (!empty($_SESSION['production_uploaded'])) {
 	}
 	$form->removeElement('productions_list');
 	$file_deleted = true;
-
 } elseif ($form->validate()) {
 
 	$wrong_current_password = false;
@@ -819,4 +807,4 @@ if (api_get_setting('allow_message_tool') == 'true') {
 }
 echo '</div>';
 $form->display();
-Display :: display_footer();
+Display :: display_footer();
\ No newline at end of file

From ac9f9d2233f57162fbb874890c345b30abab190b Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 15:36:52 -0500
Subject: [PATCH 16/22] updated

---
 documentation/changelog.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/documentation/changelog.html b/documentation/changelog.html
index 5bf111f479..88c4bcdc50 100644
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -42,7 +42,14 @@
   <li>Added when a user is enrolled only in one course, go directly to the course after the login (defined by the platform administrator through platform administration > configuration setting > training)- DT#3466</li>
   <li>Added user' photo into user list interface - DT#5496</li>
   <li>Disabled field trainers(tutor name) in create course form from user portal, by default is current user's name, you can modify this field into setting course - DT#5496 </li>
-  <li>Added option to export the trainings list to CSV file in Administration>Trainings - DT#4256</li>	
+  <li>Added option to export the trainings list to CSV file in Administration>Trainings - DT#4256</li>
+  <li>Gradebook automatic deleted bug of a link fixed DT#5229</li>
+  <li>User tags added DT#5508</li>
+  <li>Who is online look revamped DT#5490</li>
+  <li>New search tool added DT#5610 </li>	
+  <li>User groups added</li>  
+  <li>Social network tab added</li>
+
 </ul>
 <h3>Debugging</h3>
 <ul>

From 6b2fba8b8e6ff8f80084600f9ede06f6c9ba2046 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 15:40:07 -0500
Subject: [PATCH 17/22] Minor UI improvements

---
 main/css/blue_lagoon/default.css |  9 ++++++---
 main/social/groups.php           | 27 ++++++++++++++++-----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index dcff7e9b6b..08e7a74455 100644
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -149,7 +149,7 @@ input.link_alike:hover {
 .coursestatusicons {
 	border: 0px solid #000;
 	float: left;
-	padding-right: 5px;
+	padding-right: 8px;
 	width: auto;
 }
 /* user_portal course list */
@@ -2653,8 +2653,6 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	background-image:url(images/shadow.gif);
 }
 
-
-
 .independent_course_item a {
 	font-size:120%;
 }
@@ -2662,3 +2660,8 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 .session_course_item a {
 	font-size:120%;
 }
+
+
+#maincontent .courseslist li {
+	margin-bottom:8px;
+}
\ No newline at end of file
diff --git a/main/social/groups.php b/main/social/groups.php
index 312225e471..1827bd29ca 100644
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -20,7 +20,7 @@ echo '</div>';
 
 $group_id	= intval($_GET['id']);
 
-if ($group_id != 0 ) {	
+if ($group_id != 0 ) {
 	$group_info = GroupPortalManager::get_group_data($group_id); 
 	$picture	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
 	$tags		= GroupPortalManager::get_group_tags($group_id,true);
@@ -73,30 +73,35 @@ if ($group_id != 0 ) {
 	
 		
 	echo '<div id="group_permissions">';
-	if (in_array(api_get_user_id(), $users)) {
+
+
+	
+	if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
 		//im a member
-		if (isset($users[api_get_user_id()]) && $users[api_get_user_id()]['relation_info']!='') {
-			$my_group_role = $users[api_get_get_user_id()]['relation_info'];
+
+		if ($users[api_get_user_id()]['relation_type']!='') {
+			
+			$my_group_role = $users[api_get_user_id()]['relation_type'];
 			// just a reader
 			if ($my_group_role  == GROUP_USER_PERMISSION_READER) {
-				echo 'Im just a reader';
-				echo 'Invite others';
-				echo 'Leave group';
+				echo 'Leave group/';
+				echo 'Invite others/';				
 			//the main admin
 			} elseif ($my_group_role  == GROUP_USER_PERMISSION_ADMIN) {
-				echo 'Imm the admin';
-				echo 'Edit group';
+				echo 'Im the admin/';
+				echo 'Edit group/';
 				echo 'Invite others';					
 			}
 		} else {
 			//im not a member
-			echo 'I should register';
+			echo 'Join group';
 		}
 	} else {
 		//im not a member
-		echo 'I should register';		 		
+		echo 'Join group';		 		
 	}	
 	echo '</div>';
+
 	
 } else {
 	echo '<h1>'.get_lang('Newest').'</h1>';

From 1c9548e11c5a9807bbb0c9a6aa2506bdf4dd8be0 Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Mon, 23 Nov 2009 15:42:55 -0500
Subject: [PATCH 18/22] Fixed -  values by default now is shown  for extra user
 fields into registration -  DT#5591

---
 main/auth/inscription.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index c8b4c540d8..1cfef07b08 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -380,6 +380,7 @@ if (api_get_setting('openid_authentication') == 'true' && !empty($_GET['openid']
 	$defaults['openid'] = Security::remove_XSS($_GET['openid']);
 }
 $defaults['status'] = STUDENT;
+$defaults = array_merge($defaults, $extra_data);
 $form->setDefaults($defaults);
 
 if ($form->validate()) {

From 6e965b8cadf7ea240ff74c61de3835450dd18918 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 16:24:06 -0500
Subject: [PATCH 19/22] Fixing admin funcionality add user to group see #5611

---
 main/admin/add_users_to_group.php         |  2 +
 main/inc/lib/display.lib.php              |  1 +
 main/inc/lib/group_portal_manager.lib.php | 84 +++++++++++++++++++++--
 main/inc/lib/sortabletable.class.php      | 11 ++-
 main/inc/lib/usermanager.lib.php          |  2 +-
 main/social/groups.php                    | 43 ++++++++++--
 6 files changed, 126 insertions(+), 17 deletions(-)

diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index 29ba17c402..94831ad06d 100644
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -217,6 +217,8 @@ if($_POST['form_sent']) {
 	}
 
 	if ($form_sent == 1) {
+		
+		GroupPortalManager::delete_users($group_id);
 		$result = GroupPortalManager::add_users_to_groups($UserList, array($group_id));
 		
 		
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index f862c81328..9291b4c518 100644
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -317,6 +317,7 @@ class Display {
 		$column =  0;
 		$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;
 		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);		
+		
 		if (is_array($query_vars)) {
 			$table->set_additional_parameters($query_vars);
 		}		
diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 3db68a094c..1ef04b3f2d 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -260,7 +260,7 @@ class GroupPortalManager
 		$sql = "SELECT g.picture_uri, g.name, g.description, g.id  
 				FROM $tbl_group g
 				INNER JOIN $table_group_rel_user gu
-				ON gu.group_id = g.id WHERE gu.user_id = $user_id $where_relation_condition ";
+				ON gu.group_id = g.id WHERE gu.user_id = $user_id $where_relation_condition ORDER BY created_on desc ";
 				
 		$result=Database::query($sql,__FILE__,__LINE__);
 		$array = array();
@@ -275,6 +275,76 @@ class GroupPortalManager
 		return $array;
 	}
 	
+	
+		/** Gets the inner join of users and group table
+	 * @author Julio Montoya
+	 * @return int  access url id
+	 * @return array   Database::store_result of the result
+	 * */
+	function get_groups_by_popularity($num = 10, $with_image = false)
+	{
+		$where = '';
+		$table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);	
+		if (empty($num)) {
+			$num = 10;
+		} else {
+			$num = intval($num);
+		}
+		
+		$sql = "SELECT count(user_id) as count, g.picture_uri, g.name, g.description, g.id  
+				FROM $tbl_group g
+				INNER JOIN $table_group_rel_user gu
+				ON gu.group_id = g.id GROUP BY g.id ORDER BY count DESC LIMIT $num";
+				
+		$result=Database::query($sql,__FILE__,__LINE__);
+		$array = array();
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+				if ($with_image == true) {
+					$picture = self::get_picture_group($row['id'], $row['picture_uri'],80);
+					$img = '<img src="'.$picture['file'].'" />';
+					$row['picture_uri'] = $img;
+				}
+				$array[$row['id']] = $row;			
+		}
+		return $array;
+	}
+	
+	/** Gets the last groups created
+	 * @author Julio Montoya
+	 * @return int  access url id
+	 * @return array   Database::store_result of the result
+	 * */
+	function get_groups_by_age($num = 10, $with_image = false)
+	{
+		$where = '';
+		$table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
+
+		if (empty($num)) {
+			$num = 10;
+		} else {
+			$num = intval($num);
+		}
+		$sql = "SELECT g.picture_uri, g.name, g.description, g.id  
+				FROM $tbl_group g
+				INNER JOIN $table_group_rel_user gu
+				ON gu.group_id = g.id ORDER BY created_on desc LIMIT $num ";
+				
+		$result=Database::query($sql,__FILE__,__LINE__);
+		$array = array();
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+				if ($with_image == true) {
+					$picture = self::get_picture_group($row['id'], $row['picture_uri'],80);
+					$img = '<img src="'.$picture['file'].'" />';
+					$row['picture_uri'] = $img;
+				}
+				$array[$row['id']] = $row;			
+		}
+		return $array;
+	}
+	
+	
 	function get_users_by_group($group_id='', $with_image = false)
 	{
 		$where = '';
@@ -396,10 +466,10 @@ class GroupPortalManager
 		$table_group_rel_user= Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
 		$return_value = 0;
 		if (!empty($user_id) && !empty($group_id)) {
-			$sql	= "SELECT relation_type FROM $table_group_rel_user WHERE id = ".intval($group_id)." AND  user_id = ".intval($user_id)." ";
+			$sql	= "SELECT relation_type FROM $table_group_rel_user WHERE group_id = ".intval($group_id)." AND  user_id = ".intval($user_id)." ";
 			$result = Database::query($sql,  __FILE__, __LINE__);		
 			if (Database::num_rows($result)>0) {	
-				$row 	= Database::fetch_row($result);
+				$row = Database::fetch_array($result,'ASSOC');
 				$return_value = $row['relation_type'];
 			}			
 		}
@@ -545,7 +615,7 @@ class GroupPortalManager
 					if ($role == 0) {
 						$sql = "INSERT INTO $table_url_rel_group
 		               			SET user_id = ".intval($user_id).", group_id = ".intval($group_id).", relation_type = ".intval($relation_type)."";
-		               	
+		      		               	
 						$result = Database::query($sql, __FILE__, __LINE__);
 						if ($result)
 							$result_array[$group_id][$user_id]=1;
@@ -567,10 +637,10 @@ class GroupPortalManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function delete_url_rel_user($user_id, $url_id)
+	function delete_users($group_id)
 	{
-		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-		$sql= "DELETE FROM $table_url_rel_user WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id=".Database::escape_string($url_id)."  ";
+		$table_= Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$sql= "DELETE FROM $table_ WHERE group_id = ".intval($group_id);
 		$result = Database::query($sql,  __FILE__, __LINE__);
 		return $result;
 	}
diff --git a/main/inc/lib/sortabletable.class.php b/main/inc/lib/sortabletable.class.php
index e5e4c61a1a..966741de5e 100644
--- a/main/inc/lib/sortabletable.class.php
+++ b/main/inc/lib/sortabletable.class.php
@@ -491,8 +491,15 @@ class SortableTable extends HTML_Table {
 				.search_users_grid_nav 		{ float:right;}
 					
 		</style>';
-			
-		$items = $this->get_clean_html(); // getting the items of the table				
+		
+		if ($hide_navigation == true ) {
+			$items = $this->table_data; //this is a faster way to get what we want
+		} else {
+			//the normal way
+			$items = $this->get_clean_html(); // getting the items of the table
+		}
+		
+					
 		// the generating of style classes must be improved. Maybe we need a a table name to create style on the fly:
 		// i.e: .whoisonline_table_grid_container instead of  .grid_container
 		// where whoisonline is the table's name like drupal's template engine
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 749f6ee257..1007f461c6 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -2652,7 +2652,7 @@ class UserManager
 			</div>
 			<div>
 				<input type="text" size="30" value="'.Security::remove_XSS($query).'" tabindex="1" id="standard_q" name="q"/>				
-				<input type="submit" value="search"/>
+				<button class="search" value="search"/>'.get_lang('Search').'</button>
 			</div>					
 		</td>
 		</tr>
diff --git a/main/social/groups.php b/main/social/groups.php
index 1827bd29ca..bb471bafbe 100644
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -104,22 +104,51 @@ if ($group_id != 0 ) {
 
 	
 } else {
-	echo '<h1>'.get_lang('Newest').'</h1>';
-	echo '<h1>'.get_lang('Popular').'</h1>';
-	echo '<h1>'.get_lang('MyGroups').'</h1>';
 	
-	$results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true);
+	// Newest groups ----------------
+	$results = GroupPortalManager::get_groups_by_age(10 , true);
 	$groups = array();
 	foreach ($results as $result) {
 		$id = $result['id'];
 		$url_open  = '<a href="groups.php?id='.$id.'">';
-		$url_close = '</a>';
-		
+		$url_close = '</a>';		
 		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
 	}
+	if (count($groups) > 0) {
+		echo '<h1>'.get_lang('Newest').'</h1>';	
+		Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
+	}
+	
+	// Pop groups ----------------	
+	$results = GroupPortalManager::get_groups_by_popularity(10 , true);
+	$groups = array();
+	foreach ($results as $result) {
+		$id = $result['id'];
+		$url_open  = '<a href="groups.php?id='.$id.'">';
+		$url_close = '</a>';		
+		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count']);
+	}
+	if (count($groups) > 0) {
+		echo '<h1>'.get_lang('Popular').'</h1>';
+		Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true));
+	}
 	
-	Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 	
+	// My groups
+	$results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true);
+	$groups = array();
+	foreach ($results as $result) {
+		$id = $result['id'];
+		$url_open  = '<a href="groups.php?id='.$id.'">';
+		$url_close = '</a>';		
+		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
+	}
+	echo '<h1>'.get_lang('MyGroups').'</h1>';
+	if (count($groups) > 0) {		
+		Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+	} else {
+		echo get_lang('CreateAgroup');
+	}
 }
 
 

From 4be105cef760329737249b407df14fc517ecb103 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 16:24:17 -0500
Subject: [PATCH 20/22] Update

---
 documentation/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/changelog.html b/documentation/changelog.html
index 88c4bcdc50..510de1ed02 100644
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -47,7 +47,7 @@
   <li>User tags added DT#5508</li>
   <li>Who is online look revamped DT#5490</li>
   <li>New search tool added DT#5610 </li>	
-  <li>User groups added</li>  
+  <li>User groups added  DT#5611 </li>  
   <li>Social network tab added</li>
 
 </ul>

From 838ef52ab1b09a7c9cd2cf988b93dd1b0c1dd6f5 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 23 Nov 2009 16:55:55 -0500
Subject: [PATCH 21/22] Join group /leave group buttons added

---
 main/inc/lib/group_portal_manager.lib.php |   6 +-
 main/social/group_edit.php                | 151 ++++++++++++++++++++++
 main/social/groups.php                    |  23 +++-
 3 files changed, 170 insertions(+), 10 deletions(-)
 create mode 100644 main/social/group_edit.php

diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 1ef04b3f2d..fe6ad3efff 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -667,10 +667,10 @@ class GroupPortalManager
 	* @param  int url id
 	* @return boolean true if success
 	* */
-	function delete_url_rel_session($session_id, $url_id)
+	function delete_user_rel_group($user_id, $group_id)
 	{
-		$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-		$sql= "DELETE FROM $table_url_rel_session WHERE session_id = ".Database::escape_string($session_id)." AND access_url_id=".Database::escape_string($url_id)."  ";
+		$table = Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$sql= "DELETE FROM $table WHERE user_id = ".intval($user_id)." AND group_id=".intval($group_id)."  ";
 		$result = Database::query($sql,  __FILE__, __LINE__);
 		return $result;
 	}
diff --git a/main/social/group_edit.php b/main/social/group_edit.php
new file mode 100644
index 0000000000..251b6818b8
--- /dev/null
+++ b/main/social/group_edit.php
@@ -0,0 +1,151 @@
+<?php // $Id: user_edit.php 22233 2009-07-20 09:54:05Z ivantcholakov $
+/* For licensing terms, see /dokeos_license.txt */
+/**
+==============================================================================
+*	@package dokeos.admin
+==============================================================================
+*/
+// Language files that should be included
+$language_file = array('admin');
+$cidReset = true;
+include '../inc/global.inc.php';
+$this_section = SECTION_SOCIAL;
+
+$libpath = api_get_path(LIBRARY_PATH);
+require_once $libpath.'fileManage.lib.php';
+require_once $libpath.'fileUpload.lib.php';
+require_once $libpath.'group_portal_manager.lib.php';
+require_once $libpath.'formvalidator/FormValidator.class.php';
+require_once $libpath.'image.lib.php';
+require_once $libpath.'mail.lib.inc.php';
+require_once $libpath.'social.lib.php';
+
+$group_id = isset($_GET['id']) ? intval($_GET['id']) : intval($_POST['id']);
+$tool_name = get_lang('GroupEdit');
+
+$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'group_list.php','name' => get_lang('GroupList'));
+
+$table_group = Database::get_main_table(TABLE_MAIN_GROUP);
+
+$sql = "SELECT * FROM $table_group WHERE id = '".$group_id."'";
+$res = Database::query($sql, __FILE__, __LINE__);
+if (Database::num_rows($res) != 1) {
+	header('Location: groups.php?id='.$group_id);
+	exit;
+}
+
+$group_data = Database::fetch_array($res, 'ASSOC');
+
+// Create the form
+$form = new FormValidator('group_edit', 'post', '', '', array('style' => 'width: 60%; float: '.($text_dir == 'rtl' ? 'right;' : 'left;')));
+$form->addElement('header', '', $tool_name);
+$form->addElement('hidden', 'id', $group_id);
+
+// name
+$form->addElement('text', 'name', get_lang('Name'));
+$form->applyFilter('name', 'html_filter');
+$form->applyFilter('name', 'trim');
+$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
+
+// Description
+$form->addElement('text', 'description', get_lang('Description'));
+$form->applyFilter('description', 'html_filter');
+$form->applyFilter('description', 'trim');
+
+// url
+$form->addElement('text', 'url', get_lang('URL'));
+$form->applyFilter('url', 'html_filter');
+$form->applyFilter('url', 'trim');
+
+// Picture
+$form->addElement('file', 'picture', get_lang('AddPicture'));
+$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
+if (strlen($group_data['picture_uri']) > 0) {
+	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
+}
+
+
+// Status
+$status = array();
+$status[GROUP_PERMISSION_OPEN] 		= get_lang('Open');
+$status[GROUP_PERMISSION_CLOSED]	= get_lang('Closed');
+
+$form->addElement('select', 'visibility', get_lang('GroupPermissions'), $status, array());
+
+// Submit button
+$form->addElement('style_submit_button', 'submit', get_lang('ModifyInformation'), 'class="save"');
+
+// Set default values
+$form->setDefaults($group_data);
+
+// Validate form
+if ( $form->validate()) {
+	$group = $form->exportValues();
+	
+	$picture_element = & $form->getElement('picture');
+	$picture = $picture_element->getValue();
+
+	$picture_uri = $group_data['picture_uri'];
+	if ($group['delete_picture']) {
+		$picture_uri = GroupPortalManager::delete_group_picture($group_id);
+		}
+	elseif (!empty($picture['name'])) {
+		$picture_uri = GroupPortalManager::update_group_picture($group_id, $_FILES['picture']['name'], $_FILES['picture']['tmp_name']);
+	}
+	
+	$name 			= $group['name'];
+	$description	= $group['description'];
+	$url 			= $group['url'];	
+	$status 		= intval($group['visibility']);
+	
+	GroupPortalManager::update($group_id, $name, $description, $url, $status, $picture_uri);	
+	$tok = Security::get_token();
+	header('Location: groups.php?id='.$group_id.'&action=show_message&message='.urlencode(get_lang('GroupUpdated')).'&sec_token='.$tok);
+	exit();
+}
+
+Display::display_header($tool_name);
+
+//show the action menu
+SocialManager::show_social_menu();
+echo '<div class="actions-title">';
+echo get_lang('Groups');
+echo '</div>';
+
+
+
+// Group picture
+$image_path = GroupPortalManager::get_group_picture_path_by_id($group_id,'web');
+$image_dir = $image_path['dir'];
+$image = $image_path['file'];
+$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_CODE_PATH).'img/unknown_group.jpg');
+$image_size = api_getimagesize($image_file);
+
+$img_attributes = 'src="'.$image_file.'?rand='.time().'" '
+	.'alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" '
+	.'style="float:'.($text_dir == 'rtl' ? 'left' : 'right').'; padding:5px;" ';
+
+if ($image_size[0] > 300) { //limit display width to 300px
+	$img_attributes .= 'width="300" ';
+}
+
+// get the path,width and height from original picture
+$big_image = $image_dir.'big_'.$image;
+$big_image_size = api_getimagesize($big_image);
+$big_image_width = $big_image_size[0];
+$big_image_height = $big_image_size[1];
+$url_big_image = $big_image.'?rnd='.time();
+
+if ($image == '') {
+	echo '<img '.$img_attributes.' />';
+} else {
+	echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
+}
+
+// Display form
+$form->display();
+
+// Footer
+Display::display_footer();
diff --git a/main/social/groups.php b/main/social/groups.php
index bb471bafbe..5f400be0fa 100644
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -21,6 +21,17 @@ echo '</div>';
 $group_id	= intval($_GET['id']);
 
 if ($group_id != 0 ) {
+	
+	if (isset($_GET['action']) && $_GET['action']=='leave') {
+		$user_leaved = intval($_GET['u']);
+		GroupPortalManager::delete_user_rel_group($user_leaved, $group_id);	
+	}
+	
+	if (isset($_GET['action']) && $_GET['action']=='join') {
+		$user_join = intval($_GET['u']);
+		GroupPortalManager::add_user_to_group($user_join, $group_id);	
+	}	
+	
 	$group_info = GroupPortalManager::get_group_data($group_id); 
 	$picture	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
 	$tags		= GroupPortalManager::get_group_tags($group_id,true);
@@ -73,8 +84,6 @@ if ($group_id != 0 ) {
 	
 		
 	echo '<div id="group_permissions">';
-
-
 	
 	if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
 		//im a member
@@ -82,23 +91,23 @@ if ($group_id != 0 ) {
 		if ($users[api_get_user_id()]['relation_type']!='') {
 			
 			$my_group_role = $users[api_get_user_id()]['relation_type'];
-			// just a reader
+			// I'm just a reader
 			if ($my_group_role  == GROUP_USER_PERMISSION_READER) {
-				echo 'Leave group/';
+				echo '<a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a>';
 				echo 'Invite others/';				
 			//the main admin
 			} elseif ($my_group_role  == GROUP_USER_PERMISSION_ADMIN) {
 				echo 'Im the admin/';
-				echo 'Edit group/';
+				echo '<a href="group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a>';
 				echo 'Invite others';					
 			}
 		} else {
 			//im not a member
-			echo 'Join group';
+			echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';			
 		}
 	} else {
 		//im not a member
-		echo 'Join group';		 		
+		echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
 	}	
 	echo '</div>';
 

From 5c2d63af454f3a296ccaa80587ba9b0cf58cd6a9 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <yannick.warnier@beeznest.com>
Date: Mon, 23 Nov 2009 17:19:03 -0500
Subject: [PATCH 22/22] Updated memory limit (tests)

---
 tests/all.test3.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/all.test3.php b/tests/all.test3.php
index 1e62eca52a..81cbfec3aa 100644
--- a/tests/all.test3.php
+++ b/tests/all.test3.php
@@ -1,5 +1,5 @@
 <?php
-ini_set('memory_limit','128M');
+ini_set('memory_limit','256M');
 require_once('simpletest/unit_tester.php');
 require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
 require_once('simpletest/web_tester.php');