Removing anonymous users from user list (UserGroup) + other minor fixes

main/admin/add_users_to_usergroup.php

@@ -98,13 +98,19 @@ if($_POST['form_sent']) {
 }
 $data       = $usergroup->get($id);
 $list_in    = $usergroup->get_users_by_usergroup($id);
-$user_list  = UserManager::get_user_list();
+
+$order = array('lastname');
+if (api_is_western_name_order()) {
+    $order = array('firstname');	
+}
+$user_list  = UserManager::get_user_list(array(),$order);
 
 //api_display_tool_title($tool_name.' ('.$session_info['name'].')');
 $elements_not_in = $elements_in = array();
 
 if (!empty($user_list)) {
     foreach($user_list as $item) {
+        if ($item['status'] == 6 ) continue; //avoid anonymous users
         $person_name = api_get_person_name($item['firstname'], $item['lastname']);        
         if (in_array($item['user_id'], $list_in)) {                        
             $elements_in[$item['user_id']] = $person_name;             
@@ -157,7 +163,8 @@ function search($needle,$type) {
         } else {
             $return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
             
-            foreach ($list as $item ) {         
+            foreach ($list as $item ) {
+                if ($item['status'] == 6 ) continue; //avoid anonymous users
                 if (!in_array($item['user_id'], array_keys($elements_in))) {       
                     $person_name = api_get_person_name($item['firstname'], $item['lastname']);   
                     $return .= '<option value="'.$item['user_id'].'">'.$person_name.'</option>';

main/inc/lib/social.lib.php

@@ -629,11 +629,13 @@ class SocialManager extends UserManager {
 	              <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.png',get_lang('Groups'),array('hspace'=>'6')).'<span class="'.($show=='groups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Groups').'</span></a></li>';
 			
 			//Show groups
-	        if (in_array($show,$show_groups)) {
-					echo '<li><ul>';
-						echo $create_group_item;
-						echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.png',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyGroups').'</span></a></li>';
-					echo '</ul></li>';
+	        if (in_array($show,$show_groups)) {					
+    			echo $create_group_item;
+                if (api_get_setting('allow_students_to_create_groups_in_social') == 'true' || api_is_platform_admin()) {                        
+                    echo '<li><ul>';    
+                    echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.png',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyGroups').'</span></a></li>';
+                    echo '</ul></li>';
+                }
 			}
 			
 			//Search users and groups

main/social/groups.php

@@ -260,8 +260,7 @@ if ($group_id != 0 ) {
 
 	// details about the current group
 	echo '<div class="head_group">';
-
-
+    
 		echo '<div id="social-group-details">';
 				//Group's title
 				echo '<h2><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h2>';
@@ -391,7 +390,7 @@ if ($group_id != 0 ) {
 			$grid_newest_groups[]= array($grid_item_1,$grid_item_2);
 		}
 
-		// Pop groups -----
+		// Pop groups
 		$results = GroupPortalManager::get_groups_by_popularity(4,false);
 		$grid_pop_groups = array();
 
@@ -428,9 +427,7 @@ if ($group_id != 0 ) {
 			}
 		}
 
-
-
-		// display groups (newest, mygroups, pop)
+		// Display groups (newest, mygroups, pop)
 			echo '<div class="social-box-container2">';
 		   	if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 		   		$view_group = $_GET['view'];

main/social/usergroups.php

@@ -57,4 +57,5 @@ if (!empty($usergroup_list)) {
         echo Display::tag('div',$data['name']);
     }
 }
+echo '</div>';
 Display :: display_footer();