'; + } } @@ -321,9 +338,11 @@ class MessageManager * @return void */ public static function delete_message_attachment_file($message_id,$message_uid) { + $message_id = intval($message_id); $message_uid = intval($message_uid); $table_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT); + $sql= "SELECT * FROM $table_message_attach WHERE message_id = '$message_id'"; $rs = Database::query($sql,__FILE__,__LINE__); $new_paths = array(); @@ -445,7 +464,7 @@ class MessageManager $i++; } return $message_list; - } + } /** * Gets information about number messages sent * @author Isaac FLores Paz
';
+echo get_lang('Groups');
+echo '
';
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
@@ -22,7 +36,7 @@ $form->applyFilter('name', 'trim');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
// Description
-$form->addElement('text', 'description', get_lang('Description'));
+$form->addElement('textarea', 'description', get_lang('Description'));
$form->applyFilter('description', 'html_filter');
$form->applyFilter('description', 'trim');
@@ -34,40 +48,42 @@ $form->applyFilter('url', 'trim');
// Picture
$form->addElement('file', 'picture', get_lang('AddPicture'));
-
$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
-
$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
+// Status
+$status = array();
+$status[GROUP_PERMISSION_OPEN] = get_lang('Open');
+$status[GROUP_PERMISSION_CLOSED] = get_lang('Closed');
+$status[GROUP_PERMISSION_APPROVAL_NEEDED] = get_lang('ApprovalNeeded');
-/*
- $form->add_textfield('id_text_name', api_xml_http_response_encode(get_lang('SendMessageTo')),true,array('size' => 40,'id'=>'id_text_name','onkeyup'=>'send_request_and_search()','autocomplete'=>'off','style'=>'padding:0px'));
- $form->addRule('id_text_name', api_xml_http_response_encode(get_lang('ThisFieldIsRequired')), 'required');
- $form->addElement('html','');
- $form->addElement('hidden','user_list',0,array('id'=>'user_list'));
-
-$form->add_textfield('title', api_xml_http_response_encode(get_lang('Title')));
-$form->add_html_editor('content', '', false, false, array('ToolbarSet' => 'Messages', 'Width' => '95%', 'Height' => '250'));
-if (isset($_GET['re_id'])) {
- $form->addElement('hidden','re_id',Security::remove_XSS($_GET['re_id']));
- $form->addElement('hidden','save_form','save_form');
-}
+$form->addElement('select', 'visibility', get_lang('GroupPermissions'), $status);
-*/
-$form->addElement('style_submit_button','add_group', api_xml_http_response_encode(get_lang('AddGroup')),'class="save"');
+$form->addElement('style_submit_button','add_group', get_lang('AddGroup'),'class="save"');
$form->setRequiredNote(api_xml_http_response_encode('* '.get_lang('ThisFieldIsRequired').''));
$form->setDefaults($default);
if ($form->validate()) {
$values = $form->exportValues();
- var_dump($values);
- $receiver_user_id = $values['user_list'];
- $title = $values['title'];
- $content = $values['content'];
- //all is well, send the message
- //MessageManager::send_message($receiver_user_id, $title, $content);
- //MessageManager::display_success_message($receiver_user_id);
+
+ $picture_element = & $form->getElement('picture');
+ $picture = $picture_element->getValue();
+ $picture_uri = '';
+ $name = $values['name'];
+ $description = $values['description'];
+ $url = $values['url'];
+ $status = intval($values['visibility']);
+ $picture = $_FILES['picture'];
+
+ $group_id = GroupPortalManager::add($name, $description, $url, $status);
+ GroupPortalManager::add_user_to_group(api_get_user_id(), $group_id,GROUP_USER_PERMISSION_ADMIN);
+
+ if (!empty($picture['name'])) {
+ $picture_uri = GroupPortalManager::update_group_picture($group_id, $_FILES['picture']['name'], $_FILES['picture']['tmp_name']);
+ GroupPortalManager::update($group_id, $name, $description, $url,$status, $picture_uri);
+ }
+
} else {
$form->display();
}
diff --git a/main/social/group_edit.php b/main/social/group_edit.php
index 251b6818b8..9cb8ad3aa9 100644
--- a/main/social/group_edit.php
+++ b/main/social/group_edit.php
@@ -49,7 +49,7 @@ $form->applyFilter('name', 'trim');
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
// Description
-$form->addElement('text', 'description', get_lang('Description'));
+$form->addElement('textarea', 'description', get_lang('Description'));
$form->applyFilter('description', 'html_filter');
$form->applyFilter('description', 'trim');
@@ -71,9 +71,10 @@ if (strlen($group_data['picture_uri']) > 0) {
$status = array();
$status[GROUP_PERMISSION_OPEN] = get_lang('Open');
$status[GROUP_PERMISSION_CLOSED] = get_lang('Closed');
-
+$status[GROUP_PERMISSION_APPROVAL_NEEDED] = get_lang('ApprovalNeeded');
$form->addElement('select', 'visibility', get_lang('GroupPermissions'), $status, array());
+
// Submit button
$form->addElement('style_submit_button', 'submit', get_lang('ModifyInformation'), 'class="save"');
diff --git a/main/social/group_members.php b/main/social/group_members.php
new file mode 100644
index 0000000000..cbb9f846dd
--- /dev/null
+++ b/main/social/group_members.php
@@ -0,0 +1,76 @@
+'home.php','name' => get_lang('Social'));
+
+api_block_anonymous_users();
+
+Display :: display_header($tool_name, 'Groups');
+SocialManager::show_social_menu();
+echo '';
+echo get_lang('GroupMembers');
+echo '
';
+
+// Group information
+$group_id = intval($_GET['id']);
+$admins = GroupPortalManager::get_users_by_group($group_id, true,GROUP_USER_PERMISSION_ADMIN);
+$show_message = '';
+
+if (isset($_GET['action']) && $_GET['action']=='add') {
+ // we add a user only if is a open group
+ $user_join = intval($_GET['u']);
+ //if i'm the admin
+ if (isset($admins[api_get_user_id()]) && $admins[api_get_user_id()]['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
+ GroupPortalManager::update_user_permission($user_join, $group_id);
+ $show_message = get_lang('UserAdded');
+ }
+}
+
+if (isset($_GET['action']) && $_GET['action']=='delete') {
+ // we add a user only if is a open group
+ $user_join = intval($_GET['u']);
+ //if i'm the admin
+ if (isset($admins[api_get_user_id()]) && $admins[api_get_user_id()]['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
+ GroupPortalManager::delete_user_rel_group($user_join, $group_id);
+ $show_message = get_lang('UserDeleted');
+ }
+}
+
+$users = GroupPortalManager::get_users_by_group($group_id, true);
+
+if (! empty($show_message)){
+ Display :: display_normal_message($show_message);
+}
+
+$new_member_list = array();
+
+foreach($users as $user) {
+ switch ($user['relation_type']) {
+ case GROUP_USER_PERMISSION_ADMIN:
+ $user['link'] = Display::return_icon('admin_star.png', get_lang('Admin'));
+ break;
+ case GROUP_USER_PERMISSION_READER:
+ $user['link'] = ''.Display::return_icon('delete.png', get_lang('Delete')).'';
+ break;
+ case GROUP_USER_PERMISSION_PENDING_INVITATION:
+ $user['link'] = ''.Display::return_icon('pending_invitation.png', get_lang('PendingInvitation')).'';
+ break;
+ }
+ $new_member_list[] = $user;
+}
+
+if (count($new_member_list) > 0) {
+ Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));
+}
+
+
+Display :: display_footer();
+?>
\ No newline at end of file
diff --git a/main/social/groups.php b/main/social/groups.php
index b7a1ae93d5..a7d1a300ce 100644
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -19,25 +19,41 @@ echo '';
echo get_lang('Groups');
echo '
';
+// getting group information
$group_id = intval($_GET['id']);
+$group_info = GroupPortalManager::get_group_data($group_id);
-if ($group_id != 0 ) {
+if ($group_id != 0 ) {
+
+ //Loading group information
if (isset($_GET['status']) && $_GET['status']=='sent') {
Display::display_confirmation_message(api_xml_http_response_encode(get_lang('MessageHasBeenSent')), false);
}
+
if (isset($_GET['action']) && $_GET['action']=='leave') {
$user_leaved = intval($_GET['u']);
GroupPortalManager::delete_user_rel_group($user_leaved, $group_id);
- }
+ }
+
+ // add a user to a group if its open
+
if (isset($_GET['action']) && $_GET['action']=='join') {
- $user_join = intval($_GET['u']);
- GroupPortalManager::add_user_to_group($user_join, $group_id);
- }
- $group_info = GroupPortalManager::get_group_data($group_id);
+ // we add a user only if is a open group
+ $user_join = intval($_GET['u']);
+ if ($group_info['visibility'] != GROUP_PERMISSION_CLOSED) {
+ if ($group_info['visibility'] == GROUP_PERMISSION_OPEN) {
+ GroupPortalManager::add_user_to_group($user_join, $group_id);
+ } else {
+ GroupPortalManager::add_user_to_group($user_join, $group_id, GROUP_USER_PERMISSION_PENDING_INVITATION);
+ }
+ }
+ }
+
$picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
- $tags = GroupPortalManager::get_group_tags($group_id,true);
- $users = GroupPortalManager::get_users_by_group($group_id,true);
+ $tags = GroupPortalManager::get_group_tags($group_id, true);
+ $users = GroupPortalManager::get_users_by_group($group_id, true);
+
//@todo this must be move to default.css for dev use only
echo '';
echo '';
+
//Group's title
echo '
'; // end layout messages
echo ''; // end layout right
+
} else {
- // Newest groups ----------------
+
+ // Newest groups --------
+
$results = GroupPortalManager::get_groups_by_age(10 , true);
$groups = array();
foreach ($results as $result) {
@@ -132,9 +169,10 @@ if ($group_id != 0 ) {
if (count($groups) > 0) {
echo ''.$group_info['name'].'
'; @@ -80,18 +97,28 @@ if ($group_id != 0 ) { echo '';
echo ''.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('ComposeMessage')).'';
echo '
';
-
+
echo get_lang('Members').' : ';
+
echo '';
- foreach($users as $user) {
- echo '
';
+
- echo ''.$user['picture_uri'].'
'.$user['firstname'].' '.$user['lastname'].'
';
+ foreach($users as $user) {
+ if ($user['relation_type'] != GROUP_USER_PERMISSION_PENDING_INVITATION) {
+ if ($user['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
+ $user['lastname'].= Display::return_icon('admin_star.png', get_lang('Admin'));
+ }
+ echo '';
}
+ }
echo ''.$user['firstname'].' '.$user['lastname'].'
';
+ echo '
'; // end layout left
@@ -118,9 +152,12 @@ if ($group_id != 0 ) {
MessageManager::display_messages_for_group($group_id);
echo '';
+
if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
//im a member
- if ($users[api_get_user_id()]['relation_type']!='') {
+
+ if ($users[api_get_user_id()]['relation_type'] !='' ) {
+
$my_group_role = $users[api_get_user_id()]['relation_type'];
// I'm just a reader
if ($my_group_role == GROUP_USER_PERMISSION_READER) {
@@ -101,15 +128,22 @@ if ($group_id != 0 ) {
} elseif ($my_group_role == GROUP_USER_PERMISSION_ADMIN) {
echo 'Im the admin/';
echo ''.get_lang('EditGroup').'';
+ echo ''.get_lang('MemberList').'';
echo 'Invite others';
+ } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
+ echo 'You should Wait';
}
} else {
- //im not a member
- echo ''.get_lang('JoinGroup').'';
+ if ($group_info['visibility']!= GROUP_PERMISSION_CLOSED ) {
+ //im not a member
+ echo ''.get_lang('JoinGroup').'';
+ }
}
} else {
//im not a member
- echo ''.get_lang('JoinGroup').'';
+ if ($group_info['visibility'] != GROUP_PERMISSION_CLOSED) {
+ echo ''.get_lang('JoinGroup').'';
+ }
}
echo '
'; // end layout permissions
echo ''.get_lang('Newest').'
'; Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); - } + } + + // Pop groups ----- - // Pop groups ---------------- $results = GroupPortalManager::get_groups_by_popularity(10 , true); $groups = array(); foreach ($results as $result) { @@ -149,25 +187,25 @@ if ($group_id != 0 ) { } - // My groups + // My groups ----- + $results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true); $groups = array(); + foreach ($results as $result) { $id = $result['id']; $url_open = ''; - $url_close = ''; + $url_close = ''; + if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { + $result['name'].= Display::return_icon('admin_star.png', get_lang('Admin')); + } $groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close); } echo ''.get_lang('MyGroups').'
'; + echo ''.get_lang('CreateAgroup').''; if (count($groups) > 0) { Display::display_sortable_grid('search_users', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); - } else { - echo get_lang('CreateAgroup'); } -} - - - - +} Display :: display_footer(); ?> \ No newline at end of file diff --git a/main/social/invitations.php b/main/social/invitations.php index c4dcd94cfc..8acd8d080e 100644 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -1,7 +1,7 @@ 'home.php','name' => get_lang('Social')); +$htmlHeadXtra[] = ''; //jQuery +$htmlHeadXtra[] = ' +'; +api_block_anonymous_users(); + Display :: display_header($tool_name, 'Groups'); SocialManager::show_social_menu(); echo '';
echo get_lang('Invitations');
-echo '
';
+echo '';
-
-api_block_anonymous_users();
-$request=api_is_xml_http_request();
-$language_variable=api_xml_http_response_encode(get_lang('PendingInvitations'));
-$language_comment=api_xml_http_response_encode(get_lang('SocialInvitesComment'));
+
+$request = api_is_xml_http_request();
+$language_variable = api_xml_http_response_encode(get_lang('PendingInvitations'));
+$language_comment = api_xml_http_response_encode(get_lang('SocialInvitesComment'));
//api_display_tool_title($language_variable);
?>
+.confirm {
+ border-top:1px solid #D8DFEA;
}
-for ($i=0;$i<$number_loop;$i++) {
-?>
-
-
-
-
-
|
-
- +
+
+
+
+
+
+ ';
+
+if (count($list_get_invitation_sent) > 0 ){
+ echo get_lang('InvitationSent');
+ foreach ($list_get_invitation_sent as $invitation) {
+ $sender_user_id = $invitation['user_receiver_id'];?>
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main/social/profile.php b/main/social/profile.php
index 12e391ce11..d01d30f9cf 100644
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -391,9 +391,9 @@ echo '|
+
+ |
+
+
+
+
+
+
+
+
+ |
+
'; echo '
'; + echo ' '.Display::return_icon('message_new.png').' '.get_lang('SendMessage').'
'; + + //check if I already sent an invitation message + $invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id()); + + if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) { + echo ''.get_lang('YouAlreadySentAnInvitation').''; + } else { + echo ' '.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).' '.get_lang('SendInvitation').''; + } + + + echo '
'; diff --git a/main/social/register_friend.php b/main/social/register_friend.php index 94accdf016..c5630d7b9f 100755 --- a/main/social/register_friend.php +++ b/main/social/register_friend.php @@ -17,21 +17,22 @@ $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='3';//my friend + $relation_type=SOCIALFRIEND;//my friend } else { - $relation_type='1';//Contact unknown + $relation_type=SOCIALUNKNOW;//Contact unknown } if (isset($_POST['friend_id'])) { - SocialManager::register_friend ((int)$the_current_user_id,(int)$my_current_friend,(int)$relation_type); - SocialManager::register_friend ((int)$my_current_friend,(int)$the_current_user_id,(int)$relation_type); - SocialManager::invitation_accepted ((int)$my_current_friend,(int)$the_current_user_id); + + SocialManager::register_friend($the_current_user_id,$my_current_friend,$relation_type); + SocialManager::register_friend($my_current_friend,$the_current_user_id,$relation_type); + SocialManager::invitation_accepted($my_current_friend,$the_current_user_id); + if (isset($_POST['is_my_friend'])) { echo api_xml_http_response_encode(get_lang('AddedContactToList')); } else { Display::display_normal_message(api_xml_http_response_encode(get_lang('AddedContactToList'))); } - } if (isset($_POST['denied_friend_id'])) { SocialManager::invitation_denied((int)$my_denied_current_friend,(int)$the_current_user_id);