Merge

main/social/home.php

@@ -18,7 +18,7 @@ $show_full_profile = true;
 //social tab
 $this_section = SECTION_SOCIAL;
 
-$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/profile.php','name' => get_lang('Social'));
+$interbreadcrumb[]= array ('url' => 'home.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Home'));
 	
 api_block_anonymous_users();

main/social/profile.php

@@ -187,10 +187,10 @@ if (isset($_GET['shared'])) {
 	$my_link='../social/profile.php';
 	$link_shared='';
 }
-$interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social') );
-$interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('ViewMySharedProfile'));
+$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social') );
+$interbreadcrumb[]= array ('url' => 'profile.php?u='.api_get_user_id(), 'name' => get_lang('ViewMySharedProfile'));
 
-if (isset($_GET['u']) && is_numeric($_GET['u'])) {
+if (isset($_GET['u']) && is_numeric($_GET['u']) && $_GET['u'] != api_get_user_id()) {
 	$info_user=api_get_user_info($_GET['u']);
 	$interbreadcrumb[]= array ('url' => '#','name' => api_get_person_name($info_user['firstName'], $info_user['lastName']));
 }

main/work/work.lib.php

@@ -104,8 +104,9 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_
 				$display_output .=	"<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;curdirpath=".$cur_dir_path."&amp;origin=$origin&amp;gradebook=$gradebook&amp;list=with\">".
 				Display::return_icon('check.gif', get_lang('ViewUsersWithTask')).' '.get_lang('ViewUsersWithTask').
 				"</a>\n";
-
-				$display_output .=	"<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;curdirpath=".$cur_dir_path."&amp;origin=$origin&amp;gradebook=$gradebook&amp;list=without&amp;action=send_mail&amp;sec_token=".$_SESSION['sec_token']."\">".
+				
+				$_SESSION['token'] = time();				
+				$display_output .=	"<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;curdirpath=".$cur_dir_path."&amp;origin=$origin&amp;gradebook=$gradebook&amp;list=without&amp;action=send_mail&amp;sec_token=".$_SESSION['token']."\">".
 				Display::return_icon('messagebox_warning.gif', get_lang('ReminderMessage')).' '.get_lang('ReminderMessage').
 				"</a>\n";
 			}

main/work/work.php

@@ -217,8 +217,12 @@ if (isset($_GET['list']) && Security::remove_XSS($_GET['list'])=='without') {
 	$display_list_users_without_publication= false;
 }
 
-if (isset($_GET['action']) && $_GET['action'] == 'send_mail') {
-	send_reminder_users_without_publication($publication['id']);
+
+if (isset($_GET['action']) && $_GET['action'] == 'send_mail') {	
+	if ($_GET['sec_token'] == $_SESSION['token']) {
+		send_reminder_users_without_publication($publication['id']);
+		unset($_SESSION['token']);	
+	}
 } 
 
 api_protect_course_script(true);