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

Remove gid unset, use api_get_group_id, api_get_course_id

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 053ba518d4
commit 0a8495e3b5
11 changed files with 78 additions and 71 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. 2
      main/document/create_document.php
  2. 6
      main/forum/index.php
  3. 7
      main/forum/viewforumcategory.php
  4. 2
      main/inc/lib/access_url_edit_users_to_url_functions.lib.php
  5. 4
      main/inc/lib/hook/README.md
  6. 2
      main/inc/lib/jpegcam/webcam_receiver.php
  7. 19
      main/inc/lib/search/search_widget.php
  8. 21
      main/inc/lib/svg-edit/extensions/imagelib/groups.php
  9. 3
      main/permissions/group_permissions.inc.php
  10. 13
      main/user/subscribe_class.php
  11. 14
      main/user/subscribe_user.php

2
main/document/create_document.php
Unescape View File

@ -274,7 +274,7 @@ if ($is_certificate_mode) {
} }
// Show read-only box only in groups // Show read-only box only in groups
if (!empty($_SESSION['_gid'])) { if (!empty($groupId)) {
$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
} }
$form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');

6
main/forum/index.php
Unescape View File

@ -174,12 +174,6 @@ if (!api_is_anonymous()) {
} }
} }
/* CLEAN GROUP ID FOR AJAXFILEMANAGER */
if (isset($_SESSION['_gid'])) {
unset($_SESSION['_gid']);
}
/* ACTION LINKS */ /* ACTION LINKS */
echo '<div class="actions">'; echo '<div class="actions">';

7
main/forum/viewforumcategory.php
Unescape View File

@ -168,14 +168,7 @@ if ($action_forums != 'add') {
} }
} }
/* CLEAN GROUP ID FOR AJAXFILEMANAGER */
if (isset($_SESSION['_gid'])) {
unset($_SESSION['_gid']);
}
/* Display Forum Categories and the Forums in it */ /* Display Forum Categories and the Forums in it */
$html = ''; $html = '';
$html .= '<div class="category-forum">'; $html .= '<div class="category-forum">';

2
main/inc/lib/access_url_edit_users_to_url_functions.lib.php
Unescape View File

