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

Should fix bug in webservices "character [ not valid" see BT#4158

Browse Source
skala
Julio Montoya 14 years ago
parent dc5d2d067e
commit ed709bd8d0
2 changed files with 98 additions and 58 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. 34
      main/webservices/client_soap.php
  2. 122
      main/webservices/registration.soap.php

34
main/webservices/client_soap.php
Unescape View File

@ -12,7 +12,7 @@
* *
*/ */
exit; //Uncomment this in order to execute the page //exit; //Uncomment this in order to execute the page
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
@ -75,8 +75,7 @@ if (!empty($user_id) && is_numeric($user_id)) {
$result = $client->call('WSGetUser', array('GetUser' => $params)); $result = $client->call('WSGetUser', array('GetUser' => $params));
echo '<h2>User created via webservices</h2>'; echo '<h2>User created via webservices</h2>';
var_dump($result);
//3.Adding user to the course TEST. The course TEST must be created manually in Chamilo //3.Adding user to the course TEST. The course TEST must be created manually in Chamilo
$params = array('course' => 'TEST', //Chamilo string course code $params = array('course' => 'TEST', //Chamilo string course code
@ -84,6 +83,30 @@ if (!empty($user_id) && is_numeric($user_id)) {
'secret_key' => $secret_key); 'secret_key' => $secret_key);
$result = $client->call('WSSubscribeUserToCourseSimple', array('subscribeUserToCourseSimple' => $params)); $result = $client->call('WSSubscribeUserToCourseSimple', array('subscribeUserToCourseSimple' => $params));
// ------------------------
//Calling the WSSubscribeUserToCourse
/*
$course_array = array( 'original_course_id_name' => 'TEST',
'original_course_id_value' => 'TEST'
);
$user_array = array('original_user_id_value' => $user_id,
'original_user_id_name' => 'name');
$user_courses = array();
$user_courses[] = array ( 'course_id' => $course_array,
'user_id' => $user_array,
'status' => '1'
);
$params = array (
'userscourses' => $user_courses,
'secret_key' => $secret_key);
$result = $client->call('WSSubscribeUserToCourse', array('subscribeUserToCourse' => $params));
var_dump($result);*/
if ($result == 1) { if ($result == 1) {
echo "User $user_id added to course TEST"; echo "User $user_id added to course TEST";
} else { } else {
@ -95,6 +118,7 @@ if (!empty($user_id) && is_numeric($user_id)) {
// Check for an error // Check for an error
$err = $client->getError(); $err = $client->getError();
if ($err) { if ($err) {
// Display the error // Display the error
echo '<h2>Constructor error</h2><pre>' . $err . '</pre>'; echo '<h2>Constructor error</h2><pre>' . $err . '</pre>';
@ -111,8 +135,8 @@ if ($client->fault) {
echo '<h2>Error</h2><pre>' . $err . '</pre>'; echo '<h2>Error</h2><pre>' . $err . '</pre>';
} else { } else {
// Display the result // Display the result
//echo '<h2>Web service result</h2><pre/>'; echo '<h2>Web service result</h2><pre/>';
//var_dump($result); var_dump($result);
} }
} }

122
main/webservices/registration.soap.php
Unescape View File

@ -61,25 +61,25 @@ $server->configureWSDL('WSRegistration', 'urn:WSRegistration');
// Prepare input params // Prepare input params
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'extras', 'extras',
'complexType', 'complexType',
'struct', 'struct',
'all', 'all',
'', '',
array( array(
'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'), 'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'),
'field_value' => array('name' => 'field_value', 'type' => 'xsd:string') 'field_value' => array('name' => 'field_value', 'type' => 'xsd:string')
) )
); );
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'extrasList', 'extrasList',
'complexType', 'complexType',
'array', 'array',
'', '',
'SOAP-ENC:Array', 'SOAP-ENC:Array',
array(), array(),
array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras' array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
); );
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
@ -1062,14 +1062,14 @@ $server->wsdl->addComplexType(
); );
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'editUsersParamsList', 'editUsersParamsList',
'complexType', 'complexType',
'array', 'array',
'', '',
'SOAP-ENC:Array', 'SOAP-ENC:Array',
array(), array(),
array(array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:editUsersParams[]')), array(array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:editUsersParams[]')),
'tns:editUsersParams' 'tns:editUsersParams'
); );
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
@ -3531,10 +3531,10 @@ $server->wsdl->addComplexType(
'struct', 'struct',
'all', 'all',
'', '',
array( array (
'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'), 'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
'user_id' => array('name' => 'user_id', 'type' => 'tns:user_id'), 'user_id' => array('name' => 'user_id', 'type' => 'tns:user_id'),
'status' => array('name' => 'status', 'type' => 'xsd:int') 'status' => array('name' => 'status', 'type' => 'xsd:int')
) )
); );
@ -3544,31 +3544,44 @@ $server->wsdl->addComplexType(
'struct', 'struct',
'all', 'all',
'', '',
array( array (
'userscourses' => array('name' => 'userscourses', 'type' => 'tns:user_course_status[]'), 'userscourses' => array('name' => 'userscourses', 'type' => 'tns:user_course_status_array'), //removed []
'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string') 'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string')
) )
); );
$server->wsdl->addComplexType(
'user_course_status_array',
'complexType',
'array',
'',
'SOAP-ENC:Array',
array(),
array(
array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_course_status[]')
),
'tns:user_course_status'
);
// Prepare output params, in this case will return an array // Prepare output params, in this case will return an array
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'subscribeUserToCourse_return', 'subscribeUserToCourse_return',
'complexType', 'complexType',
'struct', 'struct',
'all', 'all',
'', '',
array( array (
'original_user_id_value' => array('name' => 'original_user_id_value', 'type' => 'xsd:string'), 'original_user_id_value' => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
'original_course_id_value' => array('name' => 'original_course_id_value', 'type' => 'xsd:string'), 'original_course_id_value' => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
'result' => array('name' => 'result', 'type' => 'xsd:int') 'result' => array('name' => 'result', 'type' => 'xsd:int')
) )
); );
// Register the method to expose // Register the method to expose
$server->register('WSSubscribeUserToCourse', // method name $server->register('WSSubscribeUserToCourse', // method name
array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'), // input parameters array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'), // input parameters
array('return' => 'tns:subscribeUserToCourse_return[]'), // output parameters array('return' => 'tns:subscribeUserToCourse_return'), // output parameters
'urn:WSRegistration', // namespace 'urn:WSRegistration', // namespace
'urn:WSRegistration#WSSubscribeUserToCourse', // soapaction 'urn:WSRegistration#WSSubscribeUserToCourse', // soapaction
'rpc', // style 'rpc', // style
@ -3577,11 +3590,12 @@ $server->register('WSSubscribeUserToCourse', // method name
); );
// define the method WSSubscribeUserToCourse // define the method WSSubscribeUserToCourse
function WSSubscribeUserToCourse($params) { function WSSubscribeUserToCourse($params) {
global $debug;
if (!WSHelperVerifyKey($params)) { if (!WSHelperVerifyKey($params)) {
return return_error(WS_ERROR_SECRET_KEY); return return_error(WS_ERROR_SECRET_KEY);
} }
if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
$results = array(); $results = array();
$userscourses = $params['userscourses']; $userscourses = $params['userscourses'];
foreach ($userscourses as $usercourse) { foreach ($userscourses as $usercourse) {
@ -3599,6 +3613,8 @@ function WSSubscribeUserToCourse($params) {
// Get user id // Get user id
$user_id = UserManager::get_user_id_from_original_id($original_user_id['original_user_id_value'], $original_user_id['original_user_id_name']); $user_id = UserManager::get_user_id_from_original_id($original_user_id['original_user_id_value'], $original_user_id['original_user_id_name']);
if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
if ($user_id == 0) { if ($user_id == 0) {
// If user was not found, there was a problem // If user was not found, there was a problem
$result['result'] = 0; $result['result'] = 0;
@ -4078,14 +4094,14 @@ function WSSuscribeUsersToSession($params){
continue; continue;
} }
$orig_user_id_value[] = implode(',', $usersList); $orig_user_id_value[] = implode(',', $usersList);
if ($id_session!= strval(intval($id_session))) { if ($id_session!= strval(intval($id_session))) {
$results[] = 0; $results[] = 0;
continue; continue;
} }
$sql = "SELECT id_user FROM $tbl_session_rel_user WHERE id_session='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH.""; $sql = "SELECT id_user FROM $tbl_session_rel_user WHERE id_session='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
$result = Database::query($sql); $result = Database::query($sql);
$existingUsers = array(); $existingUsers = array();
while($row = Database::fetch_array($result)){ while($row = Database::fetch_array($result)){
@ -4159,10 +4175,10 @@ $server->wsdl->addComplexType(
'all', 'all',
'', '',
array( array(
'original_user_id_values' => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'), 'original_user_id_values' => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'),
'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'), 'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
'original_session_id_value' => array('name' => 'original_session_id_value', 'type' => 'xsd:string'), 'original_session_id_value' => array('name' => 'original_session_id_value', 'type' => 'xsd:string'),
'original_session_id_name' => array('name' => 'original_session_id_name', 'type' => 'xsd:string') 'original_session_id_name' => array('name' => 'original_session_id_name', 'type' => 'xsd:string')
) )
); );
@ -4927,4 +4943,4 @@ function WSUpdateUserApiKey($params) {
// Use the request to (try to) invoke the service // Use the request to (try to) invoke the service
$HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : ''; $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';
$server->service($HTTP_RAW_POST_DATA); $server->service($HTTP_RAW_POST_DATA);
Write Preview
Loading…
Cancel
Save