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

Issue #306 - Web-services: Trimming whitespace in source files.

Browse Source
skala
Ivan Tcholakov 17 years ago
parent 0c5a7d4857
commit b23d9bc628
7 changed files with 1086 additions and 1086 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/webservices/courses_list.rest.php
  2. 16
      main/webservices/courses_list.soap.php
  3. 8
      main/webservices/http-auth.php
  4. 2050
      main/webservices/registration.soap.php
  5. 18
      main/webservices/user_import/import.lib.php
  6. 38
      main/webservices/user_import/service.php
  7. 28
      main/webservices/user_info.soap.php

14
main/webservices/courses_list.rest.php
Unescape View File

@ -5,7 +5,7 @@
* on this dokeos portal.
* It is set to work with the Dokeos module for Drupal:
* http://drupal.org/project/dokeos
*
*
* See license terms in /dokeos_license.txt
* @author Yannick Warnier <yannick.warnier@dokeos.com>
*/
@ -18,22 +18,22 @@ require_once('../inc/global.inc.php');
* @return array Courses list (code=>[title=>'title',url='http://...',teacher=>'...',language=>''],code=>[...],...)
*/
function courses_list($security_key,$visibilities='public') {
global $_configuration;
// check if this script is launch by server and if security key is ok
if ( $security_key != $_configuration['security_key'] )
{
return array('error_msg'=>'Security check failed');
}
// libraries
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
$charset = api_get_setting('platform_charset');
$vis = array('public'=>'3', 'public-registered'=>'2', 'private'=>'1', 'closed'=>'0');
$courses_list = array();
if (!is_array($visibilities)) {
$tmp = $visibilities;
$visibilities = array($tmp);
@ -58,7 +58,7 @@ echo '<courseslist>';
if(empty($_POST['security-key']) or empty($_POST['visibility']))
{
echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
}
else
{

16
main/webservices/courses_list.soap.php
Unescape View File

@ -5,7 +5,7 @@
* on this dokeos portal.
* It is set to work with the Dokeos module for Drupal:
* http://drupal.org/project/dokeos
*
*
* See license terms in /dokeos_license.txt
* @author Yannick Warnier <yannick.warnier@dokeos.com>
*/
@ -77,31 +77,31 @@ function DokeosWSCourseList($username, $signature, $visibilities='public') {
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
global $_configuration;
$info = api_get_user_info_from_username($username);
$user_id = $info['user_id'];
if (!UserManager::is_admin($user_id)) { return -1; }
$list = UserManager::get_api_keys($user_id,'dokeos');
$key = '';
foreach ($list as $key) {
break;
}
$local_key = $username.$key;
if (!api_is_valid_secret_key($signature, $local_key)) {
return -1; //secret key is incorrect
}
// libraries
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
$charset = api_get_setting('platform_charset');
$vis = array('public'=>'3', 'public-registered'=>'2', 'private'=>'1', 'closed'=>'0');
$courses_list = array();
if (!is_array($visibilities)) {
$visibilities = split(',',$visibilities);
}

8
main/webservices/http-auth.php
Unescape View File

@ -3,20 +3,20 @@
$realm = 'The batcave';
// Just a random id
$nonce = uniqid();
$nonce = uniqid();
// Get the digest from the http header
$digest = getDigest();
// If there was no digest, show login
if (is_null($digest)) requireLogin($realm,$nonce);
if (is_null($digest)) requireLogin($realm,$nonce);
$digestParts = digestParse($digest);
$validUser = 'admin';
$validPass = 'admin';
// Based on all the info we gathered we can figure out what the response should be
// Based on all the info we gathered we can figure out what the response should be
$A1 = md5("{$digestParts['username']}:{$realm}:{$validPass}");
$A2 = md5("{$_SERVER['REQUEST_METHOD']}:{$digestParts['uri']}");
@ -72,4 +72,4 @@ function digestParse($digest) {
return $needed_parts ? false : $data;
}
?>
?>

2050
main/webservices/registration.soap.php
View File

File diff suppressed because it is too large Load Diff

18
main/webservices/user_import/import.lib.php
Unescape View File

@ -9,11 +9,11 @@ function validate_data($users)
$usernames = array ();
foreach ($users as $index => $user)
{
//1. check if mandatory fields are set
//1. check if mandatory fields are set
$mandatory_fields = array ('LastName', 'FirstName');
if (api_get_setting('registration', 'email') == 'true')
{
$mandatory_fields[] = 'Email';
$mandatory_fields[] = 'Email';
}
foreach ($mandatory_fields as $key => $field)
{
@ -121,9 +121,9 @@ function save_data($users)
foreach ($users as $index => $user)
{
$user = complete_missing_data($user);
$user['Status'] = api_status_key($user['Status']);
$user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
foreach ($user['Courses'] as $index => $course)
{
@ -135,26 +135,26 @@ function save_data($users)
$class_id = ClassManager :: get_class_id($user['ClassName']);
ClassManager :: add_user($user_id, $class_id);
}
// qualite
if(!empty($user['Qualite']))
UserManager::update_extra_field_value($user_id,'qualite',$user['Qualite']);
// Categorie
if(!empty($user['Categorie']))
UserManager::update_extra_field_value($user_id,'categorie',$user['Categorie']);
// Etat
if(!empty($user['Etat']))
UserManager::update_extra_field_value($user_id,'etat',$user['Etat']);
// Niveau
if(!empty($user['Niveau']))
UserManager::update_extra_field_value($user_id,'niveau',$user['Niveau']);
}
}
/**
* Read the CSV-file
* Read the CSV-file
* @param string $file Path to the CSV-file
* @return array All userinformation read from the file
*/

38
main/webservices/user_import/service.php
Unescape View File

@ -1,5 +1,5 @@
<?php //$id: $
/**
/**
* See license terms in /dokeos_license.txt
* @author Eric Marguin <eric.marguin@dokeos.com>
*/
@ -7,31 +7,31 @@ require_once('../../inc/global.inc.php');
require_once(api_get_path(LIBRARY_PATH).'nusoap/nusoap.php');
/**
* Import users into database from a file located on the server.
* Function registered as service.
* Import users into database from a file located on the server.
* Function registered as service.
* @param string The csv (only csv) file containing users tom import
* @param string Security key (as found in configuration file)
* @return string Error message
*/
function import_users_from_file($filepath, $security_key) {
global $_configuration;
$errors_returned = array(
0=>'success',
1=>'file import does not exist',
2=>'no users to import',
0=>'success',
1=>'file import does not exist',
2=>'no users to import',
3=>'wrong datas in file',
4=>'security error'
);
// check if this script is launch by server and if security key is ok
if(empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR']!=$_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key'])
{
return $errors_returned[4];
}
// libraries
require_once (api_get_path(LIBRARY_PATH).'fileManage.lib.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
@ -39,37 +39,37 @@ function import_users_from_file($filepath, $security_key) {
require_once (api_get_path(LIBRARY_PATH).'import.lib.php');
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once ('import.lib.php');
// check is users file exists
if(!is_file($filepath))
{
return $errors_returned[1];
}
// get list of users
$users = parse_csv_data($filepath);
if(count($users)==0)
{
return $errors_returned[2];
}
// check the datas for each user
$errors = validate_data($users);
if (count($errors) > 0)
{
return $errors_returned[3];
}
// apply modifications in database
save_data($users);
return $errors_returned[0]; // import successfull
}
$server = new soap_server();
$server = new soap_server();
$server->register('import_users_from_file');
$server->register('import_users_from_file');
$http_request = (isset($HTTP_RAW_POST_DATA)?$HTTP_RAW_POST_DATA:'');
$http_request = (isset($HTTP_RAW_POST_DATA)?$HTTP_RAW_POST_DATA:'');
$server->service($http_request);
?>

28
main/webservices/user_info.soap.php
Unescape View File

@ -5,7 +5,7 @@
* on this dokeos portal.
* It is set to work with the Dokeos module for Drupal:
* http://drupal.org/project/dokeos
*
*
* See license terms in /dokeos_license.txt
* @author Yannick Warnier <yannick.warnier@dokeos.com>
*/
@ -63,7 +63,7 @@ $server->register('DokeosWSCourseListOfUser', // method name
);
/**
* Get a list of courses (code, url, title, teacher, language) for a specific
* Get a list of courses (code, url, title, teacher, language) for a specific
* user and return to caller
* Function registered as service. Returns strings in UTF-8.
* @param string User name in Dokeos
@ -76,7 +76,7 @@ function DokeosWSCourseListOfUser($username, $signature) {
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
global $_configuration;
$info = api_get_user_info_from_username($username);
$user_id = $info['user_id'];
$list = UserManager::get_api_keys($user_id,'dokeos');
@ -84,18 +84,18 @@ function DokeosWSCourseListOfUser($username, $signature) {
foreach ($list as $key) {
break;
}
$local_key = $username.$key;
if (!api_is_valid_secret_key($signature, $local_key)) {
return -1; //secret key is incorrect
}
// libraries
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
$charset = api_get_setting('platform_charset');
$courses_list = array();
$courses_list_tmp = CourseManager::get_courses_list_by_user_id($user_id);
foreach ( $courses_list_tmp as $index => $course )
@ -161,13 +161,13 @@ $server->register('DokeosWSEventsList', // method name
* @return array Events list
*/
function DokeosWSEventsList($username,$signature,$datestart=0,$dateend=0) {
if (empty($username) or empty($signature)) { return -1; }
require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
global $_configuration;
$info = api_get_user_info_from_username($username);
$user_id = $info['user_id'];
$list = UserManager::get_api_keys($user_id,'dokeos');
@ -175,19 +175,19 @@ function DokeosWSEventsList($username,$signature,$datestart=0,$dateend=0) {
foreach ($list as $key) {
break;
}
$local_key = $username.$key;
if (!api_is_valid_secret_key($signature, $local_key)) {
return -1; //secret key is incorrect
}
}
// libraries
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
$charset = api_get_setting('platform_charset');
$events_list = array();
$user_id = UserManager::get_user_id_from_username($username);
if ($user_id === false) { return $events_list; } //error in user id recovery
require_once '../calendar/myagenda.inc.php';

Write Preview
Loading…
Cancel
Save