diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php index c690982f86..586e3e3523 100644 --- a/main/admin/access_url_edit_courses_to_url.php +++ b/main/admin/access_url_edit_courses_to_url.php @@ -279,41 +279,7 @@ unset($course_list); - '; } - + if (!empty($result['users_added'])) { $message .= '

'.get_lang('UsersAdded').':

'; $i = 1; @@ -122,9 +122,9 @@ if ($_POST['form_sent']) { } if (!empty($user_added_list)) { $message .= implode(', ', $user_added_list); - } + } } - + if (!empty($result['users_deleted'])) { $message .= '

'.get_lang('UsersDeleted').':

'; $user_deleted_list = array(); @@ -240,8 +240,8 @@ if(!empty($errorMsg)) {

-

@@ -324,48 +324,9 @@ unset($sessionUsersList); ?> - - - - - - 'index.php','name' => get_lang('PlatformAdmin')); -$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes')); +$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin')); +$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes')); // Database Table Definitions @@ -39,8 +39,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){ } $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); -$htmlHeadXtra[] = ' - : @@ -248,54 +248,13 @@ if(!empty($OkMsg)) { - getJavascript('../inc/lib/xajax/'); -$htmlHeadXtra[] = ' - getJavascript('../inc/lib/xajax/'); -$htmlHeadXtra[] = ' -'; @@ -80,17 +79,17 @@ $errorMsg = ''; $sessions=array(); $usergroup = new UserGroup(); $id = intval($_GET['id']); -if($_POST['form_sent']) { - $form_sent = $_POST['form_sent']; - $elements_posted = $_POST['elements_in_name']; +if (isset($_POST['form_sent']) && $_POST['form_sent']) { + $form_sent = $_POST['form_sent']; + $elements_posted = $_POST['elements_in_name']; if (!is_array($elements_posted)) { $elements_posted = array(); } if ($form_sent == 1) { - //added a parameter to send emails when registering a user + //added a parameter to send emails when registering a user $usergroup->subscribe_sessions_to_usergroup($id, $elements_posted); header('Location: usergroups.php'); - exit; + exit; } } $data = $usergroup->get($id); @@ -101,9 +100,9 @@ $session_list = SessionManager::get_sessions_list(array(), array('name')); $elements_not_in = $elements_in= array(); if (!empty($session_list)) { - foreach($session_list as $session) { - if (in_array($session['id'], $session_list_in)) { - $elements_in[$session['id']] = $session['name']; + foreach($session_list as $session) { + if (in_array($session['id'], $session_list_in)) { + $elements_in[$session['id']] = $session['name']; } else { $elements_not_in[$session['id']] = $session['name']; } @@ -135,8 +134,8 @@ function search_sessions($needle,$type) { ' LIMIT 11';*/ } else { $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%")); - } - $i=0; + } + $i=0; if ($type=='single') { /* while ($user = Database :: fetch_array($rs)) { @@ -151,9 +150,9 @@ function search_sessions($needle,$type) { $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));*/ } else { $return .= ''; echo '

'; } - } + }*/ } echo Display::input('hidden','id',$id); echo Display::input('hidden','form_sent','1'); @@ -243,16 +243,16 @@ if(!empty($errorMsg)) {
-
- 'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?> + 'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
- registerFunction('search_users'); -function search_users($needle,$type,$relation_type) { +function search_users($needle,$type,$relation_type) { global $tbl_user,$tbl_user_rel_access_url, $tbl_group_rel_user,$group_id,$_configuration; $xajax_response = new XajaxResponse(); $return = $return_origin = $return_destination = ''; @@ -87,7 +87,7 @@ function search_users($needle,$type,$relation_type) { } else { $return_destination .= ''; } - + $xajax_response -> addAssign('ajax_destination_list','innerHTML',api_utf8_encode($return_destination)); } else { @@ -110,7 +110,7 @@ function search_users($needle,$type,$relation_type) { $needle = Database::escape_string($needle); $needle = api_convert_encoding($needle, $charset, 'utf-8'); $user_anonymous=api_get_anonymous_id(); - + $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; if ($type == 'single') { @@ -148,7 +148,7 @@ function search_users($needle,$type,$relation_type) { } else { // multiple if (!empty($group_id) && !empty($relation_type)) { - $sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user + $sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id<>'$user_anonymous' $without_user_id $order_clause "; if ($_configuration['multiple_access_urls']) { $access_url_id = api_get_current_access_url_id(); @@ -160,7 +160,7 @@ function search_users($needle,$type,$relation_type) { AND user.user_id<>'$user_anonymous' $without_user_id $order_clause "; } } - + $rs_multiple = Database::query($sql); $return_origin .= ' @@ -537,44 +537,6 @@ if(!empty($errorMsg)) { 'index.php','name' => get_lang('PlatformAdmin')); -$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes')); +$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin')); +$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes')); // Database Table Definitions @@ -149,7 +149,7 @@ if ($use_extra_fields) { } $data = $usergroup->get($id); $list_in = $usergroup->get_users_by_usergroup($id); -$list_all = $usergroup->get_users_by_usergroup(); +$list_all = $usergroup->get_users_by_usergroup(); $order = array('lastname'); if (api_is_western_name_order()) { @@ -308,43 +308,6 @@ if(!empty($errorMsg)) { ?> '; $formSent=0; @@ -199,7 +164,7 @@ if ($_configuration['multiple_access_urls']) { ORDER BY firstname"; } else { $sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user - WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user + WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user ORDER BY firstname "; } diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php index f5131ff7e0..f30d8308d7 100755 --- a/main/admin/usergroups.php +++ b/main/admin/usergroups.php @@ -2,6 +2,7 @@ /* For licensing terms, see /license.txt */ /** + * @todo use a controller * @package chamilo.admin */ diff --git a/main/session/add_courses_to_session.php b/main/session/add_courses_to_session.php index fcd3d8e7c3..73e0aadb3f 100644 --- a/main/session/add_courses_to_session.php +++ b/main/session/add_courses_to_session.php @@ -348,45 +348,6 @@ unset($sessionCourses); '; diff --git a/main/session/session_course_user.php b/main/session/session_course_user.php index d62d3b36f7..01fb7df6de 100644 --- a/main/session/session_course_user.php +++ b/main/session/session_course_user.php @@ -202,49 +202,9 @@ unset($sessionCourses); - setForm($form, 'add'); +$usergroup->setGroupType($usergroup::SOCIAL_CLASS); +$usergroup->setForm($form, 'add', array()); if ($form->validate()) { $values = $form->exportValues(); - $values['type'] = $usergroup::SOCIAL_CLASS; $groupId = $usergroup->save($values); header('Location: groups.php?id='.$groupId.'&action=show_message&message='.urlencode(get_lang('GroupAdded'))); exit(); @@ -53,4 +52,4 @@ $tpl->assign('social_left_content', $social_left_content); $tpl->assign('social_right_content', $social_right_content); $social_layout = $tpl->get_template('layout/social_layout.tpl'); -$tpl->display($social_layout); +$tpl->display($social_layout); \ No newline at end of file diff --git a/main/social/group_edit.php b/main/social/group_edit.php index 1fbb63c44e..bb913fc5bc 100644 --- a/main/social/group_edit.php +++ b/main/social/group_edit.php @@ -41,7 +41,7 @@ if (!$usergroup->is_group_admin($group_id)) { // Create the form $form = new FormValidator('group_edit', 'post', '', ''); $form->addElement('hidden', 'id', $group_id); - +$usergroup->setGroupType($usergroup::SOCIAL_CLASS); $usergroup->setForm($form, 'edit', $group_data); // Set default values @@ -51,6 +51,7 @@ $form->setDefaults($group_data); if ($form->validate()) { $group = $form->exportValues(); $group['id'] = $group_id; + $group['type'] = $usergroup::SOCIAL_CLASS; $usergroup->update($group); $tok = Security::get_token(); header( @@ -61,20 +62,6 @@ if ($form->validate()) { exit(); } -// Group picture -$image_path = $usergroup->get_group_picture_path_by_id($group_id, 'web'); -$image_dir = $image_path['dir']; -$image = $image_path['file']; -$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_CODE_PATH).'img/unknown_group.jpg'); -$image_size = api_getimagesize($image_file); - -// get the path,width and height from original picture -$big_image = $image_dir.'big_'.$image; -$big_image_size = api_getimagesize($big_image); -$big_image_width = $big_image_size['width']; -$big_image_height = $big_image_size['height']; -$url_big_image = $big_image.'?rnd='.time(); - $social_left_content = SocialManager::show_social_menu('group_edit', $group_id); $social_right_content = '
'; $social_right_content .= $form->return_form(); @@ -86,5 +73,4 @@ $tpl->assign('social_left_content', $social_left_content); $tpl->assign('social_right_content', $social_right_content); $social_layout = $tpl->get_template('layout/social_layout.tpl'); -$tpl->display($social_layout); - +$tpl->display($social_layout); \ No newline at end of file diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index 5a0fdd0c03..d1603fb52d 100644 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -445,41 +445,6 @@ if (is_array($members) && count($members)>0) { } $htmlHeadXtra[] = '