Merge

main/auth/profile.php

@@ -293,6 +293,7 @@ if (is_profile_editable() && api_get_setting('profile', 'password') == 'true') {
 
 // EXTRA FIELDS
 $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
+
 $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
 foreach ($extra as $id => $field_details) {
 	if ($field_details[6] == 0) {

main/css/blue_lagoon/default.css

@@ -586,7 +586,7 @@ input.liteoption {
 	width: 100%;
 	margin: 0 auto;
 	border: 1px solid #bbb;
-	border-collapse: collapse;
+	border-collapse: collapse;	
 }
 .agenda_month_divider {
 	background-color: #dcdcdc;

main/css/chamilo/default.css

@@ -589,12 +589,16 @@ margin-top:0;
 	margin: 0 0 12px 0;
 	padding: 0;
 	
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
 }
 
 .menulist li{
-	float:left;
+	/* float:left; */
 	/* margin-left:10px; */
 	margin-bottom:10px;
+	display:list-item;
 }
 #centerwrap {
 	float: left;

main/inc/ajax/.htaccess

@@ -0,0 +1 @@
+Options -Indexes

main/inc/ajax/social.ajax.php

@@ -163,6 +163,10 @@ switch ($action) {
 		break;
 		
 	case 'toogle_course':
+		if (api_is_anonymous()){
+			echo '';
+			break;
+		}
 		
 		require_once api_get_path(LIBRARY_PATH).'blog.lib.php';
 		require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';

main/inc/ajax/user_manager.ajax.php

@@ -9,7 +9,7 @@ $action = $_GET['a'];
 
 switch ($action) {	
 	case 'search_tags':
-		if (api_is_anonymous()){
+		if (api_is_anonymous()) {
 			echo '';
 			break;
 		} else {		

main/inc/banner.inc.php

@@ -197,7 +197,7 @@ if ($_user['user_id'] && !api_is_anonymous()) {
 	}
 
 	// My Profile 
-	if (api_get_setting('show_tabs', 'my_profile') == 'true' && api_get_setting('show_tabs', 'social') != 'true') { 
+	if (api_get_setting('show_tabs', 'my_profile') == 'true' && api_get_setting('allow_social_tool') != 'true') { 
 		$navigation['myprofile'] = $possible_tabs['myprofile'];
 	} else {
 		$menu_navigation['myprofile'] = $possible_tabs['myprofile'];

whoisonline.php

@@ -117,6 +117,7 @@ if ($_GET['chatid'] != '') {
 
 // This if statement prevents users accessing the who's online feature when it has been disabled.
 if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])) {
+	
 	if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
 		$user_list = Who_is_online_in_this_course($_user['user_id'], api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
 	} else {
@@ -124,42 +125,45 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 	}
 
 	$total = count($user_list);
-	if (!isset($_GET['id'])) {
+	if (!isset($_GET['id'])) {		
+		
 		Display::display_header(get_lang('UsersOnLineList'));
-	
-		echo '<div id="social-content-left">';	
-			//this include the social menu div
-			if (!api_is_anonymous()) {
-				SocialManager::show_social_menu('whoisonline');
-			}	
-		echo '</div>';
-  
-		if ($_GET['id'] == '') {
-			echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
+		
+		if (api_get_setting('allow_social_tool') == 'true') {
+			echo '<div id="social-content-left">';	
+				//this include the social menu div
+				if (!api_is_anonymous()) {				
+					SocialManager::show_social_menu('whoisonline');				
+				}	
+			echo '</div>';
+	  
+			if ($_GET['id'] == '') {
+				echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
+			} /*else {
+				if (0) {
+				// if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) {
+					echo '<a href="'.api_get_self().'?chatid='.Security::remove_XSS($_GET['id']).'">'.get_lang('SendChatRequest').'</a>';
+				}
+			}*/
 		} else {
-			if (0) {
-			// if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) {
-				echo '<a href="'.api_get_self().'?chatid='.Security::remove_XSS($_GET['id']).'">'.get_lang('SendChatRequest').'</a>';
-			}
+			echo '<div class="actions-title">';
+			echo get_lang('UsersOnLineList');
+			echo '</div>';	
 		}
+			
 	}
 
 	if ($user_list) {
 		if (!isset($_GET['id'])) {
-			
-			echo '<div id="social-content-right">';	
-			//this include the social menu div
-			if (!api_is_anonymous()) {
-				echo UserManager::get_search_form($_GET['q']);
-			}	
+			if (api_get_setting('allow_social_tool') == 'true') {
+				echo '<div id="social-content-right">';	
+				//this include the social menu div
+				if (!api_is_anonymous()) {
+					echo UserManager::get_search_form($_GET['q']);
+				}	
+			}
 			SocialManager::display_user_list($user_list);
 			echo '</div>';
-			/*
-			if (!api_is_anonymous()) {
-				echo UserManager::get_search_form($_GET['q']);
-			}								
-			SocialManager::display_user_list($user_list);
-			*/
 		} else {
 			//individual user information - also displays header info
 			SocialManager::display_individual_user(Security::remove_XSS($_GET['id']));