Removes lib/nusoap/nusoap.php, classes are now loaded via composer.

main/cron/user_import/client.php

@@ -19,9 +19,6 @@ if (php_sapi_name()!='cli') {
     die();
 }
 
-// include nusoap library
-require_once(api_get_path(LIBRARY_PATH).'nusoap/nusoap.php');
-
 // create client
 $client = new nusoap_client(api_get_path(WEB_CODE_PATH).'cron/user_import/service.php');
 

main/inc/ajax/install.ajax.php

@@ -37,8 +37,6 @@ switch ($action) {
             } else {
 
                 // save contact information with web service
-                require_once '../lib/nusoap/nusoap.php';
-
                 // create a client
                 $client = new nusoap_client('http://version.chamilo.org/contact.php?wsdl', true);
 

main/webservices/client_soap.php

@@ -16,7 +16,6 @@ exit; //Uncomment this in order to execute the page
 
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 
 // Create the client instance
 $url = api_get_path(WEB_CODE_PATH)."webservices/registration.soap.php?wsdl";

main/webservices/cm_soap.php

@@ -3,7 +3,6 @@
 require_once '../inc/global.inc.php';
 require_once(dirname(__FILE__).'/cm_webservice.php');
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 
 /**
  * SOAP error handler. Handles an error sending a SOAP fault
@@ -11,7 +10,7 @@ require_once $libpath.'nusoap/nusoap.php';
 class WSCMSoapErrorHandler implements WSCMErrorHandler {
 	/**
 	 * Handles the error by sending a SOAP fault through the server
-	 * 
+	 *
 	 * @param WSError Error to handle
 	 */
 	public function handle($error) {
@@ -26,17 +25,17 @@ class WSCMSoapErrorHandler implements WSCMErrorHandler {
 class WSCMSoapServer {
 	/**
 	 * SOAP server instance
-	 * 
+	 *
 	 * @var soap_server
 	 */
 	private static $_instance;
-	
+
 	/**
 	 * Private constructor
 	 */
 	private function __construct() {
 	}
-	
+
 	/**
 	 * Singleton method
 	 */
@@ -48,11 +47,11 @@ class WSCMSoapServer {
 			// Configure the service
 			self::$_instance->configureWSDL('WSCMService', 'urn:WSCMService');
 		}
-		
+
 		return self::$_instance;
 	}
 }
-			
+
 $s = WSCMSoapServer::singleton();
 
 $s->wsdl->addComplexType(

main/webservices/courses_list.soap.php

@@ -12,7 +12,6 @@
  */
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 
 // Create the server instance
 $server = new soap_server();

main/webservices/registration.soap.php

@@ -5,7 +5,6 @@
  */
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 require_once $libpath.'fileManage.lib.php';
 require_once $libpath.'fileUpload.lib.php';
 require_once api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php';

main/webservices/soap.php

@@ -6,7 +6,6 @@
 require_once '../inc/global.inc.php';
 require_once(dirname(__FILE__).'/webservice.php');
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 
 /**
  * SOAP error handler. Handles an error sending a SOAP fault
@@ -14,7 +13,7 @@ require_once $libpath.'nusoap/nusoap.php';
 class WSSoapErrorHandler implements WSErrorHandler {
 	/**
 	 * Handles the error by sending a SOAP fault through the server
-	 * 
+	 *
 	 * @param WSError Error to handle
 	 */
 	public function handle($error) {
@@ -29,17 +28,17 @@ class WSSoapErrorHandler implements WSErrorHandler {
 class WSSoapServer {
 	/**
 	 * SOAP server instance
-	 * 
+	 *
 	 * @var soap_server
 	 */
 	private static $_instance;
-	
+
 	/**
 	 * Private constructor
 	 */
 	private function __construct() {
 	}
-	
+
 	/**
 	 * Singleton method
 	 */
@@ -51,11 +50,11 @@ class WSSoapServer {
 			// Configure the service
 			self::$_instance->configureWSDL('WSService', 'urn:WSService');
 		}
-		
+
 		return self::$_instance;
 	}
 }
-			
+
 $s = WSSoapServer::singleton();
 
 $s->wsdl->addComplexType(
@@ -119,4 +118,4 @@ require_once(dirname(__FILE__).'/soap_report.php');
 
 // Use the request to (try to) invoke the service
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';
-$s->service($HTTP_RAW_POST_DATA);
+$s->service($HTTP_RAW_POST_DATA);

main/webservices/test.php

@@ -2,7 +2,6 @@
 exit;
 
 require_once '../inc/global.inc.php';
-require_once '../inc/lib/nusoap/nusoap.php';
 require_once '../inc/conf/configuration.php';
 
 ?>
@@ -45,11 +44,11 @@ foreach ($list as $item) {
 }
 ?>
 </div>
-    
+
 <form method="POST" action="">
 <label for="script">Script</label>
 <select name="script">
-<?php 
+<?php
 foreach ($scripts as $script) {
     echo '<option value="'.$script.'">'.$script.'</script>';
 }

main/webservices/user_import/service.php

@@ -4,7 +4,6 @@
  * @author Eric Marguin <eric.marguin@dokeos.com>
  */
 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.

main/webservices/user_info.soap.php

@@ -4,13 +4,12 @@
  * This script provides the caller service with user details.
  * It is set to work with the Chamilo module for Drupal:
  * http://drupal.org/project/chamilo
- * 
+ *
  * @author Yannick Warnier <yannick.warnier@dokeos.com>
  * @package chamilo.webservices
  */
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'nusoap/nusoap.php';
 
 // Create the server instance
 $server = new soap_server();
@@ -65,7 +64,7 @@ $server->register('WSCourseListOfUser',   // method name
  * 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 Chamilo 
+ * @param string User name in Chamilo
  * @param string Signature (composed of the sha1(username+apikey)
  * @return array Courses list (code=>[title=>'title',url='http://...',teacher=>'...',language=>''],code=>[...],...)
  */