diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 28f4e73a5e..99981ae1bd 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -37,6 +37,7 @@ class MessageManager $min=30; global $_configuration; $userlist = who_is_online($min, true); + $online_user_list = array(); foreach($userlist as $row) { $receiver_id = $row[0]; $online_user_list[$receiver_id] = GetFullUserName($receiver_id).($current_user_id==$receiver_id?(" (".get_lang('Myself').")"):("")); diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 23762ff84d..f7a8b8a2ab 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -182,9 +182,9 @@ function manage_form ($default, $select_from_user_list = null) { global $charset; $table_message = Database::get_main_table(TABLE_MESSAGE); - $group_id = intval($_REQUEST['group_id']); - $message_id = intval($_GET['message_id']); - $param_f = isset($_GET['f'])?Security::remove_XSS($_GET['f']):''; + $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null; + $message_id = isset($_GET['message_id']) ? intval($_GET['message_id']) : null; + $param_f = isset($_GET['f']) ? Security::remove_XSS($_GET['f']):''; $form = new FormValidator('compose_message',null,api_get_self().'?f='.$param_f,null,array('enctype'=>'multipart/form-data')); if (empty($group_id)) { @@ -256,7 +256,6 @@ function manage_form ($default, $select_from_user_list = null) { $file_comments = $_POST['legend']; $title = $values['title']; $content = $values['content']; - $group_id = $values['group_id']; $parent_id = $values['parent_id']; @@ -297,7 +296,7 @@ if ($_GET['f']=='social') { Display::display_header(get_lang('ComposeMessage')); -$group_id = intval($_REQUEST['group_id']); +$group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null; if ($group_id != 0) { echo '
'; diff --git a/main/social/search.php b/main/social/search.php index bb287b79cb..2727662dba 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -81,17 +81,17 @@ echo '
'; echo '
'; } - //get users from tags - if (is_array($results) && count($results) > 0) { - foreach ($results as $result) { + //Get users from tags + if (is_array($results) && count($results) > 0) { + foreach ($results as $result) { $id = $result['id']; $url_open = ''; $url_close = ''; $name = api_strtoupper(cut($result['name'],25,true)); - if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { + if (isset($result['relation_type']) && $result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { $name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle')); - } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { + } elseif (isset($result['relation_type']) && $result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { $name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle')); } $count_users_group = count(GroupPortalManager::get_all_users_by_group($id)); @@ -101,7 +101,7 @@ echo '
'; $count_users_group = $count_users_group.' '.get_lang('Members'); } - $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); + $picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80); $result['picture_uri'] = ''; $grid_item_1 = Display::return_icon('boxmygroups.jpg');