chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor usergroup fixes

Browse Source
skala
Julio Montoya 13 years ago
parent 9cf3677546
commit d2e69f8207
5 changed files with 163 additions and 167 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      main/admin/add_users_to_usergroup.php
  2. 16
      main/admin/group_add.php
  3. 5
      main/admin/usergroups.php
  4. 13
      main/inc/lib/group_portal_manager.lib.php
  5. 6
      main/inc/lib/usergroup.lib.php

14
main/admin/add_users_to_usergroup.php
Unescape View File

@ -13,7 +13,6 @@ $cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
@ -36,7 +35,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
}
$htmlHeadXtra[] = '
<script type="text/javascript">
<script>
function add_user_to_session (code, content) {
document.getElementById("user_to_add").value = "";
@ -149,10 +148,8 @@ if ($use_extra_fields) {
$final_result = $extra_field_result[0];
}
}
//var_dump($final_result);
$data = $usergroup->get($id);
$list_in = $usergroup->get_users_by_usergroup($id);
$list_all = $usergroup->get_users_by_usergroup();
$order = array('lastname');
@ -184,7 +181,7 @@ $user_with_any_group = isset($_REQUEST['user_with_any_group']) && !empty($_REQUE
if ($user_with_any_group) {
$user_list = UserManager::get_user_list_like(array('lastname' => $first_letter_user), $order, true);
$new_user_list = array();
foreach($user_list as $item) {
foreach ($user_list as $item) {
if (!in_array($item['user_id'], $list_all)) {
$new_user_list[] = $item;
}
@ -290,9 +287,10 @@ if(!empty($errorMsg)) {
<div id="content_source">
<?php echo Display::select('elements_not_in_name', $elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
<br />
<input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
<label for="user_with_any_group_id"><?php echo get_lang('UsersRegisteredInNoGroup'); ?></label>
<label class="control-label">
<input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
<?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
</label>
</div>
</td>
<td width="10%" valign="middle" align="center">

16
main/admin/group_add.php
Unescape View File

@ -14,7 +14,6 @@ require '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
require_once $libpath.'group_portal_manager.lib.php';
// Section for the tabs
$this_section = SECTION_PLATFORM_ADMIN;
@ -22,7 +21,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
// User permissions
api_protect_admin_script();
$htmlHeadXtra[] = '<script type="text/javascript">
$htmlHeadXtra[] = '<script>
textarea = "";
num_characters_permited = 255;
function text_longitud(){
@ -36,10 +35,6 @@ function text_longitud(){
</script>';
// Database table definitions
$table_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$database = Database::get_main_database();
if (!empty($_GET['message'])) {
$message = urldecode($_GET['message']);
}
@ -49,7 +44,7 @@ $tool_name = get_lang('AddGroups');
// Create the form
$form = new FormValidator('group_add');
$form->addElement('header', '', $tool_name);
$form->addElement('header', $tool_name);
// name
$form->addElement('text', 'name', get_lang('Name'), array('size'=>60, 'maxlength'=>120));
@ -108,11 +103,10 @@ if( $form->validate()) {
$url = $values['url'];
$status = intval($values['visibility']);
$picture = $_FILES['picture'];
$parent_group_id = intval($values['parent_group']);
$parent_group_id = intval($values['parent_group']);
$group_id = GroupPortalManager::add($name, $description, $url, $status);
GroupPortalManager::set_parent_group($group_id,$parent_group_id);
GroupPortalManager::set_parent_group($group_id,$parent_group_id);
if (!empty($picture['name'])) {
$picture_uri = GroupPortalManager::update_group_picture($group_id, $_FILES['picture']['name'], $_FILES['picture']['tmp_name']);
@ -144,7 +138,7 @@ if( $form->validate()) {
Security::clear_token();
$tok = Security::get_token();
header('Location: group_list.php?action=show_message&message='.urlencode(get_lang('GroupAdded')).'&sec_token='.$tok);
exit ();
exit ();
}
} else {
if (isset($_POST['submit'])) {

5
main/admin/usergroups.php
Unescape View File

@ -10,7 +10,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
@ -100,7 +99,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') {
// Initiate the object
$form = new FormValidator('note', 'post', api_get_self().'?action='.Security::remove_XSS($_GET['action']));
// Settting the form elements
$form->addElement('header', '', get_lang('Add'));
$form->addElement('header', get_lang('Add'));
$form->addElement('text', 'name', get_lang('name'), array('size' => '70', 'id' => 'name'));
//$form->applyFilter('note_title', 'html_filter');
$form->add_html_editor('description', get_lang('Description'), false, false, array('Width' => '95%', 'Height' => '250'));
@ -116,7 +115,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') {
$values = $form->exportValues();
$res = $usergroup->save($values);
if ($res) {
Display::display_confirmation_message(get_lang('Added'));
Display::display_confirmation_message(get_lang('ItemAdded'));
}
}
Security::clear_token();

13
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -46,7 +46,7 @@ class GroupPortalManager {
* @return boolean if success
*/
public static function add($name, $description, $url, $visibility, $picture='') {
$tms = time();
$now = api_get_utc_datetime();
$table = Database :: get_main_table(TABLE_MAIN_GROUP);
$sql = "INSERT INTO $table
SET name = '".Database::escape_string($name)."',
@ -54,9 +54,9 @@ class GroupPortalManager {
picture_uri = '".Database::escape_string($picture)."',
url = '".Database::escape_string($url)."',
visibility = '".Database::escape_string($visibility)."',
created_on = FROM_UNIXTIME(".$tms."),
updated_on = FROM_UNIXTIME(".$tms.")";
$result = Database::query($sql);
created_on = '".$now."',
updated_on = '".$now."'";
Database::query($sql);
$return = Database::insert_id();
return $return;
}
@ -74,14 +74,14 @@ class GroupPortalManager {
public static function update($group_id, $name, $description, $url, $visibility, $picture_uri) {
$group_id = intval($group_id);
$table = Database::get_main_table(TABLE_MAIN_GROUP);
$tms = time();
$now = api_get_utc_datetime();
$sql = "UPDATE $table
SET name = '".Database::escape_string($name)."',
description = '".Database::escape_string($description)."',
picture_uri = '".Database::escape_string($picture_uri)."',
url = '".Database::escape_string($url)."',
visibility = '".Database::escape_string($visibility)."',
updated_on = FROM_UNIXTIME(".$tms.")
updated_on = '".$now."'
WHERE id = '$group_id'";
$result = Database::query($sql);
return $result;
@ -120,7 +120,6 @@ class GroupPortalManager {
{
$table = Database :: get_main_table(TABLE_MAIN_GROUP);
$visibility = intval($visibility);
$user_condition = '';
$sql = "SELECT name, description, picture_uri FROM $table WHERE visibility = $visibility ";
$res = Database::query($sql);
$data = array ();

6
main/inc/lib/usergroup.lib.php
Unescape View File

@ -24,6 +24,12 @@ class UserGroup extends Model {
$this->usergroup_rel_session_table = Database::get_main_table(TABLE_USERGROUP_REL_SESSION);
}
public function get_count() {
$row = Database::select('count(*) as count', $this->table, array(),'first');
return $row['count'];
}
/**
* Displays the title + grid
*/

Write Preview
Loading…
Cancel
Save