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

Merge

Browse Source
skala
Julio Montoya 15 years ago
parent 716d508646 8fc3819f3d
commit a1888efa58
47 changed files with 335 additions and 25 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. 6
      main/inc/lib/htmlpurifier/configdoc/index.html
  2. 6
      main/inc/lib/htmlpurifier/configdoc/styles/index.html
  3. 6
      main/inc/lib/htmlpurifier/extras/ConfigDoc/index.html
  4. 6
      main/inc/lib/htmlpurifier/extras/FSTools/index.html
  5. 6
      main/inc/lib/htmlpurifier/extras/index.html
  6. 6
      main/inc/lib/htmlpurifier/index.html
  7. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/index.html
  8. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/index.html
  9. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/index.html
  10. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/URI/index.html
  11. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/index.html
  12. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrTransform/index.html
  13. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/ChildDef/index.html
  14. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/index.html
  15. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/index.html
  16. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/index.html
  17. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/index.html
  18. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/index.html
  19. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/index.html
  20. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/index.html
  21. 22
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Encoder.php
  22. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/EntityLookup/index.html
  23. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Filter/index.html
  24. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/index.html
  25. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/HTMLModule/index.html
  26. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Injector/index.html
  27. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/classes/index.html
  28. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/index.html
  29. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/messages/index.html
  30. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Lexer/index.html
  31. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Printer/index.html
  32. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Strategy/index.html
  33. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/TagTransform/index.html
  34. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Token/index.html
  35. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/URIFilter/index.html
  36. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/URIScheme/index.html
  37. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/VarParser/index.html
  38. 6
      main/inc/lib/htmlpurifier/library/HTMLPurifier/index.html
  39. 6
      main/inc/lib/htmlpurifier/library/index.html
  40. 6
      main/inc/lib/htmlpurifier/maintenance/index.html
  41. 6
      main/inc/lib/htmlpurifier/plugins/index.html
  42. 6
      main/inc/lib/htmlpurifier/plugins/phorum/htmlpurifier/index.html
  43. 6
      main/inc/lib/htmlpurifier/plugins/phorum/index.html
  44. 6
      main/inc/lib/htmlpurifier/plugins/phorum/settings/index.html
  45. 35
      main/inc/lib/sessionmanager.lib.php
  46. 8
      main/webservices/webservice_session.php
  47. 37
      tests/test_webservices.php

6
main/inc/lib/htmlpurifier/configdoc/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/configdoc/styles/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/extras/ConfigDoc/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/extras/FSTools/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/extras/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/URI/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrDef/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/AttrTransform/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/ChildDef/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

22
main/inc/lib/htmlpurifier/library/HTMLPurifier/Encoder.php
Unescape View File

@ -288,6 +288,17 @@ class HTMLPurifier_Encoder
restore_error_handler();
return $str;
}
// Added by Ivan Tcholakov, 25-JUN-2010.
// Using a custom encoding conversion function from Chamilo LMS,
// for some encodings it works even without iconv or mbstring installed.
elseif (function_exists('api_is_encoding_supported')) {
if (api_is_encoding_supported($encoding)) {
$str = api_utf8_encode($str, $encoding);
restore_error_handler();
return $str;
}
}
//
trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
}
@ -323,6 +334,17 @@ class HTMLPurifier_Encoder
restore_error_handler();
return $str;
}
// Added by Ivan Tcholakov, 25-JUN-2010.
// Using a custom encoding conversion function from Chamilo LMS,
// for some encodings it works even without iconv or mbstring installed.
elseif (function_exists('api_is_encoding_supported')) {
if (api_is_encoding_supported($encoding)) {
$str = api_utf8_decode($str, $encoding);
restore_error_handler();
return $str;
}
}
//
trigger_error('Encoding not supported', E_USER_ERROR);
}

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/EntityLookup/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Filter/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/HTMLModule/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Injector/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/classes/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Language/messages/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Lexer/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Printer/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Strategy/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/TagTransform/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/Token/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/URIFilter/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/URIScheme/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/VarParser/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/HTMLPurifier/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/library/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/maintenance/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/plugins/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/plugins/phorum/htmlpurifier/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/plugins/phorum/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

6
main/inc/lib/htmlpurifier/plugins/phorum/settings/index.html
Unescape View File

@ -0,0 +1,6 @@
<html>
<head>
</head>
<body>
</body>
</html>

