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 use of dbName or db_name

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 98f4510ab8
commit ca6f821318
12 changed files with 33 additions and 77 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. 29
      main/admin/course_information.php
  2. 3
      main/admin/ldap_form_add_users_group.php
  3. 1
      main/document/remote.php
  4. 7
      main/inc/lib/api.lib.php
  5. 1
      main/inc/lib/course_request.lib.php
  6. 2
      main/inc/lib/login.lib.php
  7. 34
      main/resourcelinker/resourcelinker.inc.php
  8. 11
      main/webservices/cm_webservice_announcements.php
  9. 10
      main/webservices/cm_webservice_course.php
  10. 2
      main/webservices/cm_webservice_forum.php
  11. 9
      main/webservices/webservice_course.php
  12. 1
      tests/test_manager.inc.php

29
main/admin/course_information.php
Unescape View File

@ -170,33 +170,4 @@ if (!empty($session_list)) {
/*$group = new UserGroup();
$usegroups = $group->get_usergroup_by_course($course->id);*/
/*@todo This should be dissapear classes are a deprecated feature*/
/*
//Show all classes subscribed in this course
$table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
$table_class = Database :: get_main_table(TABLE_MAIN_CLASS);
$sql = "SELECT * FROM $table_course_class cc, $table_class c WHERE cc.class_id = c.id AND cc.course_code = '".$code."'";
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$data = array ();
while ($class = Database::fetch_object($res)) {
$row = array ();
$row[] = $class->name;
$row[] = '<a href="class_information.php?id='.$class->id.'">'.Display::return_icon('synthese_view.gif', get_lang('Edit')).'</a>';
$data[] = $row;
}
echo '<p><b>'.get_lang('AdminClasses').'</b></p>';
echo '<blockquote>';
$table = new SortableTableFromArray($data,0,20,'class_table');
$table->set_additional_parameters(array ('code' => $_GET['code']));
$table->set_other_tables(array('usage_table','user_table'));
$table->set_header(0,get_lang('Title'));
$table->set_header(1,'');
$table->display();
echo '</blockquote>';
} else {
echo '<p>'.get_lang('NoClassesForThisCourse').'</p>';
}*/
/* FOOTER */
Display::display_footer();

3
main/admin/ldap_form_add_users_group.php
Unescape View File

@ -1,10 +1,11 @@
<?php //$id: $
<?php
/* For licensing terms, see /license.txt */
/**
* Form to add users through LDAP (deprecated?)
* @package chamilo.admin
* Copyright (c) 2007 Mustapha Alouani (supervised by Michel Moreau-Belliard)
*/
/**
* This form is included by ldap_import_students.php and ldap_import_students_to_session.php
*/

1
main/document/remote.php
Unescape View File

@ -43,7 +43,6 @@ $_course = CourseManager::get_course_information($cidReq);
if ($_course == null) die ("problem when fetching course information");
// stupid variable initialisation for old version of DocumentManager functions.
$_course['path'] = $_course['directory'];
$_course['dbName'] = $_course['db_name'];
$is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER);
if ($debug>0) { error_log($coursePath, 0); }
// FIXME: check security around $_REQUEST["cwd"]

7
main/inc/lib/api.lib.php
Unescape View File

@ -1838,13 +1838,6 @@ function api_format_course_array($course_data)
$_course['path'] = $course_data['directory']; // Use as key in path.
$_course['directory'] = $course_data['directory'];
$_course['creation_date'] = $course_data['creation_date'];
//@todo should be deprecated
// Use as key in db list.
//$_course['dbName'] = $course_data['db_name'];
//$_course['db_name'] = $course_data['db_name'];
// Use in all queries.
$_course['titular'] = $course_data['tutor_name'];
$_course['language'] = $course_data['course_language'];
$_course['extLink']['url'] = $course_data['department_url'];

1
main/inc/lib/course_request.lib.php
Unescape View File

@ -276,7 +276,6 @@ class CourseRequestManager
$code = $wanted_code;
$tutor_name = $course_request_info['tutor_name'];
$directory = $course_request_info['directory'];
$db_name = $course_request_info['db_name'];
$visual_code = $course_request_info['visual_code'];
$request_date = $course_request_info['request_date'];
$status = $course_request_info['status'];

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

@ -415,8 +415,6 @@ class Login
$_course['official_code'] = $course_data['visual_code']; // use in echo
$_course['sysCode'] = $course_data['code']; // use as key in db
$_course['path'] = $course_data['directory']; // use as key in path
$_course['dbName'] = $course_data['db_name']; // use as key in db list
$_course['db_name'] = $course_data['db_name']; // not needed in Chamilo 1.9
$_course['titular'] = $course_data['tutor_name']; // this should be deprecated and use the table course_rel_user
$_course['language'] = $course_data['course_language'];
$_course['extLink']['url'] = $course_data['department_url'];

34
main/resourcelinker/resourcelinker.inc.php
Unescape View File