@ -28,7 +28,7 @@ class Accessurledituserstourl
*/ */
function search_users($needle, $id) function search_users($needle, $id)
{ {
global $tbl_user, $tbl_access_url_rel_user; global $tbl_user;
$xajax_response = new xajaxResponse(); $xajax_response = new xajaxResponse();
$return = ''; $return = '';

4
main/inc/lib/hook/README.md
Unescape View File

@ -18,8 +18,8 @@ From version 1.10.x, the following Hooks (or more) exist:
|Number| Directory | EventClass | ObserverInterface | Reference | |Number| Directory | EventClass | ObserverInterface | Reference |
|------|-----------------------------------|----------------|---------------------------------|---------------------------| |------|-----------------------------------|----------------|---------------------------------|---------------------------|
| 1| /main/inc/lib/usermanager.lib.php | HookCreateUser | HookCreateUserObserverInterface | Usermanager::createUser() | | 1| /main/inc/lib/usermanager.lib.php | HookCreateUser | HookCreateUserObserverInterface | UserManager::createUser() |
| 2| /main/inc/lib/usermanager.lib.php | HookUpdateUser | HookUpdateUserObserverInterface | Usermanager::updateUser() | | 2| /main/inc/lib/usermanager.lib.php | HookUpdateUser | HookUpdateUserObserverInterface | UserManager::updateUser() |
| 3| /main/admin/index.php | HookAdminBlock | HookAdminBlockObserverInterface | ADMIN BLOCK | | 3| /main/admin/index.php | HookAdminBlock | HookAdminBlockObserverInterface | ADMIN BLOCK |
# What do I need to use Hooks? # What do I need to use Hooks?

2
main/inc/lib/jpegcam/webcam_receiver.php
Unescape View File

@ -48,7 +48,7 @@ if($ext!= 'jpg'){
$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$saveDir=$dirBaseDocuments.$webcamdir; $saveDir=$dirBaseDocuments.$webcamdir;
$current_session_id = api_get_session_id(); $current_session_id = api_get_session_id();
$groupId=$_SESSION['_gid']; $groupId = api_get_group_id();
//avoid duplicates //avoid duplicates
$webcamname_to_save=$webcamname; $webcamname_to_save=$webcamname;

19
main/inc/lib/search/search_widget.php
Unescape View File

@ -31,7 +31,7 @@ function search_widget_prepare(&$htmlHeadXtra) {
*/ */
function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') { function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') {
global $charset; global $charset;
$multiple_select .= '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">'; $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">';
$all_selected = ''; $all_selected = '';
if (!empty($_REQUEST['sf_'. $prefix]) ) { if (!empty($_REQUEST['sf_'. $prefix]) ) {
@ -302,11 +302,11 @@ function display_search_form($action, $show_thesaurus, $sf_terms, $op) {
* @param string $action Just in case your action is not * @param string $action Just in case your action is not
* index.php * index.php
*/ */
function search_widget_show($action='index.php') { function search_widget_show($action='index.php')
global $charset; {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php'; require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
// TODO: load images dinamically when they're avalaible from specific field ui to add // TODO: load images dinamically when they're avalaible from specific field ui to add
$icons_for_search_terms = array(); $groupId = api_get_group_id();
$sf_terms = array(); $sf_terms = array();
$specific_fields = get_specific_field_list(); $specific_fields = get_specific_field_list();
@ -330,31 +330,25 @@ function search_widget_show($action='index.php') {
$url_params[] = 'sf_'.$specific_field['code']; $url_params[] = 'sf_'.$specific_field['code'];
unset($temp); unset($temp);
} }
} else { // without cid } else { // without cid
// prepare specific fields names (and also get possible URL param names) // prepare specific fields names (and also get possible URL param names)
foreach ($specific_fields as $specific_field) { foreach ($specific_fields as $specific_field) {
//get Xapian terms for a specific term prefix, in ISO, apparently //get Xapian terms for a specific term prefix, in ISO, apparently
$sf_terms[$specific_field['code']] = xapian_get_all_terms(1000, $specific_field['code']); $sf_terms[$specific_field['code']] = xapian_get_all_terms(1000, $specific_field['code']);
$url_params[] = 'sf_'.$specific_field['code']; $url_params[] = 'sf_'.$specific_field['code'];
} }
} }
echo '<h2>'.get_lang('Search').'</h2>'; echo '<h2>'.get_lang('Search').'</h2>';
// Tool introduction // Tool introduction
// TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here. // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
if (api_get_course_id() !== -1) if (api_get_course_id() !== -1)
if (!empty($_SESSION['_gid'])) { if (!empty($groupId)) {
Display::display_introduction_section(TOOL_SEARCH.$_SESSION['_gid']); Display::display_introduction_section(TOOL_SEARCH.$groupId);
} else { } else {
Display::display_introduction_section(TOOL_SEARCH); Display::display_introduction_section(TOOL_SEARCH);
} }
$op = 'or'; $op = 'or';
if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) { if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) {
$op = $_REQUEST['operator']; $op = $_REQUEST['operator'];
@ -379,5 +373,4 @@ function search_widget_show($action='index.php') {
// create the form // create the form
// TODO: use FormValidator // TODO: use FormValidator
display_search_form($action, $show_thesaurus, $sf_terms, $op); display_search_form($action, $show_thesaurus, $sf_terms, $op);
} }

21
main/inc/lib/svg-edit/extensions/imagelib/groups.php
Unescape View File

@ -13,15 +13,22 @@ api_block_anonymous_users();
$is_allowed_to_edit = api_is_allowed_to_edit(null, true); $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$course_info = api_get_course_info(); $course_info = api_get_course_info();
$groupId = api_get_group_id();
$group_properties = GroupManager::get_group_properties($groupId);
$group_properties = GroupManager::get_group_properties(api_get_group_id());
$groupdirpath = $group_properties['directory']; $groupdirpath = $group_properties['directory'];
$group_disk_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$groupdirpath.'/'; $group_disk_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$groupdirpath.'/';
$group_web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document'.$groupdirpath.'/'; $group_web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document'.$groupdirpath.'/';
//get all group files and folders //get all group files and folders
$docs_and_folders = DocumentManager::get_all_document_data($course_info, $groupdirpath, api_get_group_id(), null, $is_allowed_to_edit, false); $docs_and_folders = DocumentManager::get_all_document_data(
$course_info,
$groupdirpath,
api_get_group_id(),
null,
$is_allowed_to_edit,
false
);
//get all group filenames //get all group filenames
$array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array(); $array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
@ -58,7 +65,10 @@ $style .='</style>';
<?php <?php
echo '<h2>'.get_lang('GroupSingle').': '.$group_properties['name'].'</h2>'; echo '<h2>'.get_lang('GroupSingle').': '.$group_properties['name'].'</h2>';
if (($group_properties['doc_state'] == 2 && ($is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'], $_SESSION['_gid']))) || $group_properties['doc_state'] == 1){ if ((
$group_properties['doc_state'] == 2 &&
($is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'], $groupId))) || $group_properties['doc_state'] == 1
){
if (!empty($png_svg_files)) { if (!empty($png_svg_files)) {
echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>'; echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
@ -69,8 +79,7 @@ if (($group_properties['doc_state'] == 2 && ($is_allowed_to_edit || GroupManager
if (strpos($filename, "svg")){ if (strpos($filename, "svg")){
$new_sizes['width'] = 60; $new_sizes['width'] = 60;
$new_sizes['height'] = 60; $new_sizes['height'] = 60;
} } else {
else {
$new_sizes = api_resize_image($image, 60, 60); $new_sizes = api_resize_image($image, 60, 60);
} }
echo '<li style="display:inline; padding:8px;">'; echo '<li style="display:inline; padding:8px;">';

3
main/permissions/group_permissions.inc.php
Unescape View File

@ -7,7 +7,8 @@
*/ */
include_once('permissions_functions.inc.php'); include_once('permissions_functions.inc.php');
include_once('all_permissions.inc.php'); include_once('all_permissions.inc.php');
$group_id=$_SESSION['_gid']; $group_id = api_get_group_id();
echo $group_id; echo $group_id;
// --------------------------------------------------- // ---------------------------------------------------
// ACTIONS // ACTIONS

13
main/user/subscribe_class.php
Unescape View File

@ -44,10 +44,14 @@ if (isset($_POST['action'])) {
/** /**
* * Get the number of classes to display on the current page. * * Get the number of classes to display on the current page.
*/ */
function get_number_of_classes() { function get_number_of_classes()
{
$class_table = Database :: get_main_table(TABLE_MAIN_CLASS); $class_table = Database :: get_main_table(TABLE_MAIN_CLASS);
$course_class_table = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS); $course_class_table = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
$sql = "SELECT * FROM $course_class_table WHERE course_code = '" . $_SESSION['_course']['id'] . "'"; $courseCode = api_get_course_id();
$sql = "SELECT * FROM $course_class_table
WHERE course_code = '" . $courseCode. "'";
$res = Database::query($sql); $res = Database::query($sql);
$subscribed_classes = array(); $subscribed_classes = array();
while ($obj = Database::fetch_object($res)) { while ($obj = Database::fetch_object($res)) {
@ -63,6 +67,7 @@ function get_number_of_classes() {
} }
$res = Database::query($sql); $res = Database::query($sql);
$result = Database::num_rows($res); $result = Database::num_rows($res);
return $result; return $result;
} }
@ -73,7 +78,9 @@ function get_class_data($from, $number_of_items, $column, $direction) {
$class_table = Database :: get_main_table(TABLE_MAIN_CLASS); $class_table = Database :: get_main_table(TABLE_MAIN_CLASS);
$course_class_table = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS); $course_class_table = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
$class_user_table = Database :: get_main_table(TABLE_MAIN_CLASS_USER); $class_user_table = Database :: get_main_table(TABLE_MAIN_CLASS_USER);
$sql = "SELECT * FROM $course_class_table WHERE course_code = '" . $_SESSION['_course']['id'] . "'"; $courseCode = api_get_course_id();
$sql = "SELECT * FROM $course_class_table WHERE course_code = '" . $courseCode . "'";
$res = Database::query($sql); $res = Database::query($sql);
$subscribed_classes = array(); $subscribed_classes = array();
while ($obj = Database::fetch_object($res)) { while ($obj = Database::fetch_object($res)) {

14
main/user/subscribe_user.php
Unescape View File

@ -282,6 +282,9 @@ function get_number_of_users()
$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
$courseCode = api_get_course_id();
$sessionId = api_get_session_id();
if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') { if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
if (api_get_session_id() != 0) { if (api_get_session_id() != 0) {
@ -429,9 +432,15 @@ function get_number_of_users()
// getting all the users of the course (to make sure that we do not display users that are already in the course) // getting all the users of the course (to make sure that we do not display users that are already in the course)
if (!empty($_SESSION["id_session"])) { if (!empty($_SESSION["id_session"])) {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']); $a_course_users = CourseManager:: get_user_list_from_course_code(
$courseCode,
$sessionId
);
} else { } else {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0); $a_course_users = CourseManager:: get_user_list_from_course_code(
$courseCode,
0
);
} }
foreach ($a_course_users as $user_id=>$course_user) { foreach ($a_course_users as $user_id=>$course_user) {
$users_of_course[] = $course_user['user_id']; $users_of_course[] = $course_user['user_id'];
@ -445,6 +454,7 @@ function get_number_of_users()
$row = Database::fetch_row($res); $row = Database::fetch_row($res);
$count_user = $row[0]; $count_user = $row[0];
} }
return $count_user; return $count_user;
} }
/** /**

Write Preview
Loading…
Cancel
Save