Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

chamilo · Nov 18, 2016 · 4a4ede4 · 4a4ede4
2 parents 8588f15 + e47430e
commit 4a4ede4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/main/newscorm/openoffice_document.class.php b/main/newscorm/openoffice_document.class.php
@@ -188,6 +188,7 @@ private function _get_remote_ppt2lp_files($file)
             'trace' => 1,
             'exception' => 1,
             'cache_wsdl' => WSDL_CACHE_NONE,
+            'keep_alive' => false,
         );
         $client = new SoapClient(null, $options);
         $result = '';
@@ -203,7 +204,11 @@ private function _get_remote_ppt2lp_files($file)
             'service_ppt2lp_size' => $service_ppt2lp_size,
         );
 
-        $result = $client->__call('wsConvertPpt', array('pptData' => $params));
+        try {
+            $result = $client->__call('wsConvertPpt', array('pptData' => $params));
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+        }
 
         return $result;
     }

diff --git a/main/webservices/additional_webservices.php b/main/webservices/additional_webservices.php
@@ -54,7 +54,7 @@ function wsConvertPpt($pptData)
     $cmd .= ' -w 720 -h 540 -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
 
     $perms = api_get_permissions_for_new_files();
-    chmod($tempPathNewFiles . $fileName, $perms, true);
+    chmod($tempPathNewFiles . $fileName, $perms);
 
     $files = array();
     $return = 0;

diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php
@@ -6239,7 +6239,7 @@ function WSUserSubscribedInCourse($params)
  * Web service to get a session list filtered by name, description or short description extra field
  * @param array $params Contains the following parameters
  *   string $params['term'] Search term
- *   string $params['extra_fields'] Extrafields to include in request result
+ *   string $params['extrafields'] Extrafields to include in request result
  *   string $params['secret_key'] Secret key to check
  * @return array The list
  */

diff --git a/main/webservices/soap.test.php b/main/webservices/soap.test.php
@@ -25,7 +25,7 @@
 $lpiid = 1; // set to your learnpath item ID
 
 // Build the server's SOAP script address
-$server = api_get_path(WEB_CODE_PATH).'webservices/soap.php?wsdl';
+$server = api_get_path(WEB_CODE_PATH).'webservices/registration.soap.php?wsdl';
 
 /**
  * Call the webservice
@@ -35,10 +35,14 @@
 $client = new SoapClient($server, array('cache_wsdl' => WSDL_CACHE_NONE));
 
 // Call the function we want with the right params...
-$response = $client->{'WSReport.test'}();
+try {
+    $response = $client->{'WSSearchSession'}(array('term' => 'a', 'extrafields' => array(), 'secret_key' => $signature));
+} catch (Exception $e) {
+    error_log(print_r($e->getMessage(), 1));
+}
 //$response = $client->{'WSReport.GetLearnpathStatusSingleItem'}($signature, 'chamilo_user_id', $uid, 'chamilo_course_id', $cid, $lpid, $lpiid);
 //$response = $client->{'WSReport.GetLearnpathProgress'}($signature, 'chamilo_user_id', $uid, 'chamilo_course_id', $cid, $lpid);
 //$response = $client->{'WSReport.GetLearnpathHighestLessonLocation'}($signature, 'chamilo_user_id', $uid, 'chamilo_course_id', $cid, $lpid);
 // Print the output, or do whatever you like with it (it's the status for this item):
-echo '<pre>'.$response.'</pre>';
+echo '<pre>'.print_r($response, 1).'</pre>';
 // This should print "complete", "incomplete" or any other active status.