diff --git a/main/css/academica/default.css b/main/css/academica/default.css index 17faba69f8..360cbe47be 100755 --- a/main/css/academica/default.css +++ b/main/css/academica/default.css @@ -3660,4 +3660,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index 0b22443ade..0b7278a055 100755 --- a/main/css/baby_orange/default.css +++ b/main/css/baby_orange/default.css @@ -3588,4 +3588,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 6b905be992..5cbd3af98d 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -4274,4 +4274,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index 12429232f2..89ebce0790 100755 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -4613,4 +4613,24 @@ padding-top:10px; .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/chamilo_electric_blue/default.css b/main/css/chamilo_electric_blue/default.css index 7e76f13a2c..d9d6e5479d 100755 --- a/main/css/chamilo_electric_blue/default.css +++ b/main/css/chamilo_electric_blue/default.css @@ -4607,3 +4607,24 @@ span.form_required { } + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css index 7507cf4e41..eea5c4117d 100755 --- a/main/css/chamilo_green/default.css +++ b/main/css/chamilo_green/default.css @@ -4614,4 +4614,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/chamilo_orange/default.css b/main/css/chamilo_orange/default.css index 5a75ad20d4..08409aef3b 100755 --- a/main/css/chamilo_orange/default.css +++ b/main/css/chamilo_orange/default.css @@ -4589,4 +4589,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css index 7889d38a08..960856d4c0 100755 --- a/main/css/chamilo_red/default.css +++ b/main/css/chamilo_red/default.css @@ -4599,4 +4599,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index a1477dd1d9..2245c02d85 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -4141,4 +4141,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index 79b1c86f4a..6e0db96f17 100644 --- a/main/css/corporate/default.css +++ b/main/css/corporate/default.css @@ -3609,4 +3609,26 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} + diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css index 806d3acce4..a4898e586d 100755 --- a/main/css/cosmic_campus/default.css +++ b/main/css/cosmic_campus/default.css @@ -3672,4 +3672,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index 5f53f1c8d4..36c3e222e3 100644 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -4132,4 +4132,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index 31b3dd2ae3..43eeb86f12 100644 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -4181,4 +4181,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index eacb72a24f..4fe06ba390 100644 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -4404,4 +4404,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index 9944ba924c..42b3bf0768 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -4405,4 +4405,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index 6c7e452565..d3e1deab59 100644 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -4118,4 +4118,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 4115479c0a..1bc536a628 100644 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -4120,4 +4120,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index 375173c2d5..cd74ccf9a2 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -4326,4 +4326,24 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index 3f2afc9a69..e9289ee0c2 100644 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -4116,4 +4116,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index 6b2cb5fa8a..88a9cb719b 100644 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -4061,4 +4061,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index d449f42f26..1f30c2a114 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -4270,4 +4270,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; } \ No newline at end of file diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css index c02f73b577..77a8b6ac1b 100644 --- a/main/css/steel_grey/default.css +++ b/main/css/steel_grey/default.css @@ -4119,4 +4119,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index f067e72bae..192f23fb2b 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -4121,4 +4121,25 @@ span.form_required { .decrease_font:hover { border: 1px solid black; cursor: pointer; -} \ No newline at end of file +} + + +.online_grid_item { + float:left; + margin:10px; + text-align:center; +} +.online_grid_element_0 { + width: 100px; + height: 100px; + overflow: hidden; +} +/* input values to crop the image: top, right, bottom, left */ +.online_grid_element_0 img{ + width: 200px; + margin: -10px 0 0 -50px; + /* height: 150px; */ +} +.online_grid_element_1, .online_grid_element_2 { + font-size:10px; +} \ No newline at end of file diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 735f9be5a0..eca6713fb0 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -710,49 +710,51 @@ class MessageManager $band=1; $row[5] = Security::remove_XSS($row[5]); + + $from_user = UserManager::get_user_info_by_id($row[1]); + $name = api_get_person_name($from_user['firstname'], $from_user['lastname']); + $user_image = UserManager::get_picture_user($row[1], $from_user['picture_uri'],80); + $user_image = Display::img($user_image['file'], $name, array('title'=>$name)); - $message_content = ' - + $message_content = '
- - +
  +   - - '; - if (api_get_setting('allow_social_tool') == 'true') { - $user_image = ''; - /* @todo add user image - $user_image = UserManager::get_user_picture_path_by_id($row[1],'web', true,false); - $user_image = UserManager::get_picture_user($row[1], $user_image['file'],'40'); - $user_image = ''; - */ - if ($source == 'outbox') { - $message_content .=''; - } else { - $message_content .=''; - } - - } else { - if ($source == 'outbox') { - $message_content .=''; - } else { - $message_content .=''; - } - } + '; + if (api_get_setting('allow_social_tool') == 'true') { + $message_content .=''; + } + + $message_content .=''; + if (api_get_setting('allow_social_tool') == 'true') { + if ($source == 'outbox') { + $message_content .=''; + } else { + $message_content .=''; + } + } else { + if ($source == 'outbox') { + $message_content .=''; + } else { + $message_content .=''; + } + } $message_content .=' -
