Ver Fonte

Minor - fixing PHP warnings.

Julio Montoya há 11 anos atrás
pai
commit
6a2ddbc2c2

+ 7 - 13
main/inc/ajax/social.ajax.php

@@ -15,9 +15,6 @@ switch ($action) {
             echo '';
             break;
         }
-
-        $my_current_friend		 = Security::remove_XSS($_POST['friend_id']);
-
         if (isset($_POST['is_my_friend'])) {
             $relation_type = USER_RELATION_TYPE_FRIEND; //My friend
         } else {
@@ -25,6 +22,7 @@ switch ($action) {
         }
 
         if (isset($_POST['friend_id'])) {
+            $my_current_friend  = $_POST['friend_id'];
             UserManager::relate_users($current_user_id, $my_current_friend, $relation_type);
             UserManager::relate_users($my_current_friend, $current_user_id, $relation_type);
             SocialManager::invitation_accepted($my_current_friend, $current_user_id);
@@ -36,19 +34,15 @@ switch ($action) {
             echo '';
             break;
         }
-        $my_current_friend		 = Security::remove_XSS($_POST['friend_id']);
-        $my_denied_current_friend= Security::remove_XSS($_POST['denied_friend_id']);
-        $my_delete_friend        = Security::remove_XSS($_POST['delete_friend_id']);
-        $friend_id_qualify       = Security::remove_XSS($_POST['user_id_friend_q']);
-        $type_friend_qualify     = Security::remove_XSS($_POST['type_friend_q']); //filtered?
-        $is_my_friend            = Security::remove_XSS($_POST['is_my_friend']); //filtered?
+
+
         if (isset($_POST['is_my_friend'])) {
-            $relation_type=USER_RELATION_TYPE_FRIEND;//my friend
+            $relation_type = USER_RELATION_TYPE_FRIEND;//my friend
         } else {
-            $relation_type=USER_RELATION_TYPE_UNKNOW;//Contact unknown
+            $relation_type = USER_RELATION_TYPE_UNKNOW;//Contact unknown
         }
         if (isset($_POST['denied_friend_id'])) {
-            SocialManager::invitation_denied($my_denied_current_friend, $current_user_id);
+            SocialManager::invitation_denied($_POST['denied_friend_id'], $current_user_id);
             Display::display_confirmation_message(api_xml_http_response_encode(get_lang('InvitationDenied')));
         }
         break;
@@ -57,7 +51,7 @@ switch ($action) {
             echo '';
             break;
         }
-        $my_delete_friend        = intval($_POST['delete_friend_id']);
+        $my_delete_friend = intval($_POST['delete_friend_id']);
         if (isset($_POST['delete_friend_id'])) {
             SocialManager::remove_user_rel_user($my_delete_friend);
         }

+ 3 - 5
main/social/group_invitation.php

@@ -200,8 +200,6 @@ $Users = array();
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent			= $_POST['form_sent'];
-    $firstLetterUser	= $_POST['firstLetterUser'];
-    $firstLetterSession	= $_POST['firstLetterSession'];
     $user_list			= $_POST['sessionUsersList'];
     $group_id			= intval($_POST['id']);
 
@@ -366,7 +364,7 @@ $form .=  '<input type="hidden" name="form_sent" value="1" />';
 $form .=  '<input type="hidden" name="id" value="'.$group_id.'">';
 $form .=  '<input type="hidden" name="add_type"  />';
 
-if(!empty($errorMsg)) {
+if (!empty($errorMsg)) {
 	$form .= Display::return_message($errorMsg,'error'); //main API
 }
 
@@ -456,8 +454,8 @@ if (is_array($members) && count($members)>0) {
         'invitation_profile',
         array(),
         $members,
-        array('hide_navigation'=>true, 'per_page' => 100),
-        $query_vars,
+        array('hide_navigation' => true, 'per_page' => 100),
+        array(),
         false,
         array(true, false, true, true)
     );

+ 10 - 5
main/social/group_members.php

@@ -120,17 +120,22 @@ foreach($users as $user) {
     $new_member_list[] = $user;
 }
 if (count($new_member_list) > 0) {
-    $social_right_content .= Display::return_sortable_grid('list_members', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));
+    $social_right_content .= Display::return_sortable_grid(
+        'list_members',
+        array(),
+        $new_member_list,
+        array('hide_navigation'=>true, 'per_page' => 100),
+        array(),
+        false,
+        array(true, false, true, true, false, true, true)
+    );
 }
 $social_right_content .= '</div>';
 
 $tpl = new Template($tool_name);
 $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$tpl->assign('actions', $actions);
-$tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
+
 $social_layout = $tpl->get_template('layout/social_layout.tpl');
 $tpl->display($social_layout);

+ 37 - 28
main/social/invitations.php

@@ -19,8 +19,8 @@ if (api_get_setting('allow_social_tool') !='true') {
 
 $this_section = SECTION_SOCIAL;
 
-$interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('SocialNetwork'));
-$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Invitations'));
+$interbreadcrumb[] = array ('url' =>'profile.php','name' => get_lang('SocialNetwork'));
+$interbreadcrumb[] = array ('url' =>'#','name' => get_lang('Invitations'));
 
 $htmlHeadXtra[] = '
 <script>
@@ -70,26 +70,26 @@ $content = null;
 
 // easy links
 if (is_array($_GET) && count($_GET)>0) {
-	foreach ($_GET as $key => $value) {
-		switch ($key) {
-			case 'accept':
-				$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value);
-				if (in_array($user_role , array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,GROUP_USER_PERMISSION_PENDING_INVITATION))) {
-					GroupPortalManager::update_user_role(api_get_user_id(), $value, GROUP_USER_PERMISSION_READER);
-					$show_message = Display::return_message(get_lang('UserIsSubscribedToThisGroup'), 'success');
-				} elseif (in_array($user_role , array(GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
-					$show_message = Display::return_message(get_lang('UserIsAlreadySubscribedToThisGroup'), 'warning');
-				} else {
-					$show_message = Display::return_message(get_lang('UserIsNotSubscribedToThisGroup'), 'warning');
-				}
+    foreach ($_GET as $key => $value) {
+        switch ($key) {
+            case 'accept':
+                $user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value);
+                if (in_array($user_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
+                    GroupPortalManager::update_user_role(api_get_user_id(), $value, GROUP_USER_PERMISSION_READER);
+                    $show_message = Display::return_message(get_lang('UserIsSubscribedToThisGroup'), 'success');
+                } elseif (in_array($user_role, array(GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
+                    $show_message = Display::return_message(get_lang('UserIsAlreadySubscribedToThisGroup'), 'warning');
+                } else {
+                    $show_message = Display::return_message(get_lang('UserIsNotSubscribedToThisGroup'), 'warning');
+                }
                 break 2;
-			case 'deny':
-				// delete invitation
-				GroupPortalManager::delete_user_rel_group(api_get_user_id(), $value);
-				$show_message = Display::return_message(get_lang('GroupInvitationWasDeny'));
-			break 2;
-		}
-	}
+            case 'deny':
+                // delete invitation
+                GroupPortalManager::delete_user_rel_group(api_get_user_id(), $value);
+                $show_message = Display::return_message(get_lang('GroupInvitationWasDeny'));
+                break 2;
+        }
+    }
 }
 $social_left_content = SocialManager::show_social_menu('invitations');
 $social_right_content =  '<div id="id_response" align="center"></div>';
@@ -113,7 +113,7 @@ if ($number_loop != 0) {
         $sender_user_id = $invitation['user_sender_id'];
         $social_right_content .= '<div id="id_'.$sender_user_id.'" class="invitation_confirm span8">';
 
-        $picture = UserManager::get_user_picture_path_by_id($sender_user_id,'web',false,true);
+        $picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true);
         $friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
         $user_info	= api_get_user_info($sender_user_id);
         $title 		= Security::remove_XSS($invitation['title'], STUDENT, true);
@@ -141,14 +141,14 @@ if ($number_loop != 0) {
     }
 }
 
-if (count($list_get_invitation_sent) > 0 ) {
+if (count($list_get_invitation_sent) > 0) {
     $social_right_content .= '<div class="span8">'.Display::page_subheader(get_lang('InvitationSent')).'</div>';
     foreach ($list_get_invitation_sent as $invitation) {
         $sender_user_id = $invitation['user_receiver_id'];
 
         $social_right_content .= '<div id="id_'.$sender_user_id.'" class="invitation_confirm span8">';
 
-        $picture = UserManager::get_user_picture_path_by_id($sender_user_id,'web',false,true);
+        $picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true);
         $friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
         $user_info	= api_get_user_info($sender_user_id);
 
@@ -179,15 +179,24 @@ if (count($pending_invitations) > 0) {
     foreach ($pending_invitations as $invitation) {
         $picture = GroupPortalManager::get_picture_group($invitation['id'], $invitation['picture_uri'],80);
         $img = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
-
         $invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>';
         $invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
-        $invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
-        $invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</a>';
+        $invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.
+            Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
+        $invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.
+            Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</a>';
         $invitation['description'] = cut($invitation['description'],220,true);
         $new_invitation[]=$invitation;
     }
-    $social_right_content .= Display::return_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));
+    $social_right_content .= Display::return_sortable_grid(
+        'waiting_user',
+        array(),
+        $new_invitation,
+        array('hide_navigation'=>true, 'per_page' => 100),
+        array(),
+        false,
+        array(true, true, true, false, false, true, true, true, true)
+    );
 }
 
 $tpl = new Template(null);