Skip to content

Commit 6a4873f

Browse files
ywarnierywarnier
committed
Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.0-rc
2 parents 1351b8b + 284de9e commit 6a4873f

14 files changed

+89
-61
lines changed

‎main/forum/forumfunction.inc.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ function store_forumcategory($values, $courseInfo = array(), $showMessage = true
542542
$new_max = $row['sort_max'] + 1;
543543
$session_id = api_get_session_id();
544544
$clean_cat_title = $values['forum_category_title'];
545+
$last_id = null;
545546

546547
if (isset($values['forum_category_id'])) {
547548
// Storing after edition.
@@ -701,17 +702,17 @@ function store_forum($values, $courseInfo = array(), $returnId = false)
701702
$params = [
702703
'forum_title'=> $values['forum_title'],
703704
'forum_image'=> $sql_image,
704-
'forum_comment'=> $values['forum_comment'],
705-
'forum_category'=> $values['forum_category'],
706-
'allow_anonymous'=> $values['allow_anonymous_group']['allow_anonymous'],
707-
'allow_edit'=> $values['students_can_edit_group']['students_can_edit'],
708-
'approval_direct_post'=> $values['approval_direct_group']['approval_direct'],
709-
'allow_attachments'=> $values['allow_attachments_group']['allow_attachments'],
710-
'allow_new_threads'=> $values['allow_new_threads_group']['allow_new_threads'],
711-
'default_view'=> $values['default_view_type_group']['default_view_type'],
712-
'forum_of_group'=> $values['group_forum'],
713-
'forum_group_public_private'=> $values['public_private_group_forum_group']['public_private_group_forum'],
714-
'forum_order'=> $new_max,
705+
'forum_comment'=> isset($values['forum_comment']) ? $values['forum_comment'] : null,
706+
'forum_category'=> isset($values['forum_category']) ? $values['forum_category'] : null,
707+
'allow_anonymous'=> isset($values['allow_anonymous_group']['allow_anonymous']) ? $values['allow_anonymous_group']['allow_anonymous'] : null,
708+
'allow_edit'=> isset($values['students_can_edit_group']['students_can_edit']) ? $values['students_can_edit_group']['students_can_edit'] : null,
709+
'approval_direct_post'=> isset($values['approval_direct_group']['approval_direct']) ? $values['approval_direct_group']['approval_direct'] : null,
710+
'allow_attachments'=> isset($values['allow_attachments_group']['allow_attachments']) ? $values['allow_attachments_group']['allow_attachments'] : null,
711+
'allow_new_threads'=> isset($values['allow_new_threads_group']['allow_new_threads']) ? $values['allow_new_threads_group']['allow_new_threads'] : null,
712+
'default_view'=> isset($values['default_view_type_group']['default_view_type']) ? $values['default_view_type_group']['default_view_type'] : null,
713+
'forum_of_group'=> isset($values['group_forum']) ? $values['group_forum'] : null,
714+
'forum_group_public_private'=> isset($values['public_private_group_forum_group']['public_private_group_forum']) ? $values['public_private_group_forum_group']['public_private_group_forum'] : null,
715+
'forum_order'=> isset($new_max) ? $new_max : null,
715716
'session_id'=> $session_id,
716717
];
717718

‎main/gamification/my_progress.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
$lastCourseAccess = $trackCourseAccessRepository->getLastAccessByUser($user);
3636

37-
if (!empty($lastCourseAccess)) {
37+
if (!empty($lastCourseAccess->getSessionId())) {
3838
$urlWithSession = api_get_self() . '?' . http_build_query([
3939
'session_id' => $lastCourseAccess->getSessionId()
4040
]);

‎main/inc/ajax/social.ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
SocialManager::readContentWithOpenGraph($url)
229229
);
230230
}
231-
echo $html;
231+
echo utf8_decode($html);
232232
break;
233233
default:
234234
echo '';

‎main/inc/lib/group_portal_manager.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ public static function show_group_column_information($group_id, $user_id, $show
12561256
break;
12571257
case GROUP_USER_PERMISSION_HRM:
12581258
$relation_group_title = get_lang('IAmAHRM');
1259-
$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" data-title="'.get_lang('ComposeMessage').' title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace' => '6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
1259+
$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" data-size="lg" data-title="'.get_lang('ComposeMessage').' title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace' => '6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
12601260
$links .= '<li><a href="group_view.php?id='.$group_id.'">'.Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace' => '6')).'<span class="'.($show == 'messages_list' ? 'social-menu-text-active' : 'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
12611261
$links .= '<li><a href="group_invitation.php?id='.$group_id.'">'.Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace' => '6')).'<span class="'.($show == 'invite_friends' ? 'social-menu-text-active' : 'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
12621262
$links .= '<li><a href="group_members.php?id='.$group_id.'">'.Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace' => '6')).'<span class="'.($show == 'member_list' ? 'social-menu-text-active' : 'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';

‎main/inc/lib/internationalization.lib.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -742,22 +742,26 @@ function date_to_str_ago($date)
742742
$time %= $seconds;
743743
}
744744

745-
if ($key_result[0] == $min_day && $key_result[1]== $min_minute) {
746-
$key_result[1] = ' 0 '.$min_hours;
747-
$str_result[0] = $time_result[0].' '.$key_result[0];
748-
$str_result[1] = $key_result[1];
749-
}
745+
if (!empty($key_result)) {
746+
if ($key_result[0] == $min_day && $key_result[1]== $min_minute) {
747+
$key_result[1] = ' 0 '.$min_hours;
748+
$str_result[0] = $time_result[0].' '.$key_result[0];
749+
$str_result[1] = $key_result[1];
750+
}
750751

751-
if ($key_result[0] == $min_year && ($key_result[1] == $min_day || $key_result[1] == $min_week)) {
752-
$key_result[1] = ' 0 '.$min_months;
753-
$str_result[0] = $time_result[0].' '.$key_result[0];
754-
$str_result[1] = $key_result[1];
752+
if ($key_result[0] == $min_year && ($key_result[1] == $min_day || $key_result[1] == $min_week)) {
753+
$key_result[1] = ' 0 '.$min_months;
754+
$str_result[0] = $time_result[0].' '.$key_result[0];
755+
$str_result[1] = $key_result[1];
756+
}
755757
}
756758

757-
if (!empty($str_result[1])) {
758-
$str = $str_result[0].', '.$str_result[1];
759-
} else {
760-
$str = $str_result[0];
759+
if (!empty($str_result)) {
760+
if (!empty($str_result[1])) {
761+
$str = $str_result[0].', '.$str_result[1];
762+
} else {
763+
$str = $str_result[0];
764+
}
761765
}
762766

763767
date_default_timezone_set($system_timezone);

‎main/inc/lib/message.lib.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,8 @@ public static function display_message_for_group($group_id, $topic_id, $is_membe
12451245
[
12461246
'class' => 'ajax btn btn-default',
12471247
'title' => get_lang('Edit'),
1248-
'data-title' => get_lang('Edit')
1248+
'data-title' => get_lang('Edit'),
1249+
'data-size' => 'lg'
12491250
]
12501251
);
12511252
}
@@ -1268,7 +1269,8 @@ public static function display_message_for_group($group_id, $topic_id, $is_membe
12681269
[
12691270
'class' => 'ajax btn btn-default',
12701271
'title' => get_lang('Reply'),
1271-
'data-title' => get_lang('Reply')
1272+
'data-title' => get_lang('Reply'),
1273+
'data-size' => 'lg'
12721274
]
12731275
);
12741276

@@ -1311,10 +1313,10 @@ public static function display_message_for_group($group_id, $topic_id, $is_membe
13111313

13121314
$links.= '<div id="message-reply-link">';
13131315
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
1314-
$links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
1316+
$links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
13151317
Display :: return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
13161318
}
1317-
$links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
1319+
$links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
13181320
$links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
13191321
$links.= '</div>';
13201322

‎main/inc/lib/myspace.lib.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public static function display_tracking_user_overview()
280280
$t_head .= ' <th style="padding:0;border-bottom:0;border-right:0;"><span>'.get_lang('LatestLogin').'</span></th>';
281281
$t_head .= ' </tr></table>';
282282

283-
$addparams = array('view' => 'admin', 'display' => 'useroverview');
283+
$addparams = array('view' => 'admin', 'display' => 'user');
284284

285285
$table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0);
286286
$table->additional_parameters = $addparams;
@@ -301,6 +301,8 @@ public static function display_tracking_user_overview()
301301

302302
public static function display_tracking_coach_overview($export_csv)
303303
{
304+
global $charset;
305+
304306
if ($export_csv) {
305307
$is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT);
306308
} else {

‎main/inc/lib/sortable_table.class.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,9 @@ public function filter_data($row)
901901
{
902902
$url_params = $this->get_sortable_table_param_string().'&amp;'.$this->get_additional_url_paramstring();
903903
foreach ($this->column_filters as $column => & $function) {
904-
$row[$column] = call_user_func($function, $row[$column], $url_params, $row);
904+
$firstParam = isset($row[$column]) ? $row[$column] : 0;
905+
906+
$row[$column] = call_user_func($function, $firstParam, $url_params, $row);
905907
}
906908
if (count($this->form_actions) > 0) {
907909
if (strlen($row[0]) > 0) {

‎main/inc/lib/usergroup.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ public function show_group_column_information($group_id, $user_id, $show = '')
20202020
break;
20212021
case GROUP_USER_PERMISSION_HRM:
20222022
$relation_group_title = get_lang('IAmAHRM');
2023-
$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" title="'.get_lang('ComposeMessage').'" data-title="'.get_lang('ComposeMessage').'">'.
2023+
$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" title="'.get_lang('ComposeMessage').'" data-size="lg" data-title="'.get_lang('ComposeMessage').'">'.
20242024
Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
20252025
$links .= '<li><a href="group_view.php?id='.$group_id.'">'.
20262026
Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';

‎main/social/group_view.php‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function remove_image_form(id_elem1) {
4444
if (filepaths.childNodes.length < 3) {
4545
var link_attach = document.getElementById("link-more-attach");
4646
if (link_attach) {
47-
link_attach.innerHTML=\'<a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a>\';
47+
link_attach.innerHTML=\'<a href="javascript://" class="btn btn-default" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a>\';
4848
}
4949
}
5050
}
@@ -62,7 +62,12 @@ function add_image_form() {
6262
filepaths.appendChild(elem1);
6363
id_elem1 = "filepath_"+counter_image;
6464
id_elem1 = "\'"+id_elem1+"\'";
65-
document.getElementById("filepath_"+counter_image).innerHTML = "<input type=\"file\" name=\"attach_"+counter_image+"\" size=\"20\" />&nbsp;<a href=\"javascript:remove_image_form("+id_elem1+")\"><img src=\"'.api_get_path(WEB_IMG_PATH).'delete.gif\"></a>";
65+
document.getElementById("filepath_"+counter_image).innerHTML = "\n\
66+
<input type=\"file\" name=\"attach_"+counter_image+"\" size=\"20\" />\n\
67+
<a href=\"javascript:remove_image_form("+id_elem1+")\">\n\
68+
<img src=\"' . api_get_path(WEB_IMG_PATH) . 'delete.gif\">\n\
69+
</a>\n\
70+
";
6671
6772
if (filepaths.childNodes.length == 3) {
6873
var link_attach = document.getElementById("link-more-attach");
@@ -199,7 +204,8 @@ function validate_text_empty (str,msg) {
199204
[
200205
'class' => 'ajax btn btn-default',
201206
'title' => get_lang('ComposeMessage'),
202-
'data-title' => get_lang('ComposeMessage')
207+
'data-title' => get_lang('ComposeMessage'),
208+
'data-size' => 'lg'
203209
]
204210
);
205211
} else {
@@ -217,7 +223,8 @@ function validate_text_empty (str,msg) {
217223
[
218224
'class' => 'ajax btn btn-default',
219225
'title' => get_lang('ComposeMessage'),
220-
'data-title' => get_lang('ComposeMessage')
226+
'data-title' => get_lang('ComposeMessage'),
227+
'data-size' => 'lg'
221228
]
222229
);
223230
}

0 commit comments

Comments
 (0)