35
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -467,21 +467,6 @@ class SessionManager {
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
// Get the list of courses related to this session
$course_list = SessionManager::get_course_list_by_session_id($session_id);
if(empty($course_list)) {
return false;
}
foreach($course_list as $course) {
$course_code = $course['code'];
// Delete user from course
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND course_code='$course_code' AND id_user='$user_id'");
if(Database::affected_rows()) {
// Update number of users in this relation
Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users - 1 WHERE id_session='$session_id' AND course_code='$course_code'");
}
}
$delete_sql = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$session_id' AND id_user ='$user_id' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
Database::query($delete_sql);
$return = Database::affected_rows();
@ -490,6 +475,20 @@ class SessionManager {
$update_sql = "UPDATE $tbl_session SET nbr_users= nbr_users - $return WHERE id='$session_id' ";
Database::query($update_sql);
// Get the list of courses related to this session
$course_list = SessionManager::get_course_list_by_session_id($session_id);
if(!empty($course_list)) {
foreach($course_list as $course) {
$course_code = $course['code'];
// Delete user from course
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND course_code='$course_code' AND id_user='$user_id'");
if(Database::affected_rows()) {
// Update number of users in this relation
Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users - 1 WHERE id_session='$session_id' AND course_code='$course_code'");
}
}
}
return true;
}
@ -1155,11 +1154,7 @@ class SessionManager {
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
// select the courses
$sql = "SELECT id, code, title,visual_code, nbr_users, db_name
FROM $tbl_course,$tbl_session_rel_course
WHERE course_code = code
AND id_session='$session_id'
ORDER BY title";
$sql = "SELECT * FROM $tbl_course c INNER JOIN $tbl_session_rel_course src ON c.code = src.course_code WHERE src.id_session = '$session_id' ORDER BY title;";
$result = Database::query($sql);
$num_rows = Database::num_rows($result);
$courses = array();

8
main/webservices/webservice_session.php
Unescape View File

@ -3,6 +3,7 @@
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once($libpath.'sessionmanager.lib.php');
require_once($libpath.'course.lib.php');
require_once(dirname(__FILE__).'/webservice.php');
/**
@ -237,7 +238,7 @@ class WSSession extends WS {
return $user_id;
} else {
if($state == 1) {
SessionManager::subscribe_users_to_session($session_id, array($user_id));
SessionManager::suscribe_users_to_session($session_id, array($user_id));
} else {
$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
if($result == false) {
@ -311,14 +312,15 @@ class WSSession extends WS {
return $course_id;
} else {
if($state == 1) {
SessionManager::add_courses_to_session($session_id, array($course_id));
$course_code = CourseManager::get_course_code_from_course_id($course_id);
SessionManager::add_courses_to_session($session_id, array($course_code));
return true;
} else {
$result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
if($result == true) {
return true;
} else {
return new WSError(304, 'Error subscribing course to session');
return new WSError(304, 'Error unsubscribing course from session');
}
}
return true;

37
tests/test_webservices.php
Unescape View File

@ -61,6 +61,25 @@ class TestSoapWebService extends UnitTestCase {
return $course;
}
protected function getSessionArray() {
$end_date = date('Y') + 1;
$end_date .= '-'.date('m-d');
$session = array(
'name' => 'My session',
'start_date' => date('Y-m-d'),
'end_date' => $end_date,
'nb_days_access_before' => 0,
'nb_days_access_after' => 0,
'nolimit' => 0,
'visibility' => 1,
'user_id_field_name' => 'chamilo_user_id',
'user_id_value' => '1',
'session_id_field_name' => 'chamilo_session_id',
'session_id_value' => '',
'extras' => array());
return $session;
}
protected function soapCall($method, $arguments) {
return $this->_client->__soapCall($method, $arguments);
}
@ -115,13 +134,13 @@ class TestSoapWebService extends UnitTestCase {
$this->soapCall('WSUser.DeleteUser', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => $result));
}
/*public function testCourseCreation() {
public function testCourseCreation() {
$course = $this->getCourseArray();
$result = $this->soapCall('WSCourse.CreateCourse', array_merge(array('secret_key' => $this->_secret_key), $course));
$this->assertIsA($result, 'int');
// Delete course created
$this->soapCall('WSCourse.DeleteCourse', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => $result));
}*/
}
/*public function testCourseSubscriptionAndUnsubscription() {
//$course_id = $this->createCourse();
@ -138,6 +157,20 @@ class TestSoapWebService extends UnitTestCase {
$result = $this->soapCall('WSCourse.ListCourses', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id'));
var_dump($result);
}*/
public function testSessionCreation() {
$session = $this->getSessionArray();
$result = $this->soapCall('WSSession.CreateSession', array_merge(array('secret_key' => $this->_secret_key), $session));
$this->assertIsA($result, 'int');
$this->soapCall('WSSession.DeleteSession', array('secret_key' => $this->_secret_key, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => $result));
}
/*public function testUserSessionSubscriptionAndUnsubscription() {
$this->soapCall('WSSession.UnsubscribeCourseFromSession', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
//$this->soapCall('WSSession.UnsubscribeUserFromSession', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 38, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
}*/
}

Write Preview
Loading…
Cancel
Save