@ -356,7 +356,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
switch ($type)
{
case "Agenda":
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA,$_course['dbName']);
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -405,7 +405,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "Ad_Valvas":
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT,$_course['dbName']);
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -464,7 +464,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "Link" :
$TABLETOOLLINK = Database::get_course_table(TABLE_LINK,$_course['dbName']);
$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -522,7 +522,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "Exercise":
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']);
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -577,7 +577,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "HotPotatoes":
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']);
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
$myrow= Database::fetch_array($result);
@ -635,7 +635,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "Forum":
$TBL_FORUMS = Database::get_course_table(TABLE_FORUM,$_course['dbName']);
$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
$myrow=Database::fetch_array($result);
@ -802,7 +802,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
break;
case "Document":
$dbTable = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']);
$dbTable = Database::get_course_table(TABLE_DOCUMENT);
$result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -1131,7 +1131,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
switch ($type)
{
case "Agenda":
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA,$_course['dbName']);;
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);;
$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -1167,7 +1167,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
break;
case "Link" :
$TABLETOOLLINK = Database::get_course_table(TABLE_LINK,$_course['dbName']);
$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -1186,7 +1186,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
break;
case "Exercise":
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']);
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
$myrow=Database::fetch_array($result);
@ -1208,7 +1208,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
break;
case "HotPotatoes":
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']);
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
$myrow= Database::fetch_array($result);
@ -1231,7 +1231,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
case "Forum":
//deprecated
$TBL_FORUMS = Database::get_course_table(TABLE_FORUM,$_course['dbName']);
$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
$myrow=Database::fetch_array($result);
@ -1311,7 +1311,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
break;
case "Document":
$dbTable = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']);
$dbTable = Database::get_course_table(TABLE_DOCUMENT);
$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
$myrow=Database::fetch_array($result);
@ -1442,7 +1442,7 @@ function delete_one_added_resource($source_type, $source_id, $resource_type, $re
function delete_added_resource($type, $id)
{
global $_course;
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES,$_course['dbName']);
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
Database::query($sql);
@ -1455,7 +1455,7 @@ function delete_added_resource($type, $id)
function delete_all_resources_type($type)
{
global $_course;
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES,$_course['dbName']);
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
@ -1468,7 +1468,7 @@ function delete_all_resources_type($type)
function check_added_resources($type, $id)
{
global $_course, $origin;
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES,$_course['dbName']);
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
$result=Database::query($sql);
$number_added=Database::num_rows($result);
@ -1531,7 +1531,7 @@ function display_added_resources($type, $id, $style='')
$arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
global $_course, $origin;
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES,$_course['dbName']);
$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
$result=Database::query($sql);

11
main/webservices/cm_webservice_announcements.php
Unescape View File

@ -71,8 +71,6 @@ class WSCMAnnouncements extends WSCM
}else
return get_lang('InvalidId');
}
@ -84,11 +82,8 @@ class WSCMAnnouncements extends WSCM
$announcement_id = ($announcement_id == 0) ? "" : "AND announcement.id=".$announcement_id;
$user_id = UserManager::get_user_id_from_username($username);
$course_info = CourseManager::get_course_information($course_code);
$course_db = $course_info['db_name'];
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY, $course_db);
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT, $course_db);
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$maximum = '12';
$group_memberships=GroupManager::get_group_ids($course_info['real_id'], $user_id);
@ -107,7 +102,6 @@ class WSCMAnnouncements extends WSCM
) ";
}
// the user is member of several groups => display personal
// announcements AND his group announcements AND the general announcements
if (is_array($group_memberships) && count($group_memberships)>0) {
@ -178,6 +172,7 @@ class WSCMAnnouncements extends WSCM
}
$result = Database::query($sql);
return $result;
}

10
main/webservices/cm_webservice_course.php
Unescape View File

@ -469,8 +469,11 @@ class WSCMCourse extends WSCM
$cd->set_title($course_desc_title);
$cd->set_content($course_desc_content);
$cd->set_session_id(0);
// Get course info
$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
$course_info = CourseManager::get_course_information(
CourseManager::get_course_code_from_course_id($course_id)
);
// Check if this course description exists
$descriptions = CourseDescription::get_descriptions($course_id);
$exists = false;
@ -479,11 +482,12 @@ class WSCMCourse extends WSCM
$exists = true;
}
}
$cd->set_course_id($course_info['real_id']);
if (!$exists) {
$cd->set_progress(0);
$cd->insert($course_info['db_name']);
$cd->insert();
} else {
$cd->update($course_info['db_name']);
$cd->update();
}
}
}

2
main/webservices/cm_webservice_forum.php
Unescape View File

@ -22,7 +22,7 @@ class WSCMForum extends WSCM
if($this->verifyUserPass($username, $password) == "valid")
{
$course_db = CourseManager::get_course_information($course_code);
$foruns_info = get_forums($id='', $course_db['db_name']);
$foruns_info = get_forums($id='', $course_db['code']);
$foruns_id = '#';
foreach ($foruns_info as $forum)
{

9
main/webservices/webservice_course.php
Unescape View File

@ -480,6 +480,7 @@ class WSCourse extends WS
$cd->set_session_id(0);
// Get course info
$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
$cd->set_course_id($course_info['real_id']);
// Check if this course description exists
$descriptions = CourseDescription::get_descriptions($course_id);
$exists = false;
@ -490,15 +491,11 @@ class WSCourse extends WS
}
if (!$exists) {
$cd->set_progress(0);
$cd->insert($course_info['db_name']);
$cd->insert();
} else {
$cd->update($course_info['db_name']);
$cd->update();
}
}
}
}
}

1
tests/test_manager.inc.php
Unescape View File

@ -152,7 +152,6 @@ function create_test_course($course_code = 'TESTCOURSE') {
$_course['official_code'] = $cData['visual_code' ]; // use in echo
$_course['sysCode' ] = $cData['code' ]; // use as key in db
$_course['path' ] = $cData['directory' ]; // use as key in path
$_course['dbName' ] = $cData['db_name' ]; // use as key in db list
$_course['titular' ] = $cData['tutor_name' ];
$_course['language' ] = $cData['course_language' ];
$_course['extLink' ]['url' ] = $cData['department_url' ];

Write Preview
Loading…
Cancel
Save