Skip to content

Commit 284de9e

Browse files
AngelFQCAngelFQC
committed
Remove E_NOTICE and fix group
1 parent 87c15cc commit 284de9e

File tree

9 files changed

+69
-46
lines changed

9 files changed

+69
-46
lines changed

‎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/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
}

‎main/social/groups.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
$item_0 = Display::div($result['picture'], array('class'=>'box_description_group_image'));
124124
$members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
125125
$item_1 = Display::div(Display::tag('h4', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title'));
126+
$item_2 = '';
127+
$item_3 = '';
126128

127129
if ($result['description'] != '') {
128130
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';

‎main/social/message_for_group_form.inc.php‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,25 @@
8484
$config = ['ToolbarSet' => 'Messages'];
8585
$form->addHtmlEditor('content', get_lang('Message'), true, false, $config);
8686

87-
$form->addElement('label', null, get_lang('AttachmentFiles'));
88-
$form->addElement('label', null, '<div id="link-more-attach">
89-
<a class="btn btn-default" href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a>'
87+
$form->addElement(
88+
'label',
89+
get_lang('AttachmentFiles'),
90+
'
91+
<div id="link-more-attach">
92+
<a class="btn btn-default" href="javascript://" onclick="return add_image_form()">
93+
' . get_lang('AddOneMoreFile') . '
94+
</a>
95+
</div>
96+
'
9097
);
9198

92-
$form->addElement('html', '<span id="filepaths"></span>');
93-
$form->addElement('file', 'attach_1', sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))));
94-
$form->addElement('html', '</div>');
99+
$form->addElement('label', null, '<div id="filepaths"></div>');
100+
$form->addElement(
101+
'file',
102+
'attach_1',
103+
sprintf(get_lang('MaximunFileSizeX'),
104+
format_file_size(api_get_setting('message_max_upload_filesize')))
105+
);
95106
$form->addButtonSend(get_lang('SendMessage'));
96107

97108
$form->setDefaults(['content' => $message, 'title' => $subject]);

‎main/template/default/social/avatar_block.tpl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<div class="social-profile">
1+
<div class="social-profile thumbnail text-center">
22
{% if show_group %}
3-
<div class="img-profile">
4-
<a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">
5-
<img src="{{ user_group_image.file }}" class="img-responsive img-circle">
6-
</a>
7-
</div>
8-
<div class="group-title"><h4>{{ user_group.name }}</h4></div>
9-
<div class="group-description">{{ user_group.description }}</div>
10-
{% if user_is_group_admin %}
11-
<div id="edit_image">
12-
<a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
13-
{{ 'EditGroup'|get_lang }}
14-
</a>
3+
<img src="{{ user_group_image.file }}" class="img-profile img-responsive img-circle">
4+
<div class="caption">
5+
<h4 class="group-title">
6+
<a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">{{ user_group.name }}</a>
7+
</h4>
8+
<p class="group-description">{{ user_group.description }}</p>
9+
{% if user_is_group_admin %}
10+
<div id="edit_image">
11+
<a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
12+
{{ 'EditGroup'|get_lang }}
13+
</a>
14+
</div>
15+
{% endif %}
1516
</div>
16-
{% endif %}
1717
{% elseif show_user %}
1818
<a href="{{ user_image.big }}" class="expand-image">
1919
<img class="img-responsive img-circle" src="{{ user_image.normal }}">

‎main/template/default/social/group_block.tpl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
<div class="panel panel-default social-avatar">
21
{{ social_avatar_block }}
3-
<p class="lead">{{ group_info.complete_name }}</p>
4-
</div>

0 commit comments

Comments
 (0)