+

'.str_replace("\\","",$row[5]).'

-
'.get_lang('From').' '.$user_image.''.GetFullUserName($row[1]).' '.api_strtolower(get_lang('To')).' '.GetFullUserName($row[2]).' '.get_lang('From').' '.$user_image.''.GetFullUserName($row[1]).' '.api_strtolower(get_lang('To')).' '.get_lang('Me').' '.get_lang('From').' '.GetFullUserName($row[1]).' '.api_strtolower(get_lang('To')).' '.GetFullUserName($row[2]).' '.get_lang('From').' '.GetFullUserName($row[1]).' '.api_strtolower(get_lang('To')).' '.get_lang('Me').' '.$user_image.'
'.get_lang('From').' '.$name.' '.api_strtolower(get_lang('To')).' '.GetFullUserName($row[2]).' '.get_lang('From').' '.$name.' '.api_strtolower(get_lang('To')).' '.get_lang('Me').' '.get_lang('From').' '.$name.' '.api_strtolower(get_lang('To')).' '.GetFullUserName($row[2]).' '.get_lang('From').' '.$name.' '.api_strtolower(get_lang('To')).' '.get_lang('Me').'
'.get_lang('Date').'  '.$row[4].'
+

+
- +
'.str_replace("\\","",$row[6]).''.str_replace("\\","",$row[6]).'
'.(!empty($files_attachments)?implode(' | ',$files_attachments):'').'
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 9d22410565..0f6f7087f0 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -803,7 +803,7 @@ class SocialManager extends UserManager { $name = api_get_person_name($user_info['firstName'], $user_info['lastName']); $table_row[] = ''.$name.''; - $table_row[] = ''.(cut($user_info['firstName'],16)).'
'.cut($user_info['lastName'],18).''; + $table_row[] = ''.(cut($user_info['firstName'],16)).'
'.cut($user_info['lastName'],18).''; $user_anonymous = api_get_anonymous_id(); $table_data[] = $table_row; diff --git a/main/social/search.php b/main/social/search.php index c708923771..4de6ec220a 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -62,18 +62,25 @@ echo '
'; if (is_array($users) && count($users)> 0) { echo '

'.get_lang('Users').'

'; foreach($users as $user) { - $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],80); + + if (empty($user['picture_uri'])) { + $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg'; + } else { + $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL ); + } + //$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],'', USER_IMAGE_SIZE_ORIGINAL); $url_open = ''; $url_close =''; $img = $url_open.''.$url_close; $user['firstname'] = $url_open.$user['firstname'].$url_close; - $user['lastname'] = $url_open.$user['lastname'].$url_close; - $results[] = array($img, $user['firstname'],$user['lastname'], $user['tag']); + $user['lastname'] = $url_open.$user['lastname']. $url_close; + $results[] = array($img, $user['firstname'], $user['lastname'], $user['tag']); } echo '
'; echo '
'.Display::return_icon('content-post-group1.jpg',get_lang('Users')).'
'; + echo ''; echo '
'; } diff --git a/whoisonline.php b/whoisonline.php index 8b1ad8b89f..2a5b441689 100755 --- a/whoisonline.php +++ b/whoisonline.php @@ -150,32 +150,8 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || if (!api_is_anonymous()) { echo UserManager::get_search_form($_GET['q']); } - } - - //@todo move these style tag in the main/css - echo ' - '; - - SocialManager::display_user_list($user_list); - + } + SocialManager::display_user_list($user_list); if (api_get_setting('allow_social_tool') == 'true') { echo '
'; echo '';