瀏覽代碼

Cleaning code ...

Julio Montoya 13 年之前
父節點
當前提交
e697883a37
共有 3 個文件被更改,包括 15 次插入16 次删除
  1. 7 9
      main/inc/lib/social.lib.php
  2. 6 6
      main/social/groups.php
  3. 2 1
      whoisonline.php

+ 7 - 9
main/inc/lib/social.lib.php

@@ -688,17 +688,15 @@ class SocialManager extends UserManager {
 
     	  	// My own profile
     	  	if ($show_full_profile && $user_id == intval(api_get_user_id())) {
-	        	echo '
-	                     <li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Home').'</span></a></li>
-	                     <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Messages').$count_unread_message.'</span></a></li>';
-	        	echo '   <li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Invitations').$total_invitations.'</span></a></li>';
-	        	echo	'<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="social-menu-text-active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
-	        			 <li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('friend.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Friends').'</span></a></li>
-	                     <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.png',get_lang('SocialGroups'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('SocialGroups').'</span></a></li>';
+	        	echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Home').'</span></a></li>
+	                  <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Messages').$count_unread_message.'</span></a></li>';
+	        	echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Invitations').$total_invitations.'</span></a></li>';
+	        	echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="social-menu-text-active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
+	        		  <li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('friend.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Friends').'</span></a></li>
+	                  <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.png',get_lang('SocialGroups'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('SocialGroups').'</span></a></li>';
 				echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array('hspace'=>'6'),16).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';
     	  	}
 
-
     	  	// My friend profile
     	  	$html_actions = '';
 
@@ -710,7 +708,7 @@ class SocialManager extends UserManager {
 	  		//check if I already sent an invitation message
 	  		$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
 
-	  		if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) {
+	  		if (isset($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) > 0 ) {
 	  			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
 	  		} else {
 	  			if (!$show_full_profile) {

+ 6 - 6
main/social/groups.php

@@ -145,7 +145,7 @@ if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 Display :: display_header($tool_name, 'Groups');
 
 // getting group information
-$group_id	= intval($_GET['id']);
+$group_id	= isset($_GET['id']) ? intval($_GET['id']) : null;
 $relation_group_title = '';
 $my_group_role = 0;
 if ($group_id != 0 ) {
@@ -351,7 +351,6 @@ if ($group_id != 0 ) {
 
 				$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
-				//$grid_item_1 = Display::return_icon('boxmygroups.jpg',get_lang('MyGroups'));
 				$item_0  = Display::div($result['picture_uri'], array('class'=>'box_description_group_image'));
 				$members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
 				$item_1  = Display::div(Display::tag('h2', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title'));
@@ -368,7 +367,7 @@ if ($group_id != 0 ) {
                 /*$join_url = '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('JoinGroup'), array('hspace'=>'6')).''.get_lang('JoinGroup').'</a> ';                
 				$item_4 = '<div class="box_description_group_actions" >'.$join_url. $url_open.get_lang('SeeMore').$url_close.'</div>';*/				
 				$grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4;
-				$grid_my_groups[]= array($grid_item_1,$grid_item_2);
+				$grid_my_groups[]= array($grid_item_2);
 			}
 		}
 
@@ -411,7 +410,7 @@ if ($group_id != 0 ) {
 			$item_4 = '<div class="box_description_group_actions" >'.$join_url.'</div>';
 			$grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4;
 
-			$grid_newest_groups[]= array($grid_item_1,$grid_item_2);
+			$grid_newest_groups[]= array($grid_item_2);
 		}
 
 		// Pop groups
@@ -458,7 +457,7 @@ if ($group_id != 0 ) {
 		}
 
 		// Display groups (newest, mygroups, pop)
-	
+        $query_vars = array();	
 		
 	   	if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 	   		$view_group = $_GET['view'];
@@ -500,6 +499,7 @@ if ($group_id != 0 ) {
 	        		break;
 	   		}
 	   	} else {	   	    
+	   	    $my_group_content = null;
 	        if (count($grid_my_groups) > 0) {
 	        	$my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));           
 	        }
@@ -509,7 +509,7 @@ if ($group_id != 0 ) {
             } else {
                 if (api_is_allowed_to_edit(null,true)) {
                     $create_group_item =  '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
-                    $my_group_content = $create_group_item. $my_group_content;
+                    $my_group_content  = $create_group_item. $my_group_content;
                 }
             }
 			if (count($grid_newest_groups) > 0) {

+ 2 - 1
whoisonline.php

@@ -158,7 +158,8 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 				echo '<div id="social-content-right">';			
 				//this include the social menu div
 				if (!api_is_anonymous()) {
-					echo UserManager::get_search_form($_GET['q']);
+				    $query = isset($_GET['q']) ? $_GET['q']: null;				    
+					echo UserManager::get_search_form($query);
 				}
 			}
 			echo Display::tag('h2', get_lang('UsersOnLineList'));