chamilo / chamilo-lms

main/webservices/registration.soap.php

Doc Comments +3 added lines

@@ -2617,6 +2617,9 @@
     )
 );
 
+/**
+ * @param string $type
+ */
 function WSHelperActionOnUsers($params, $type) {
     if(!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);

Spacing +460 added lines, -460 removed lines

@@ -81,7 +81,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -140,7 +140,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:extras[]')),
     'tns:extras'
 );
 
@@ -173,7 +173,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:usersParams[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:usersParams[]')),
     'tns:usersParams'
 );
 
@@ -219,13 +219,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateUsers',                 // method name
-    array('createUsers' => 'tns:createUsers'),     // input parameters
-    array('return' => 'tns:results_createUsers'),  // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateUsers',            // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+$server->register('WSCreateUsers', // method name
+    array('createUsers' => 'tns:createUsers'), // input parameters
+    array('return' => 'tns:results_createUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                     // documentation
 );
 
@@ -406,7 +406,7 @@ 
             continue;
         }
 
-        $results[] =  $userId;
+        $results[] = $userId;
 
     } // end principal foreach
 
@@ -452,13 +452,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateUser',                // method name
-    array('createUser' => 'tns:createUser'),     // input parameters
-    array('return' => 'xsd:string'),             // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSCreateUser',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSCreateUser', // method name
+    array('createUser' => 'tns:createUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                   // documentation
 );
 
@@ -561,7 +561,7 @@ 
     }
 
     if (isset($original_user_id_name) && isset($original_user_id_value)) {
-        $_SESSION['ws_' . $original_user_id_name] = $original_user_id_value;
+        $_SESSION['ws_'.$original_user_id_name] = $original_user_id_value;
     }
 
     /** @var User $user */
@@ -609,7 +609,7 @@ 
         );
 
         if (isset($original_user_id_name) && isset($original_user_id_value)) {
-            unset($_SESSION['ws_' . $original_user_id_name]);
+            unset($_SESSION['ws_'.$original_user_id_name]);
         }
 
         if (is_array($extra_list) && count($extra_list) > 0) {
@@ -661,7 +661,7 @@ 
         'language'              => array('name' => 'language', 'type' => 'xsd:string'),
         'phone'                 => array('name' => 'phone', 'type' => 'xsd:string'),
         'expiration_date'       => array('name' => 'expiration_date', 'type' => 'xsd:string'),
-        'official_code'         => array('name' => 'official_code',    'type' => 'xsd:string'),
+        'official_code'         => array('name' => 'official_code', 'type' => 'xsd:string'),
         'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
         'original_user_id_value'=> array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
         'extra'                 => array('name' => 'extra', 'type' => 'tns:extrasList')
@@ -689,7 +689,7 @@ 
     'all',
     '',
     array(
-        'users'         => array('name' => 'users',      'type' => 'tns:createUsersPassEncryptParamsList'),
+        'users'         => array('name' => 'users', 'type' => 'tns:createUsersPassEncryptParamsList'),
         'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -719,13 +719,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateUsersPasswordCrypted',                            // method name
+$server->register('WSCreateUsersPasswordCrypted', // method name
     array('createUsersPasswordCrypted' => 'tns:createUsersPasswordCrypted'), // input parameters
-    array('return' => 'tns:results_createUsersPassEncrypt'),                 // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSCreateUsersPasswordCrypted',                       // soapaction
-    'rpc',                                                                   // style
-    'encoded',                                                               // use
+    array('return' => 'tns:results_createUsersPassEncrypt'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users to the system'                                  // documentation
 );
 
@@ -795,7 +795,7 @@ 
 
         if (is_array($extra_list) && count($extra_list) > 0) {
             foreach ($extra_list as $extra) {
-                if($extra['field_name'] == 'salt') {
+                if ($extra['field_name'] == 'salt') {
                     $salt = $extra['field_value'];
                     break;
                 }
@@ -850,7 +850,7 @@ 
                         active='1',
                         hr_dept_id=".intval($hr_dept_id);
 
-                $sql .=  " WHERE user_id='".$r_check_user[0]."'";
+                $sql .= " WHERE user_id='".$r_check_user[0]."'";
                 Database::query($sql);
 
                 if (is_array($extra_list) && count($extra_list) > 0) {
@@ -989,9 +989,9 @@ 
     'all',
     '',
     array(
-        'user_id' => array('name' => 'course',     'type' => 'xsd:string'), // Chamilo user Id
-        'session_id' => array('name' => 'user_id',    'type' => 'xsd:string'), // Current Session course ID
-        'course_id' =>array('name' => 'courseId',      'type' => 'xsd:string'), // Course Real Id
+        'user_id' => array('name' => 'course', 'type' => 'xsd:string'), // Chamilo user Id
+        'session_id' => array('name' => 'user_id', 'type' => 'xsd:string'), // Current Session course ID
+        'course_id' =>array('name' => 'courseId', 'type' => 'xsd:string'), // Course Real Id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string'),
 
         // optional
@@ -1049,9 +1049,9 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) error_log('$userId found: '.$userId);
+    if ($debug) error_log('$courseId found: '.$courseId);
+    if ($debug) error_log('$sessionId found: '.$sessionId);
 
     return [
         'user_id' => $userId,
@@ -1087,7 +1087,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1100,13 +1100,13 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) error_log('Result:  '.$result);
 
     return $result;
 }
@@ -1138,7 +1138,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1152,7 +1152,7 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1160,7 +1160,7 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) error_log('Final Result: '.$result);
 
     return $result;
 }
@@ -1178,32 +1178,32 @@ 
     'all',
     '',
     array(
-        'firstname'                 => array('name' => 'firstname',                 'type' => 'xsd:string'),
-        'lastname'                  => array('name' => 'lastname',                  'type' => 'xsd:string'),
-        'status'                    => array('name' => 'status',                    'type' => 'xsd:string'),
-        'email'                     => array('name' => 'email',                     'type' => 'xsd:string'),
-        'loginname'                 => array('name' => 'loginname',                 'type' => 'xsd:string'),
-        'password'                  => array('name' => 'password',                  'type' => 'xsd:string'), //encripted password using the encrypt_method
-        'encrypt_method'            => array('name' => 'encrypt_method',            'type' => 'xsd:string'),
-        'language'                  => array('name' => 'language',                  'type' => 'xsd:string'),
-        'phone'                     => array('name' => 'phone',                     'type' => 'xsd:string'),
-        'expiration_date'           => array('name' => 'expiration_date',           'type' => 'xsd:string'),
-        'official_code'             => array('name' => 'official_code',             'type' => 'xsd:string'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'extra'                     => array('name' => 'extra',                     'type' => 'tns:extrasList'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'firstname'                 => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'                  => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status'                    => array('name' => 'status', 'type' => 'xsd:string'),
+        'email'                     => array('name' => 'email', 'type' => 'xsd:string'),
+        'loginname'                 => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password'                  => array('name' => 'password', 'type' => 'xsd:string'), //encripted password using the encrypt_method
+        'encrypt_method'            => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'language'                  => array('name' => 'language', 'type' => 'xsd:string'),
+        'phone'                     => array('name' => 'phone', 'type' => 'xsd:string'),
+        'expiration_date'           => array('name' => 'expiration_date', 'type' => 'xsd:string'),
+        'official_code'             => array('name' => 'official_code', 'type' => 'xsd:string'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'extra'                     => array('name' => 'extra', 'type' => 'tns:extrasList'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSCreateUserPasswordCrypted',                            // method name
-    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                   // namespace
-    'urn:WSRegistration#WSCreateUserPasswordCrypted',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateUserPasswordCrypted', // method name
+    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -1213,7 +1213,7 @@ 
     global $_user, $_configuration, $debug;
     $debug = 1;
     if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) error_log(print_r($params, 1));
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1242,7 +1242,7 @@ 
     $extra_list = isset($params['extra']) ? $params['extra'] : '';
 
     if (!empty($_configuration['password_encryption'])) {
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 if ($debug) error_log($msg);
@@ -1304,7 +1304,7 @@ 
             if (!is_null($auth_source)) {
                 $sql .= " auth_source='".Database::escape_string($auth_source)."',";
             }
-            $sql .=    "
+            $sql .= "
                     password='".Database::escape_string($password)."',
                     email='".Database::escape_string($email)."',
                     status='".Database::escape_string($status)."',
@@ -1495,13 +1495,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserCredentials',                      // method name
-    array('editUserCredentials' => 'tns:editUserCredentials'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSEditUserCredentials',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSEditUserCredentials', // method name
+    array('editUserCredentials' => 'tns:editUserCredentials'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserCredentials', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits the username and password of a user'    // documentation
 );
 
@@ -1600,13 +1600,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsers',                // method name
-    array('editUsers' => 'tns:editUsers'),      // input parameters
+$server->register('WSEditUsers', // method name
+    array('editUsers' => 'tns:editUsers'), // input parameters
     array('return' => 'tns:results_editUsers'), // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSEditUsers',           // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'     // documentation
 );
 
@@ -1791,13 +1791,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUser',              // method name
-    array('editUser' => 'tns:editUser'),     // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSEditUser',         // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+$server->register('WSEditUser', // method name
+    array('editUser' => 'tns:editUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'  // documentation
 );
 
@@ -1964,13 +1964,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserWithPicture',              // method name
-    array('editUserWithPicture' => 'tns:editUserWithPicture'),     // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSEditUserWithPicture',         // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSEditUserWithPicture', // method name
+    array('editUserWithPicture' => 'tns:editUserWithPicture'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserWithPicture', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'             // documentation
 );
 
@@ -2024,8 +2024,8 @@ 
     $tempDir = api_get_path(SYS_ARCHIVE_PATH);
     // Make sure the file download was OK by checking the HTTP headers for OK
     if (strpos(get_headers($picture_url)[0], "OK")) {
-        file_put_contents($tempDir . $filename, file_get_contents($picture_url));
-        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir . $filename);
+        file_put_contents($tempDir.$filename, file_get_contents($picture_url));
+        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir.$filename);
     }
 
     if ($user_id == 0) {
@@ -2187,13 +2187,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsersPasswordCrypted',                           // method name
-    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'),  // input parameters
-    array('return' => 'tns:results_editUsersPasswordCrypted'),            // output parameters
-    'urn:WSRegistration',                                                 // namespace
-    'urn:WSRegistration#WSEditUsersPasswordCrypted',                      // soapaction
-    'rpc',                                                                // style
-    'encoded',                                                            // use
+$server->register('WSEditUsersPasswordCrypted', // method name
+    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'), // input parameters
+    array('return' => 'tns:results_editUsersPasswordCrypted'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                           // documentation
 );
 
@@ -2237,7 +2237,7 @@ 
 
             $password = $user_param['password'];
             $encrypt_method = $user_param['encrypt_method'];
-            if ($_configuration['password_encryption'] === $encrypt_method ) {
+            if ($_configuration['password_encryption'] === $encrypt_method) {
                 if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                     $msg = "Encryption $encrypt_method is invalid";
                     $results[] = $msg;
@@ -2252,11 +2252,11 @@ 
                 $results[] = $msg;
                 continue;
             }
-        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])){
+        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])) {
             $msg = "If password is not empty the encrypt_method param is required ";
             $results[] = $msg;
             continue;
-        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])){
+        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])) {
             $msg = "If encrypt_method is not empty the password param is required ";
             $results[] = $msg;
             continue;
@@ -2392,13 +2392,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserPasswordCrypted',                         // method name
+$server->register('WSEditUserPasswordCrypted', // method name
     array('editUserPasswordCrypted' => 'tns:editUserPasswordCrypted'), // input parameters
-    array('return' => 'xsd:string'),                                   // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSEditUserPasswordCrypted',                    // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                        // documentation
 );
 
@@ -2442,7 +2442,7 @@ 
     if (!empty($params['password']) && !empty($params['encrypt_method'])) {
         $password = $params['password'];
         $encrypt_method = $params['encrypt_method'];
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 return $msg;
@@ -2612,7 +2612,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:user_id[]')),'tns:user_id'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_id[]')), 'tns:user_id'
 );
 
 $server->wsdl->addComplexType(
@@ -2636,7 +2636,7 @@ 
     $orig_user_id_value = array();
 
     $original_user_ids = $params['ids'];
-    foreach($original_user_ids as $original_user_id) {
+    foreach ($original_user_ids as $original_user_id) {
         $result = false;
         $orig_user_id_value[] = $original_user_id['original_user_id_value'];
         $user_id = UserManager::get_user_id_from_original_id(
@@ -2646,13 +2646,13 @@ 
         if ($user_id > 0) {
             if ($type == "delete") {
                 $result = UserManager::delete_user($user_id);
-            } else if($type == "disable") {
+            } else if ($type == "disable") {
                 $result = UserManager::disable($user_id);
-            } else if($type == "enable") {
+            } else if ($type == "enable") {
                 $result = UserManager::enable($user_id);
             }
         }
-        $results[] = $result?1:0;
+        $results[] = $result ? 1 : 0;
     }
 
 
@@ -2668,13 +2668,13 @@ 
     return $output;
 }
 
-$server->register('WSDeleteUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                   // input parameters
-    array('return' => 'tns:results_actionUsers'),          // output parameters
-    'urn:WSRegistration',                                  // namespace
-    'urn:WSRegistration#WSDeleteUsers',                    // soapaction
-    'rpc',                                                 // style
-    'encoded',                                             // use
+$server->register('WSDeleteUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Deletes users provided as parameters from the system' // documentation
 );
 
@@ -2683,13 +2683,13 @@ 
 }
 
 /** WSDisableUsers **/
-$server->register('WSDisableUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                    // input parameters
-    array('return' => 'tns:results_actionUsers'),           // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSDisableUsers',                    // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSDisableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDisableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Disables users provided as parameters from the system' // documentation
 );
 
@@ -2698,13 +2698,13 @@ 
 }
 
 /** WSEnableUsers **/
-$server->register('WSEnableUsers',            // method name
-    array('user_ids' => 'tns:user_ids'),      // input parameters
-    array('return' => 'tns:results_actionUsers'),      // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSEnableUsers',       // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSEnableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEnableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Enables users provided as parameters'    // documentation
 );
 
@@ -2757,7 +2757,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:createCourseParams[]')),'tns:createCourseParams'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:createCourseParams[]')), 'tns:createCourseParams'
 );
 
 // Register the data structures used by the service
@@ -2798,13 +2798,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateCourse',                // method name
-    array('createCourse' => 'tns:createCourse'),   // input parameters
+$server->register('WSCreateCourse', // method name
+    array('createCourse' => 'tns:createCourse'), // input parameters
     array('return' => 'tns:results_createCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course'                   // documentation
 );
 
@@ -2862,7 +2862,7 @@ 
                             category_code='".Database::escape_string($category_code)."',
                             tutor_name='".Database::escape_string($tutor_name)."',
                             visual_code='".Database::escape_string($wanted_code)."'";
-                if($visibility !== null) {
+                if ($visibility !== null) {
                     $sql .= ", visibility = '$visibility' ";
                 }
                 $sql .= " WHERE id='".$courseInfo['real_id']."'";
@@ -2895,7 +2895,7 @@ 
         $params['title'] = $title;
         $params['wanted_code'] = $wanted_code;
         $params['category_code'] = $category_code;
-        $params['course_category']    = $category_code;
+        $params['course_category'] = $category_code;
         $params['tutor_name'] = $tutor_name;
         $params['course_language'] = $course_language;
         $params['user_id'] = api_get_user_id();
@@ -3033,13 +3033,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateCourseByTitle',                     // method name
+$server->register('WSCreateCourseByTitle', // method name
     array('createCourseByTitle' => 'tns:createCourseByTitle'), // input parameters
-    array('return' => 'tns:results_createCourseByTitle'),      // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSCreateCourseByTitle',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+    array('return' => 'tns:results_createCourseByTitle'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourseByTitle', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course by title'                      // documentation
 );
 
@@ -3270,18 +3270,18 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditCourse',                // method name
-    array('editCourse' => 'tns:editCourse'),     // input parameters
+$server->register('WSEditCourse', // method name
+    array('editCourse' => 'tns:editCourse'), // input parameters
     array('return' => 'tns:results_editCourse'), // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSEditCourse',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course'                // documentation
 );
 
 // Define the method WSEditCourse
-function WSEditCourse($params){
+function WSEditCourse($params) {
 
     global $_configuration;
     if (!WSHelperVerifyKey($params)) {
@@ -3436,13 +3436,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCourseDescription',                    // method name
-    array('courseDescription' => 'tns:courseDescription'),  // input parameters
-    array('return' => 'tns:fields_course_desc_list'),       // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSCourseDescription',               // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSCourseDescription', // method name
+    array('courseDescription' => 'tns:courseDescription'), // input parameters
+    array('return' => 'tns:fields_course_desc_list'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'               // documentation
 );
 
@@ -3492,7 +3492,7 @@ 
     }
 
     while ($row = Database::fetch_array($result)) {
-        $ind = (int)$row['id'];
+        $ind = (int) $row['id'];
         $array_course_desc_title[$ind] = $row['title'];
         $array_course_desc_content[$ind] = $row['content'];
     }
@@ -3579,13 +3579,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditCourseDescription',                       // method name
+$server->register('WSEditCourseDescription', // method name
     array('editCourseDescription' => 'tns:editCourseDescription'), // input parameters
-    array('return' => 'tns:results_editCourseDescription'),        // output parameters
-    'urn:WSRegistration',                                          // namespace
-    'urn:WSRegistration#WSEditCourseDescription',                  // soapaction
-    'rpc',                                                         // style
-    'encoded',                                                     // use
+    array('return' => 'tns:results_editCourseDescription'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'                      // documentation
 );
 
@@ -3627,7 +3627,7 @@ 
         $course_desc_title = Database::escape_string($course_desc_title);
         $course_desc_content = Database::escape_string($course_desc_content);
 
-        $course_desc_id = (int)$course_desc_id;
+        $course_desc_id = (int) $course_desc_id;
         if ($course_desc_id > 8 && $course_desc_id < 1) {
             $results[] = 0; // course_desc_id invalid.
             continue;
@@ -3656,7 +3656,7 @@ 
             $result = $courseDescription->insert();
         }
 
-        $results[] = $result?1:0;
+        $results[] = $result ? 1 : 0;
     } // end principal foreach
 
     $count_results = count($results);
@@ -3734,13 +3734,13 @@ 
     'tns:result_deleteCourse'
 );
 
-$server->register('WSDeleteCourse',                // method name
-    array('deleteCourse' => 'tns:deleteCourse'),   // input parameters
+$server->register('WSDeleteCourse', // method name
+    array('deleteCourse' => 'tns:deleteCourse'), // input parameters
     array('return' => 'tns:results_deleteCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSDeleteCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a course '               // documentation
 );
 
@@ -3867,13 +3867,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateSession',                // method name
-    array('createSession' => 'tns:createSession'),  // input parameters
+$server->register('WSCreateSession', // method name
+    array('createSession' => 'tns:createSession'), // input parameters
     array('return' => 'tns:results_createSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCreateSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                  // documentation
 );
 
@@ -3927,8 +3927,8 @@ 
         }
 
         if (empty($nolimit)) {
-            $date_start = "$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start) . ' 00:00:00';
-            $date_end = "$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end) . ' 23:59:59';
+            $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start).' 00:00:00';
+            $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end).' 23:59:59';
         } else {
             $date_start = "";
             $date_end = "";
@@ -3952,7 +3952,7 @@ 
             }
             $results[] = 0;
             continue;
-        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end,  $day_end, $year_end))) {
+        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end, $day_end, $year_end))) {
             $results[] = 0;
             if ($debug) {
                 error_log("There's an error with the end date: $month_end - $day_end - $year_end");
@@ -4141,13 +4141,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditSession',                // method name
-    array('editSession' => 'tns:editSession'),    // input parameters
+$server->register('WSEditSession', // method name
+    array('editSession' => 'tns:editSession'), // input parameters
     array('return' => 'tns:results_editSession'), // output parameters
-    'urn:WSRegistration',                         // namespace
-    'urn:WSRegistration#WSEditSession',           // soapaction
-    'rpc',                                        // style
-    'encoded',                                    // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                // documentation
 );
 
@@ -4267,7 +4267,7 @@ 
                 }
             }
 
-            $results[] = $editResult?1:0;
+            $results[] = $editResult ? 1 : 0;
             continue;
         }
 
@@ -4346,13 +4346,13 @@ 
     'tns:result_deleteSession'
 );
 
-$server->register('WSDeleteSession',                // method name
-    array('deleteSession' => 'tns:deleteSession'),  // input parameters
+$server->register('WSDeleteSession', // method name
+    array('deleteSession' => 'tns:deleteSession'), // input parameters
     array('return' => 'tns:results_deleteSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSDeleteSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a session '               // documentation
 );
 
@@ -4433,10 +4433,10 @@ 
     'struct',
     'all',
     '',
-    array (
+    array(
         'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
-        'user_id'   => array('name' => 'user_id',   'type' => 'tns:user_id'),
-        'status'    => array('name' => 'status',    'type' => 'xsd:int')
+        'user_id'   => array('name' => 'user_id', 'type' => 'tns:user_id'),
+        'status'    => array('name' => 'status', 'type' => 'xsd:int')
     )
 );
 
@@ -4446,9 +4446,9 @@ 
     'struct',
     'all',
     '',
-    array (
-        'userscourses'  => array('name' => 'userscourses',  'type' => 'tns:user_course_status_array'), //removed []
-        'secret_key'    => array('name' => 'secret_key',    'type' => 'xsd:string')
+    array(
+        'userscourses'  => array('name' => 'userscourses', 'type' => 'tns:user_course_status_array'), //removed []
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4473,9 +4473,9 @@ 
     'all',
     '',
     array(
-        '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'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        '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'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
@@ -4491,13 +4491,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourse',                            // method name
-    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'),  // input parameters
+$server->register('WSSubscribeUserToCourse', // method name
+    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'), // input parameters
     array('return' => 'tns:subscribeUserToCourse_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourse',                       // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course'                        // documentation
 );
 
@@ -4507,7 +4507,7 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params, 1));
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4575,9 +4575,9 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
-        'status'       => array('name' => 'status',     'type' => 'xsd:int'),
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
+        'status'       => array('name' => 'status', 'type' => 'xsd:int'),
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -4590,18 +4590,18 @@ 
     'struct',
     'all',
     '',
-    array('message' => array('name' => 'message',    'type' => 'xsd:string'))
+    array('message' => array('name' => 'message', 'type' => 'xsd:string'))
 );
 
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourseSimple',                                 // method name
+$server->register('WSSubscribeUserToCourseSimple', // method name
     array('subscribeUserToCourseSimple' => 'tns:subscribeUserToCourseSimple_arg'), // input parameters
-    array('return' => 'xsd:string'),                                               // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourseSimple',                            // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course in a simple way'                   // documentation
 );
 
@@ -4610,7 +4610,7 @@ 
     global $debug;
 
     if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4661,9 +4661,9 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'      => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_user_id_name'       => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'secret_key'                  => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_value'      => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_user_id_name'       => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'secret_key'                  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4674,21 +4674,21 @@ 
     'struct',
     'all',
     '',
-    array (
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'),
-        'firstname'    => array('name' => 'firstname',  'type' => 'xsd:string'),
-        'lastname'     => array('name' => 'lastname',   'type' => 'xsd:string'),
+    array(
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'),
+        'firstname'    => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'     => array('name' => 'lastname', 'type' => 'xsd:string'),
     )
 );
 
 // Register the method to expose
-$server->register('WSGetUser',                   // method name
-    array('GetUser' => 'tns:GetUserArg'),        // input parameters
-    array('return' => 'tns:User'),               // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSGetUser',              // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSGetUser', // method name
+    array('GetUser' => 'tns:GetUserArg'), // input parameters
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by id'    // documentation
 );
 
@@ -4733,17 +4733,17 @@ 
     '',
     array(
         'username'      => array('name' => 'username', 'type' => 'xsd:string'),
-        'secret_key'    => array('name' => 'secret_key','type' => 'xsd:string')
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 // Register the method to expose
-$server->register('WSGetUserFromUsername',                     // method name
-    array('GetUserFromUsername' => 'tns:GetUserArgUsername'),  // input params
-    array('return' => 'tns:User'),                             // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSGetUserFromUsername',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+$server->register('WSGetUserFromUsername', // method name
+    array('GetUserFromUsername' => 'tns:GetUserArgUsername'), // input params
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUserFromUsername', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by username'            // documentation
 );
 
@@ -4785,10 +4785,10 @@ 
     'all',
     '',
     array(
-        '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_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        '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_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
     )
 );
 
@@ -4841,13 +4841,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsubscribeUserFromCourse',                         // method name
+$server->register('WSUnsubscribeUserFromCourse', // method name
     array('unsuscribeUserFromCourse' => 'tns:unsuscribeUserFromCourse'), // input parameters
-    array('return' => 'tns:results_unsuscribeUserFromCourse'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnsubscribeUserFromCourse',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:results_unsuscribeUserFromCourse'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsubscribeUserFromCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user from a course'                     // documentation
 );
 
@@ -4893,7 +4893,7 @@ 
             $usersList[] = $user_id;
         }
 
-        $orig_user_id_value[] = implode(',',$usersList);
+        $orig_user_id_value[] = implode(',', $usersList);
 
         $courseInfo = CourseManager::getCourseInfoFromOriginalId(
             $original_course_id_value,
@@ -4960,20 +4960,20 @@ 
     'all',
     '',
     array(
-        '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'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        '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'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
 // Register the method to expose
-$server->register('WSUnSubscribeUserFromCourseSimple',                         // method name
+$server->register('WSUnSubscribeUserFromCourseSimple', // method name
     array('unSubscribeUserFromCourseSimple' => 'tns:unSubscribeUserFromCourseSimple'), // input parameters
-    array('return' => 'tns:unSubscribeUserToCourseSimple_return'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:unSubscribeUserToCourseSimple_return'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
@@ -5044,10 +5044,10 @@ 
     'all',
     '',
     array(
-        '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_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_value',  'type' => 'xsd:string')
+        '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_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_value', 'type' => 'xsd:string')
     )
 );
 
@@ -5140,13 +5140,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSuscribeUsersToSession',                          // method name
+$server->register('WSSuscribeUsersToSession', // method name
     array('subscribeUsersToSession' => 'tns:subscribeUsersToSession'), // input parameters
-    array('return' => 'tns:results_subscribeUsersToSession'),          // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSSuscribeUsersToSession',                     // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'tns:results_subscribeUsersToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeUsersToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session'                      // documentation
 );
 
@@ -5246,25 +5246,25 @@ 
     'all',
     '',
     array(
-        'session'    => array('name' => 'session',    'type' => 'xsd:string'), // Session ID
-        'user_id'    => array('name' => 'user_id',    'type' => 'xsd:string'), // Chamilo user_id
+        'session'    => array('name' => 'session', 'type' => 'xsd:string'), // Session ID
+        'user_id'    => array('name' => 'user_id', 'type' => 'xsd:string'), // Chamilo user_id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
-$server->register('WSSubscribeUserToSessionSimple',                                   // method name
-    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'),  // input parameters
-    array('return' => 'xsd:string'),                                                  // output parameters
-    'urn:WSRegistration',                                                             // namespace
-    'urn:WSRegistration#WSSubscribeUserToSessionSimple',                              // soapaction
-    'rpc',                                                                            // style
-    'encoded',                                                                        // use
+$server->register('WSSubscribeUserToSessionSimple', // method name
+    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToSessionSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session in a simple way'                     // documentation
 );
 function WSSubscribeUserToSessionSimple($params) {
     global $debug;
 
     if ($debug) {
-        error_log('WSSubscribeUserToSessionSimple with params=[' . serialize($params). ']');
+        error_log('WSSubscribeUserToSessionSimple with params=['.serialize($params).']');
     }
 
     // Check security key
@@ -5273,8 +5273,8 @@ 
     }
 
     // Get input parameters
-    $session_id = intval($params['session']);  // Session ID
-    $user_id    = intval($params['user_id']);  // Chamilo user id
+    $session_id = intval($params['session']); // Session ID
+    $user_id    = intval($params['user_id']); // Chamilo user id
 
     // Get user id
     $user_data = api_get_user_info($user_id);
@@ -5375,13 +5375,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsuscribeUsersFromSession',                              // method name
+$server->register('WSUnsuscribeUsersFromSession', // method name
     array('unsubscribeUsersFromSession' => 'tns:unsubscribeUsersFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeUsersFromSession'),              // output parameters
-    'urn:WSRegistration',                                                      // namespace
-    'urn:WSRegistration#WSUnsuscribeUsersFromSession',                         // soapaction
-    'rpc',                                                                     // style
-    'encoded',                                                                 // use
+    array('return' => 'tns:results_unsubscribeUsersFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeUsersFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user to a session'                            // documentation
 );
 
@@ -5395,7 +5395,7 @@ 
     global $debug;
 
     if ($debug) {
-        error_log('WSUnsuscribeUsersFromSession with params=[' . serialize($params). ']');
+        error_log('WSUnsuscribeUsersFromSession with params=['.serialize($params).']');
     }
 
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -5489,7 +5489,7 @@ 
     'all',
     '',
     array(
-        'course_code'   => array('name' => 'course_code',   'type' => 'xsd:string'),
+        'course_code'   => array('name' => 'course_code', 'type' => 'xsd:string'),
     )
 );
 
@@ -5524,9 +5524,9 @@ 
     '',
     array(
         'original_course_id_values' => array('name' => 'original_course_id_values', 'type' => 'tns:originalCoursesList'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', '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')
     )
 );
 
@@ -5579,13 +5579,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSuscribeCoursesToSession',                            // method name
+$server->register('WSSuscribeCoursesToSession', // method name
     array('subscribeCoursesToSession' => 'tns:subscribeCoursesToSession'), // input parameters
-    array('return' => 'tns:results_subscribeCoursesToSession'),            // output parameters
-    'urn:WSRegistration',                                                  // namespace
-    'urn:WSRegistration#WSSuscribeCoursesToSession',                       // soapaction
-    'rpc',                                                                 // style
-    'encoded',                                                             // use
+    array('return' => 'tns:results_subscribeCoursesToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeCoursesToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                        // documentation
 );
 
@@ -5730,13 +5730,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSUnsuscribeCoursesFromSession',                                // method name
+$server->register('WSUnsuscribeCoursesFromSession', // method name
     array('unsubscribeCoursesFromSession' => 'tns:unsubscribeCoursesFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeCoursesFromSession'),                // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSUnsuscribeCoursesFromSession',                           // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'tns:results_unsubscribeCoursesFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeCoursesFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                                // documentation
 );
 
@@ -5900,13 +5900,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSListCourses',                                                  // method name
+$server->register('WSListCourses', // method name
     array('listCourseInput' => 'tns:listCourseInput'), // input parameters
-    array('return' => 'tns:courses'),                                               // output parameters
-    'urn:WSRegistration',                                                           // namespace
-    'urn:WSRegistration#WSListCourses',                                             // soapaction
-    'rpc',                                                                          // style
-    'encoded',                                                                      // use
+    array('return' => 'tns:courses'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service list courses available on the system'                             // documentation
 );
 
@@ -5986,21 +5986,21 @@ 
     'all',
     '',
     array(
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'chamilo_username'          => array('name' => 'chamilo_username',          'type' => 'xsd:string'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'chamilo_username'          => array('name' => 'chamilo_username', 'type' => 'xsd:string'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserApiKey',      // method name
+$server->register('WSUpdateUserApiKey', // method name
     array('userApiKey' => 'tns:userApiKey'), // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSListCourses',      // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service return user api key'       // documentation
 );
 
@@ -6056,11 +6056,11 @@ 
     'all',
     '',
     array(
-        'from'  => array('name' => 'from',  'type' => 'xsd:int'),
-        'to'    => array('name' => 'to',    'type' => 'xsd:int'),
-        'date_start'  => array('name' => 'date_start',  'type' => 'xsd:string'),
-        'date_end'    => array('name' => 'date_end',    'type' => 'xsd:string'),
-        'secret_key'  => array('name' => 'secret_key',  'type' => 'xsd:string')
+        'from'  => array('name' => 'from', 'type' => 'xsd:int'),
+        'to'    => array('name' => 'to', 'type' => 'xsd:int'),
+        'date_start'  => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end'    => array('name' => 'date_end', 'type' => 'xsd:string'),
+        'secret_key'  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -6071,11 +6071,11 @@ 
     'all',
     '',
     array(
-        'id' => array ('name' => 'id'  , 'type' => 'xsd:int'),
-        'title' => array ('name' => 'title', 'type' => 'xsd:string'),
-        'url' => array ('name' => 'url', 'type' => 'xsd:string'),
-        'date_start' => array ('name' => 'date_start', 'type' => 'xsd:string'),
-        'date_end' => array ('name' => 'date_end', 'type' => 'xsd:string'),
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'url' => array('name' => 'url', 'type' => 'xsd:string'),
+        'date_start' => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end' => array('name' => 'date_end', 'type' => 'xsd:string'),
     )
 );
 
@@ -6094,13 +6094,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSListSessions',           // method name
-    array('input'  => 'tns:session_arg'),     // input parameters
-    array('return' => 'tns:sessions'),        // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSListSessions',      // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSListSessions', // method name
+    array('input'  => 'tns:session_arg'), // input parameters
+    array('return' => 'tns:sessions'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListSessions', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of sessions' // documentation
 );
 
@@ -6158,20 +6158,20 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUserSubscribedInCourse',                            // method name
-    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'),    // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSUserSubscribedInCourse',                       // soapaction
-    'rpc',                                                                    // style
-    'encoded',                                                                // use
+$server->register('WSUserSubscribedInCourse', // method name
+    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUserSubscribedInCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service checks if user assigned to course'    // documentation
 );
 
@@ -6197,7 +6197,7 @@ 
     $courseCode = $params['course']; //Course code
     $userId = $params['user_id']; //chamilo user id
 
-    return CourseManager::is_user_subscribed_in_course($userId,$courseCode);
+    return CourseManager::is_user_subscribed_in_course($userId, $courseCode);
 }
 
 
@@ -6225,8 +6225,8 @@ 
     'all',
     '',
     array(
-        'variable' => array('name'=>'variable','type'=>'xsd:string'),
-        'value' => array('name'=>'value','type'=>'xsd:string')
+        'variable' => array('name'=>'variable', 'type'=>'xsd:string'),
+        'value' => array('name'=>'value', 'type'=>'xsd:string')
     )
 );
 
@@ -6288,12 +6288,12 @@ 
 //Reister WSSearchSession
 $server->register(
     'WSSearchSession',
-    array('SearchSession' => 'tns:SearchSession'),      // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSSearchSession',               // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:SearchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSearchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service to get a session list filtered by name, description or short description extra field'    // documentation
 );
 
@@ -6348,12 +6348,12 @@ 
 //Reister WSFetchSession
 $server->register(
     'WSFetchSession',
-    array('SearchSession' => 'tns:FetchSession'),                    // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSFetchSession',                // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:FetchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSFetchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get a session by its id. Optionally can get its extra fields values'    // documentation
 );
 
@@ -6430,16 +6430,16 @@ 
 );
 // Register the method to expose
 $server->register(
-    'WSCertificatesList',                           // method name
+    'WSCertificatesList', // method name
     array(
-        'startingDate' => 'xsd:string',             // input parameters
+        'startingDate' => 'xsd:string', // input parameters
         'endingDate' => 'xsd:string'
     ),
-    array('return' => 'tns:certificatesList'),      // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCertificatesList',        // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    array('return' => 'tns:certificatesList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCertificatesList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of certificates'   // documentation
 );
 
@@ -6505,13 +6505,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateGroup',              // method name
-    array('createGroup' => 'tns:createGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSCreateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSCreateGroup', // method name
+    array('createGroup' => 'tns:createGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a group'                 // documentation
 );
 
@@ -6553,13 +6553,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateGroup',              // method name
-    array('updateGroup' => 'tns:updateGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSUpdateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSUpdateGroup', // method name
+    array('updateGroup' => 'tns:updateGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a group'              // documentation
 );
 
@@ -6594,13 +6594,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteGroup',              // method name
-    array('deleteGroup' => 'tns:deleteGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSDeleteGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSDeleteGroup', // method name
+    array('deleteGroup' => 'tns:deleteGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a group'              // documentation
 );
 
@@ -6635,13 +6635,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupBindToParent',                      // method name
-    array('groupBindToParent' => 'tns:groupBindToParent'),  // input parameters
-    array('return' => 'xsd:string'),                        // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#GroupBindToParent',                 // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('GroupBindToParent', // method name
+    array('groupBindToParent' => 'tns:groupBindToParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupBindToParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service binds a group to a parent'                // documentation
 );
 
@@ -6675,13 +6675,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupUnbindFromParent',                          // method name
-    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#GroupUnbindFromParent',                     // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('GroupUnbindFromParent', // method name
+    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupUnbindFromParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unbinds a group from its parent'                  // documentation
 );
 
@@ -6715,13 +6715,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserToGroup',                   // method name
-    array('addUserToGroup' => 'tns:addUserToGroup'),    // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSAddUserToGroup',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSAddUserToGroup', // method name
+    array('addUserToGroup' => 'tns:addUserToGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSAddUserToGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user to a group'               // documentation
 );
 
@@ -6758,13 +6758,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserRoleInGroup',                        // method name
-    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#WSUpdateUserRoleInGroup',                   // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('WSUpdateUserRoleInGroup', // method name
+    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateUserRoleInGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a user role in group'                     // documentation
 );
 
@@ -6803,13 +6803,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteUserFromGroup',                      // method name
-    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSDeleteUserFromGroup',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSDeleteUserFromGroup', // method name
+    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUserFromGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a user from a group'                  // documentation
 );
 
@@ -6842,10 +6842,10 @@ 
     'struct',
     'all',
     '',
-    array (
+    array(
         'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
-        'user_id'   => array('name' => 'user_id',   'type' => 'tns:user_id'),
-        'visible'   => array('name' => 'status',    'type' => 'xsd:int')
+        'user_id'   => array('name' => 'user_id', 'type' => 'tns:user_id'),
+        'visible'   => array('name' => 'status', 'type' => 'xsd:int')
     )
 );
 
@@ -6868,9 +6868,9 @@ 
     'struct',
     'all',
     '',
-    array (
-        'userscourses'  => array('name' => 'userscourses',  'type' => 'tns:user_course_visibility_array'),
-        'secret_key'    => array('name' => 'secret_key',    'type' => 'xsd:string')
+    array(
+        'userscourses'  => array('name' => 'userscourses', 'type' => 'tns:user_course_visibility_array'),
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -6882,10 +6882,10 @@ 
     'all',
     '',
     array(
-        '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'),
-        'visible'                   => array('name' => 'visible',                   'type' => 'xsd:int'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        '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'),
+        'visible'                   => array('name' => 'visible', 'type' => 'xsd:int'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
@@ -6901,13 +6901,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserVisibilityToCourseInCatalogue',          // method name
-    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'),  // input parameters
+$server->register('WSAddUserVisibilityToCourseInCatalogue', // method name
+    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'), // input parameters
     array('return' => 'tns:registerUserToCourseCatalogue_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue',     // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service registers the visibility of users to course in catalogue' // documentation
 );
 
@@ -6973,13 +6973,13 @@ 
 }
 
 // Register the method to expose
-$server->register('WSRemoveUserVisibilityToCourseInCatalogue',          // method name
-    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'),  // input parameters
+$server->register('WSRemoveUserVisibilityToCourseInCatalogue', // method name
+    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'), // input parameters
     array('return' => 'tns:registerUserToCourseCatalogue_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue',     // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service removes the visibility of users to course in catalogue' // documentation
 );
 

Braces +186 added lines, -64 removed lines

@@ -63,14 +63,16 @@ 
         list($ip1) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
@@ -554,7 +556,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1045,9 +1049,15 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) {
+        error_log('$userId found: '. $userId);
+    }
+    if ($debug) {
+        error_log('$courseId found: '. $courseId);
+    }
+    if ($debug) {
+        error_log('$sessionId found: '. $sessionId);
+    }
 
     return [
         'user_id' => $userId,
@@ -1077,13 +1087,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1096,13 +1110,17 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  '. print_r($coaches, 1));
+        }
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) {
+        error_log('Result:  '. $result);
+    }
 
     return $result;
 }
@@ -1128,13 +1146,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1148,7 +1170,9 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  ' . print_r($coaches, 1));
+        }
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1156,7 +1180,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1208,8 +1234,12 @@ 
 {
     global $_user, $_configuration, $debug;
     $debug = 1;
-    if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) {
+        error_log('WSCreateUserPasswordCrypted');
+    }
+    if ($debug) {
+        error_log(print_r($params,1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1241,22 +1271,30 @@ 
         if ($_configuration['password_encryption'] === $encrypt_method ) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
 
             } else if ($encrypt_method == 'sha1' && !preg_match('/^[A-Fa-f0-9]{40}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
             }
         } else {
             $msg = "This encryption $encrypt_method is not configured";
-            if ($debug) error_log($msg);
+            if ($debug) {
+                error_log($msg);
+            }
             return $msg;
         }
     } else {
         $msg = 'The chamilo setting $_configuration["password_encryption"] is not configured';
-        if ($debug) error_log($msg);
+        if ($debug) {
+            error_log($msg);
+        }
         return $msg;
     }
 
@@ -1276,10 +1314,14 @@ 
         $original_user_id_name
     );
 
-    if ($debug) error_log('Ready to create user');
+    if ($debug) {
+        error_log('Ready to create user');
+    }
 
     if ($user_id > 0) {
-        if ($debug) error_log('User found with id: '.$user_id);
+        if ($debug) {
+            error_log('User found with id: '.$user_id);
+        }
 
         // Check whether user is not active
         //@todo why this condition exists??
@@ -1290,7 +1332,9 @@ 
         $count_check_user = Database::num_rows($resu);
         if ($count_check_user > 0) {
 
-            if ($debug) error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            if ($debug) {
+                error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            }
 
             $sql = "UPDATE $table_user SET
                     lastname='".Database::escape_string($lastName)."',
@@ -1311,7 +1355,9 @@ 
                     hr_dept_id=".intval($hr_dept_id)." 
                 WHERE user_id='".$r_check_user[0]."'";
 
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
 
             if (is_array($extra_list) && count($extra_list) > 0) {
@@ -1328,11 +1374,15 @@ 
             }
             return $r_check_user[0];
         } else {
-            if ($debug) error_log('User exists but is active. Cant be updated');
+            if ($debug) {
+                error_log('User exists but is active. Cant be updated');
+            }
             return 0;
         }
     } else {
-        if ($debug) error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        if ($debug) {
+            error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        }
     }
 
     // Default language.
@@ -1348,12 +1398,16 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
     $queryExpirationDate = '';
-    if (!empty($params['expiration_date'])) $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    if (!empty($params['expiration_date'])) {
+        $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    }
 
     $sql = "INSERT INTO $table_user SET
             lastname            = '".Database::escape_string(trim($lastName))."',
@@ -1373,7 +1427,9 @@ 
             ".$queryExpirationDate."
             hr_dept_id          = '".Database::escape_string($hr_dept_id)."',
             active              = '".Database::escape_string($active)."'";
-    if ($debug) error_log($sql);
+    if ($debug) {
+        error_log($sql);
+    }
 
     Database::query($sql);
     $return = Database::insert_id();
@@ -1385,7 +1441,9 @@ 
 
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
-        if ($debug) error_log("Adding user_id = $return to URL id $url_id ");
+        if ($debug) {
+            error_log("Adding user_id = $return to URL id $url_id ");
+        }
 
         // Create extra field for the original_user_id_name
         UserManager::create_extra_field(
@@ -1422,7 +1480,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
 
         return 0;
     }
@@ -4504,7 +4564,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4523,7 +4585,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        if ($debug) {
+            error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        }
 
         if ($user_id == 0) {
             // If user was not found, there was a problem
@@ -4541,13 +4605,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                }
                 $result = CourseManager::add_user_to_course($user_id, $courseCode, $status, false);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSSubscribeUserToCourse subscribed');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse subscribed');
+                    }
                 } else {
-                    if ($debug) error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    }
                 }
             }
         }
@@ -4606,8 +4676,12 @@ 
 function WSSubscribeUserToCourseSimple($params) {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourseSimple');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4625,7 +4699,9 @@ 
     if (empty($user_data)) {
         // If user was not found, there was a problem
         $result = "User $user_id does not exist";
-        if ($debug) error_log($result);
+        if ($debug) {
+            error_log($result);
+        }
         return $result;
     }
     if (!empty($course_code)) {
@@ -4633,14 +4709,22 @@ 
         if (empty($course_data)) {
             // Course was not found
             $result = "Course $course_code does not exist in the platform ";
-            if ($debug) error_log($result);
+            if ($debug) {
+                error_log($result);
+            }
         } else {
-            if ($debug) error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            if ($debug) {
+                error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            }
             if (!CourseManager::add_user_to_course($user_id, $course_data['code'], $status)) {
                 $result = 'User was not registered possible reasons: User already registered to the course, Course visibility doesnt allow user subscriptions ';
-                if ($debug) error_log($result);
+                if ($debug) {
+                    error_log($result);
+                }
             } else {
-                if ($debug) error_log('User registered to the course: '.$course_data['code']);
+                if ($debug) {
+                    error_log('User registered to the course: '.$course_data['code']);
+                }
                 $result = 1;
             }
         }
@@ -4693,8 +4777,12 @@ 
 function WSGetUser($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUser');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUser');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -4748,8 +4836,12 @@ 
 function WSGetUserFromUsername($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUserFromUsername');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUserFromUsername');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -5216,7 +5308,9 @@ 
                 SessionManager::suscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false);
                 $results[] = 1;
 
-                if ($debug) error_log("subscribe user:$user_id to session $sessionId");
+                if ($debug) {
+                    error_log("subscribe user:$user_id to session $sessionId");
+                }
             }
         }
     } // end principal foreach
@@ -5300,7 +5394,9 @@ 
                 SESSION_VISIBLE_READ_ONLY,
                 false
             );
-            if ($debug) error_log('User registered to the course: '.$session_id);
+            if ($debug) {
+                error_log('User registered to the course: '.$session_id);
+            }
             $result = 1;
         }
     }
@@ -5448,7 +5544,9 @@ 
 
                 $results[] = 1;
 
-                if ($debug) error_log("Unsubscribe user:$user_id to session:$id_session");
+                if ($debug) {
+                    error_log("Unsubscribe user:$user_id to session:$id_session");
+                }
             }
         }
     } // end principal foreach
@@ -5595,7 +5693,9 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    }
 
     $coursessessions_params = $params['coursessessions'];
     $results = array();
@@ -5641,7 +5741,9 @@ 
                     array($courseInfo['real_id']),
                     false
                 );
-                if ($debug) error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                if ($debug) {
+                    error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                }
 
                 $results[] = 1;
             }
@@ -6914,7 +7016,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -6930,7 +7034,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        if ($debug) {
+            error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -6947,13 +7053,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::addUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    }
                 } else {
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    }
                 }
             }
         }
@@ -6986,7 +7098,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -7002,7 +7116,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        if ($debug) {
+            error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -7020,13 +7136,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::removeUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    }
                 } else {
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    }
                 }
             }
         }

main/webservices/webservice.php

Doc Comments +5 added lines, -1 removed lines

@@ -37,6 +37,8 @@ 
 	 *
 	 * @param int Error code
 	 * @param string Error message
+	 * @param integer $code
+	 * @param string $message
 	 */
 	public function __construct($code, $message) {
 		$this->code = $code;
@@ -47,6 +49,7 @@ 
 	 * Sets the error handler
 	 *
 	 * @param WSErrorHandler Error handler
+	 * @param WSSoapErrorHandler $handler
 	 */
 	public static function setErrorHandler($handler) {
 		if($handler instanceof WSErrorHandler) {
@@ -81,6 +84,7 @@ 
 	 * Handle method
 	 *
 	 * @param WSError Error
+	 * @return void
 	 */
 	public function handle($error);
 }
@@ -107,7 +111,7 @@ 
 	 * Verifies the API key
 	 *
 	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
+	 * @return WSError|null WSError in case of failure, null in case of success
 	 */
 	protected function verifyKey($secret_key) {
 		$ip = trim($_SERVER['REMOTE_ADDR']);

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param WSErrorHandler Error handler
 	 */
 	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
+		if ($handler instanceof WSErrorHandler) {
 			self::$_handler = $handler;
 		}
 	}
@@ -114,12 +114,12 @@ 
 		// if we are behind a reverse proxy, assume it will send the
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+			list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
 			$ip = trim($ip1);
 		}
 		$security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
 			return new WSError(1, "API key is invalid");
 		} else {
 			return null;
@@ -136,15 +136,15 @@ 
 	 * @return mixed System user id if the user was found, WSError otherwise
 	 */
 	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
+		if ($user_id_field_name == "chamilo_user_id") {
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
 				return intval($user_id_value);
 			} else {
 				return new WSError(100, "User not found");
 			}
 		} else {
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
+			if ($user_id == 0) {
 				return new WSError(100, "User not found");
 			} else {
 				return $user_id;
@@ -197,7 +197,7 @@ 
 	protected function getSessionId($session_id_field_name, $session_id_value)
 	{
 		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
+			$session = SessionManager::fetch((int) $session_id_value);
 			if (!empty($session)) {
 				return intval($session_id_value);
 			} else {

Indentation +220 added lines, -220 removed lines

@@ -11,237 +11,237 @@
  */
 class WSError
 {
-	/**
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
-	 *
-	 * @var WSErrorHandler
-	 */
-	protected static $_handler;
-
-	/**
-	 * Error code
-	 *
-	 * @var int
-	 */
-	public $code;
-
-	/**
-	 * Error message
-	 *
-	 * @var string
-	 */
-	public $message;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int Error code
-	 * @param string Error message
-	 */
-	public function __construct($code, $message) {
-		$this->code = $code;
-		$this->message = $message;
-	}
-
-	/**
-	 * Sets the error handler
-	 *
-	 * @param WSErrorHandler Error handler
-	 */
-	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
-			self::$_handler = $handler;
-		}
-	}
-
-	/**
-	 * Returns the error handler
-	 *
-	 * @return WSErrorHandler Error handler
-	 */
-	public static function getErrorHandler() {
-		return self::$_handler;
-	}
-
-	/**
-	 * Transforms the error into an array
-	 *
-	 * @return array Associative array with code and message
-	 */
-	public function toArray() {
-		return array('code' => $this->code, 'message' => $this->message);
-	}
+    /**
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
+     *
+     * @var WSErrorHandler
+     */
+    protected static $_handler;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    public $code;
+
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Constructor
+     *
+     * @param int Error code
+     * @param string Error message
+     */
+    public function __construct($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
+
+    /**
+     * Sets the error handler
+     *
+     * @param WSErrorHandler Error handler
+     */
+    public static function setErrorHandler($handler) {
+        if($handler instanceof WSErrorHandler) {
+            self::$_handler = $handler;
+        }
+    }
+
+    /**
+     * Returns the error handler
+     *
+     * @return WSErrorHandler Error handler
+     */
+    public static function getErrorHandler() {
+        return self::$_handler;
+    }
+
+    /**
+     * Transforms the error into an array
+     *
+     * @return array Associative array with code and message
+     */
+    public function toArray() {
+        return array('code' => $this->code, 'message' => $this->message);
+    }
 }
 
 /**
  * Interface that must be implemented by any error handler
  */
 interface WSErrorHandler {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
  * Main class of the webservice. Webservice classes extend this class
  */
 class WS {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
-
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key) {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
-			$ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
-
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the real user id based on the user id field name and value.
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
-	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
-				return intval($user_id_value);
-			} else {
-				return new WSError(100, "User not found");
-			}
-		} else {
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
-				return new WSError(100, "User not found");
-			} else {
-				return $user_id;
-			}
-		}
-	}
-
-	/**
-	 * Gets the real course id based on the course id field name and value.
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value)
-	{
-		if ($course_id_field_name == "chamilo_course_id") {
-			if (CourseManager::get_course_code_from_course_id(
-					intval($course_id_value)
-				) != null
-			) {
-				return intval($course_id_value);
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		} else {
-			$courseId = CourseManager::get_course_code_from_original_id(
-				$course_id_value,
-				$course_id_field_name
-			);
-			if (!empty($courseId)) {
-				return $courseId;
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		}
-	}
-
-	/**
-	 * Gets the real session id based on the session id field name and value.
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if (!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if ($session_id == 0) {
-				return new WSError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
-
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error) {
-		$handler = WSError::getErrorHandler();
-		$handler->handle($error);
-	}
-
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult() {
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
-
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test() {
-		return "success";
-	}
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
+
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key) {
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
+
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets the real user id based on the user id field name and value.
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
+     * in the system database
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @return mixed System user id if the user was found, WSError otherwise
+     */
+    protected function getUserId($user_id_field_name, $user_id_value) {
+        if($user_id_field_name == "chamilo_user_id") {
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
+                return intval($user_id_value);
+            } else {
+                return new WSError(100, "User not found");
+            }
+        } else {
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
+            if($user_id == 0) {
+                return new WSError(100, "User not found");
+            } else {
+                return $user_id;
+            }
+        }
+    }
+
+    /**
+     * Gets the real course id based on the course id field name and value.
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value)
+    {
+        if ($course_id_field_name == "chamilo_course_id") {
+            if (CourseManager::get_course_code_from_course_id(
+                    intval($course_id_value)
+                ) != null
+            ) {
+                return intval($course_id_value);
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        } else {
+            $courseId = CourseManager::get_course_code_from_original_id(
+                $course_id_value,
+                $course_id_field_name
+            );
+            if (!empty($courseId)) {
+                return $courseId;
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        }
+    }
+
+    /**
+     * Gets the real session id based on the session id field name and value.
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if (!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if ($session_id == 0) {
+                return new WSError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
+
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error) {
+        $handler = WSError::getErrorHandler();
+        $handler->handle($error);
+    }
+
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult() {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
+
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test() {
+        return "success";
+    }
 }
 

main/webservices/webservice_session.php

Doc Comments +1 added lines

@@ -453,6 +453,7 @@
 	 * @param string Session id field name
 	 * @param string Session id value
 	 * @param int State (1 to subscribe, 0 to unsubscribe)
+	 * @param integer $state
 	 * @return mixed True on success, WSError otherwise
 	 */
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {

Indentation +361 added lines, -361 removed lines

@@ -14,177 +14,177 @@ 
 class WSSession extends WS
 {
 
-	/**
-	 * Creates a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed Generated id in case of success, WSError otherwise
-	 */
-	protected function createSessionHelper(
-		$name,
-		$start_date,
-		$end_date,
-		$nb_days_access_before,
-		$nb_days_access_after,
-		$nolimit,
-		$visibility,
-		$user_id_field_name,
-		$user_id_value,
-		$session_id_field_name,
-		$session_id_value,
-		$extras
-	) {
-		// Verify that coach exists and get its id
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if ($user_id instanceof WSError) {
-			return $user_id;
-		}
+    /**
+     * Creates a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed Generated id in case of success, WSError otherwise
+     */
+    protected function createSessionHelper(
+        $name,
+        $start_date,
+        $end_date,
+        $nb_days_access_before,
+        $nb_days_access_after,
+        $nolimit,
+        $visibility,
+        $user_id_field_name,
+        $user_id_value,
+        $session_id_field_name,
+        $session_id_value,
+        $extras
+    ) {
+        // Verify that coach exists and get its id
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if ($user_id instanceof WSError) {
+            return $user_id;
+        }
 
-		$coachStartDate = null;
-		if (!empty($nb_days_access_before)) {
-			$day = intval($nb_days_access_before);
-			$coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
-		}
+        $coachStartDate = null;
+        if (!empty($nb_days_access_before)) {
+            $day = intval($nb_days_access_before);
+            $coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+        }
 
-		$coachEndDate = null;
-		if (!empty($nb_days_access_after)) {
-			$day = intval($nb_days_access_after);
-			$coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
-		}
+        $coachEndDate = null;
+        if (!empty($nb_days_access_after)) {
+            $day = intval($nb_days_access_after);
+            $coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+        }
 
-		// Try to create the session
-		$session_id = SessionManager::create_session(
-			$name,
-			$start_date,
-			$end_date,
-			$start_date,
-			$end_date,
-			$coachStartDate,
-			$coachEndDate,
-			$user_id,
-			0,
-			$visibility
-		);
-		if(!is_int($session_id)) {
-			return new WSError(301, 'Could not create the session');
-		} else {
-			// Add the Original session id to the extra fields
-			$extras_associative = array();
-			if($session_id_field_name != "chamilo_session_id") {
-				$extras_associative[$session_id_field_name] = $session_id_value;
-			}
-			foreach($extras as $extra) {
-				$extras_associative[$extra['field_name']] = $extra['field_value'];
-			}
-			// Create the extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				SessionManager::create_session_extra_field($fname, 1, $fname);
-				SessionManager::update_session_extra_field_value(
-					$session_id,
-					$fname,
-					$fvalue
-				);
-			}
-			return $session_id;
-		}
-	}
+        // Try to create the session
+        $session_id = SessionManager::create_session(
+            $name,
+            $start_date,
+            $end_date,
+            $start_date,
+            $end_date,
+            $coachStartDate,
+            $coachEndDate,
+            $user_id,
+            0,
+            $visibility
+        );
+        if(!is_int($session_id)) {
+            return new WSError(301, 'Could not create the session');
+        } else {
+            // Add the Original session id to the extra fields
+            $extras_associative = array();
+            if($session_id_field_name != "chamilo_session_id") {
+                $extras_associative[$session_id_field_name] = $session_id_value;
+            }
+            foreach($extras as $extra) {
+                $extras_associative[$extra['field_name']] = $extra['field_value'];
+            }
+            // Create the extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                SessionManager::create_session_extra_field($fname, 1, $fname);
+                SessionManager::update_session_extra_field_value(
+                    $session_id,
+                    $fname,
+                    $fvalue
+                );
+            }
+            return $session_id;
+        }
+    }
 
-	/**
-	 * Creates a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return int Session id generated
-	 */
-	public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id instanceof WSError) {
-				$this->handleError($session_id);
-			} else {
-				return $session_id;
-			}
-		}
-	}
+    /**
+     * Creates a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return int Session id generated
+     */
+    public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id instanceof WSError) {
+                $this->handleError($session_id);
+            } else {
+                return $session_id;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a session (helper method)
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			SessionManager::delete($session_id, true);
-			return true;
-		}
-	}
+    /**
+     * Deletes a session (helper method)
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            SessionManager::delete($session_id, true);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a session
-	 *
-	 * @param string API secret key
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a session
+     *
+     * @param string API secret key
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed True on success, WSError otherwise
-	 */
+    /**
+     * Edits a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed True on success, WSError otherwise
+     */
     protected function editSessionHelper(
         $name,
         $start_date,
@@ -199,15 +199,15 @@ 
         $session_id_value,
         $extras
     ) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			// Verify that coach exists and get its id
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if ($user_id instanceof WSError) {
-				return $user_id;
-			}
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            // Verify that coach exists and get its id
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if ($user_id instanceof WSError) {
+                return $user_id;
+            }
 
             $coachStartDate = null;
             if (!empty($nb_days_access_before)) {
@@ -234,127 +234,127 @@ 
                 0,
                 (int)$visibility
             );
-			if(!is_int($result_id)) {
-				return new WSError(302, 'Could not edit the session');
-			} else {
-				if(!empty($extras)) {
-					$extras_associative = array();
-					foreach($extras as $extra) {
-						$extras_associative[$extra['field_name']] = $extra['field_value'];
-					}
-					// Create the extra fields
-					foreach($extras_associative as $fname => $fvalue) {
-						SessionManager::create_session_extra_field($fname, 1, $fname);
-						SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
-					}
-				}
-				return true;
-			}
-		}
-	}
+            if(!is_int($result_id)) {
+                return new WSError(302, 'Could not edit the session');
+            } else {
+                if(!empty($extras)) {
+                    $extras_associative = array();
+                    foreach($extras as $extra) {
+                        $extras_associative[$extra['field_name']] = $extra['field_value'];
+                    }
+                    // Create the extra fields
+                    foreach($extras_associative as $fname => $fvalue) {
+                        SessionManager::create_session_extra_field($fname, 1, $fname);
+                        SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Edits a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 */
-	public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id_value instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     */
+    public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id_value instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Change user subscription (helper method)
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::suscribe_users_to_session($session_id, array($user_id));
-				} else {
-					$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
-					if (!$result) {
-						return new WSError(303, 'There was an error unsubscribing this user from the session');
-					}
-				}
-				return true;
-			}
-		}
-	}
+    /**
+     * Change user subscription (helper method)
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::suscribe_users_to_session($session_id, array($user_id));
+                } else {
+                    $result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
+                    if (!$result) {
+                        return new WSError(303, 'There was an error unsubscribing this user from the session');
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
     
     /**
      * Change Teacher subscription (helper method)
@@ -446,79 +446,79 @@ 
     }
 
     /**
-	 * Change course subscription
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::add_courses_to_session($session_id, array($course_id));
-					return true;
-				} else {
-					$result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
-					if ($result) {
-						return true;
-					} else {
-						return new WSError(304, 'Error unsubscribing course from session');
-					}
-				}
-			}
-		}
+     * Change course subscription
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::add_courses_to_session($session_id, array($course_id));
+                    return true;
+                } else {
+                    $result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
+                    if ($result) {
+                        return true;
+                    } else {
+                        return new WSError(304, 'Error unsubscribing course from session');
+                    }
+                }
+            }
+        }
     }
 
-	/**
-	 * Subscribe course to session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe course to session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsubscribe course from session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsubscribe course from session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -54,13 +54,13 @@ 
 		$coachStartDate = null;
 		if (!empty($nb_days_access_before)) {
 			$day = intval($nb_days_access_before);
-			$coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+			$coachStartDate = date('Y-m-d ', strtotime($start_date.' + '.$day.' days'));
 		}
 
 		$coachEndDate = null;
 		if (!empty($nb_days_access_after)) {
 			$day = intval($nb_days_access_after);
-			$coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+			$coachEndDate = date('Y-m-d ', strtotime($end_date.' + '.$day.' days'));
 		}
 
 		// Try to create the session
@@ -76,19 +76,19 @@ 
 			0,
 			$visibility
 		);
-		if(!is_int($session_id)) {
+		if (!is_int($session_id)) {
 			return new WSError(301, 'Could not create the session');
 		} else {
 			// Add the Original session id to the extra fields
 			$extras_associative = array();
-			if($session_id_field_name != "chamilo_session_id") {
+			if ($session_id_field_name != "chamilo_session_id") {
 				$extras_associative[$session_id_field_name] = $session_id_value;
 			}
-			foreach($extras as $extra) {
+			foreach ($extras as $extra) {
 				$extras_associative[$extra['field_name']] = $extra['field_value'];
 			}
 			// Create the extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				SessionManager::create_session_extra_field($fname, 1, $fname);
 				SessionManager::update_session_extra_field_value(
 					$session_id,
@@ -120,11 +120,11 @@ 
 	 */
 	public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id instanceof WSError) {
+			if ($session_id instanceof WSError) {
 				$this->handleError($session_id);
 			} else {
 				return $session_id;
@@ -141,7 +141,7 @@ 
 	 */
 	protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			SessionManager::delete($session_id, true);
@@ -158,11 +158,11 @@ 
 	 */
 	public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -200,7 +200,7 @@ 
         $extras
     ) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			// Verify that coach exists and get its id
@@ -212,13 +212,13 @@ 
             $coachStartDate = null;
             if (!empty($nb_days_access_before)) {
                 $day = intval($nb_days_access_before);
-                $coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+                $coachStartDate = date('Y-m-d ', strtotime($start_date.' + '.$day.' days'));
             }
 
             $coachEndDate = null;
             if (!empty($nb_days_access_after)) {
                 $day = intval($nb_days_access_after);
-                $coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+                $coachEndDate = date('Y-m-d ', strtotime($end_date.' + '.$day.' days'));
             }
 
             $result_id = SessionManager::edit_session(
@@ -232,18 +232,18 @@ 
                 $coachEndDate,
                 $user_id,
                 0,
-                (int)$visibility
+                (int) $visibility
             );
-			if(!is_int($result_id)) {
+			if (!is_int($result_id)) {
 				return new WSError(302, 'Could not edit the session');
 			} else {
-				if(!empty($extras)) {
+				if (!empty($extras)) {
 					$extras_associative = array();
-					foreach($extras as $extra) {
+					foreach ($extras as $extra) {
 						$extras_associative[$extra['field_name']] = $extra['field_value'];
 					}
 					// Create the extra fields
-					foreach($extras_associative as $fname => $fvalue) {
+					foreach ($extras_associative as $fname => $fvalue) {
 						SessionManager::create_session_extra_field($fname, 1, $fname);
 						SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
 					}
@@ -272,11 +272,11 @@ 
 	 */
 	public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id_value instanceof WSError) {
+			if ($session_id_value instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -294,14 +294,14 @@ 
 	 */
 	protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
+			if ($user_id instanceof WSError) {
 				return $user_id;
 			} else {
-				if($state  == 1) {
+				if ($state == 1) {
 					SessionManager::suscribe_users_to_session($session_id, array($user_id));
 				} else {
 					$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
@@ -325,11 +325,11 @@ 
 	 */
 	public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -346,11 +346,11 @@ 
 	 */
 	public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -385,7 +385,7 @@ 
                     if ($state == 1) {
                         SessionManager::set_coach_to_course_session($user_id, $session_id, $course_id);
                     } else {
-                        $user_id = array (0 => $user_id);
+                        $user_id = array(0 => $user_id);
                         $result = SessionManager::removeUsersFromCourseSession($user_id, $session_id, $course_id);
                         if (!$result) {
                             return new WSError(303, 'There was an error unsubscribing this Teacher from the session');
@@ -457,14 +457,14 @@ 
 	 */
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
-				if($state  == 1) {
+				if ($state == 1) {
 					SessionManager::add_courses_to_session($session_id, array($course_id));
 					return true;
 				} else {
@@ -490,11 +490,11 @@ 
 	 */
 	public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -511,11 +511,11 @@ 
 	 */
 	public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}

main/webservices/webservice_user.php

Doc Comments +6 added lines

@@ -36,6 +36,7 @@ 
 	 *
 	 * @param array Users
 	 * @param int Set to 1 to enable and to 0 to disable
+	 * @param integer $state
 	 * @return array Array of results
 	 */
 	protected function changeUsersActiveState($users, $state) {
@@ -217,6 +218,11 @@ 
 	 * @param string Phone.
 	 * @param string Expiration date
 	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
+	 * @param integer|null $visibility
+	 * @param string|null $email
+	 * @param string|null $language
+	 * @param string|null $phone
+	 * @param string|null $expiration_date
 	 * @return mixed New user id generated by the system, WSError otherwise
 	 */
 	protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {

Indentation +416 added lines, -416 removed lines

@@ -11,232 +11,232 @@ 
  */
 class WSUser extends WS {
 
-	/**
-	 * Enables or disables a user
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param int Set to 1 to enable and to 0 to disable
-	 */
-	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($state == 0) {
-				UserManager::disable($user_id);
-			} else if($state == 1) {
-				UserManager::enable($user_id);
-			}
-		}
-	}
+    /**
+     * Enables or disables a user
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param int Set to 1 to enable and to 0 to disable
+     */
+    protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($state == 0) {
+                UserManager::disable($user_id);
+            } else if($state == 1) {
+                UserManager::enable($user_id);
+            }
+        }
+    }
 
-	/**
-	 * Enables or disables multiple users
-	 *
-	 * @param array Users
-	 * @param int Set to 1 to enable and to 0 to disable
-	 * @return array Array of results
-	 */
-	protected function changeUsersActiveState($users, $state) {
-		$results = array();
-		foreach($users as $user) {
-			$result_tmp = array();
-			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
-			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
-				// Return the error in the results
-				$result_tmp['result'] = $result_op->toArray();
-			} else {
-				$result_tmp['result'] = $this->getSuccessfulResult();
-			}
-			$results[] = $result_tmp;
-		}
-		return $results;
-	}
+    /**
+     * Enables or disables multiple users
+     *
+     * @param array Users
+     * @param int Set to 1 to enable and to 0 to disable
+     * @return array Array of results
+     */
+    protected function changeUsersActiveState($users, $state) {
+        $results = array();
+        foreach($users as $user) {
+            $result_tmp = array();
+            $result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
+            $result_tmp['user_id_value'] = $user['user_id_value'];
+            if($result_op instanceof WSError) {
+                // Return the error in the results
+                $result_tmp['result'] = $result_op->toArray();
+            } else {
+                $result_tmp['result'] = $this->getSuccessfulResult();
+            }
+            $results[] = $result_tmp;
+        }
+        return $results;
+    }
 
-	/**
-	 * Disables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Disables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Disables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DisableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 0);
-		}
-	}
+    /**
+     * Disables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DisableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 0);
+        }
+    }
 
-	/**
-	 * Enables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Enables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Enables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EnableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 1);
-		}
-	}
+    /**
+     * Enables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EnableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 1);
+        }
+    }
 
-	/**
-	 * Deletes a user (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 * @return mixed True if user was successfully deleted, WSError otherwise
-	 */
-	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if(!UserManager::delete_user($user_id)) {
-				return new WSError(101, "There was a problem while deleting this user");
-			} else {
-				return true;
-			}
-		}
-	}
+    /**
+     * Deletes a user (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     * @return mixed True if user was successfully deleted, WSError otherwise
+     */
+    protected function deleteUserHelper($user_id_field_name, $user_id_value) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if(!UserManager::delete_user($user_id)) {
+                return new WSError(101, "There was a problem while deleting this user");
+            } else {
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
-				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
+                $result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a user (helper method)
-	 *
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility.
-	 * @param string User email.
-	 * @param string Language.
-	 * @param string Phone.
-	 * @param string Expiration date
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
-	 * @return mixed New user id generated by the system, WSError otherwise
-	 */
-	protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
+    /**
+     * Creates a user (helper method)
+     *
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility.
+     * @param string User email.
+     * @param string Language.
+     * @param string Phone.
+     * @param string Expiration date
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
+     * @return mixed New user id generated by the system, WSError otherwise
+     */
+    protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
 
-		// Add the original user id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
-			$extras_associative[$user_id_field_name] = $user_id_value;
-		}
+        // Add the original user id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($user_id_field_name != "chamilo_user_id") {
+            $extras_associative[$user_id_field_name] = $user_id_value;
+        }
                 if (!empty($extras)) {
                     foreach($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
-		$result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
-		if (!$result) {
+        $result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
+        if (!$result) {
 
-		    return new WSError(104, 'There was an error creating the user');
+            return new WSError(104, 'There was an error creating the user');
 
-			/*$failure = $api_failureList[0];
+            /*$failure = $api_failureList[0];
 			if($failure == 'login-pass already taken') {
 				return new WSError(102, 'This username is already taken');
 			} else if($failure == 'encrypt_method invalid') {
@@ -244,227 +244,227 @@ 
 			} else {
 				return new WSError(104, 'There was an error creating the user');
 			}*/
-		} else {
-			return $result;
-		}
-	}
+        } else {
+            return $result;
+        }
+    }
 
-	/**
-	 * Creates a user
-	 *
-	 * @param string API secret key
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility. Set by default to 1
-	 * @param string User email. Set by default to an empty string
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
-	 * @return int New user id generated by the system
-	 */
-	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a user
+     *
+     * @param string API secret key
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility. Set by default to 1
+     * @param string User email. Set by default to an empty string
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
+     * @return int New user id generated by the system
+     */
+    public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Creates multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
-	 * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Creates multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
+     * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits user info (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 * @return mixed True if user was successfully updated, WSError otherwise
-	 */
-	protected function editUserHelper(
-		$user_id_field_name,
-		$user_id_value,
-		$firstname,
-		$lastname,
-		$status,
-		$loginname,
-		$password,
-		$encrypt_method,
-		$email,
-		$language,
-		$phone,
-		$expiration_date,
-		$extras
-	) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($password == '') {
-				$password = null;
-			}
-			$user_info = api_get_user_info($user_id);
-			if (count($extras) == 0) {
-				$extras = null;
-			}
+    /**
+     * Edits user info (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     * @return mixed True if user was successfully updated, WSError otherwise
+     */
+    protected function editUserHelper(
+        $user_id_field_name,
+        $user_id_value,
+        $firstname,
+        $lastname,
+        $status,
+        $loginname,
+        $password,
+        $encrypt_method,
+        $email,
+        $language,
+        $phone,
+        $expiration_date,
+        $extras
+    ) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($password == '') {
+                $password = null;
+            }
+            $user_info = api_get_user_info($user_id);
+            if (count($extras) == 0) {
+                $extras = null;
+            }
 
-			$result = UserManager::update_user(
-				$user_id,
-				$firstname,
-				$lastname,
-				$loginname,
-				$password,
-				PLATFORM_AUTH_SOURCE,
-				$email,
-				$status,
-				'',
-				$phone,
-				$user_info['picture_uri'],
-				$expiration_date,
-				$user_info['active'],
-				null,
-				$user_info['hr_dept_id'],
-				$extras,
-				$encrypt_method
-			);
-			if (!$result) {
-				/*if($failure == 'encrypt_method invalid') {
+            $result = UserManager::update_user(
+                $user_id,
+                $firstname,
+                $lastname,
+                $loginname,
+                $password,
+                PLATFORM_AUTH_SOURCE,
+                $email,
+                $status,
+                '',
+                $phone,
+                $user_info['picture_uri'],
+                $expiration_date,
+                $user_info['active'],
+                null,
+                $user_info['hr_dept_id'],
+                $extras,
+                $encrypt_method
+            );
+            if (!$result) {
+                /*if($failure == 'encrypt_method invalid') {
 					return new WSError(103, 'The encryption of the password is invalid');
 				} else {
 					return new WSError(105, 'There was an error updating the user');
 				}*/
-				return new WSError(105, 'There was an error updating the user');
-			} else {
-				return $result;
-			}
-		}
-	}
+                return new WSError(105, 'There was an error updating the user');
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Edits user info
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 */
-	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * Edits user info
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     */
+    public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
 
-			$extras_associative = array();
-			if (!empty($extras)) {
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-			}
+            $extras_associative = array();
+            if (!empty($extras)) {
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+            }
 
-			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+            $result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EditUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Edits multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EditUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 }

Spacing +33 added lines, -33 removed lines

@@ -20,12 +20,12 @@ 
 	 */
 	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($state == 0) {
+			if ($state == 0) {
 				UserManager::disable($user_id);
-			} else if($state == 1) {
+			} else if ($state == 1) {
 				UserManager::enable($user_id);
 			}
 		}
@@ -40,11 +40,11 @@ 
 	 */
 	protected function changeUsersActiveState($users, $state) {
 		$results = array();
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$result_tmp = array();
 			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
 			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
+			if ($result_op instanceof WSError) {
 				// Return the error in the results
 				$result_tmp['result'] = $result_op->toArray();
 			} else {
@@ -64,12 +64,12 @@ 
 	 */
 	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -85,7 +85,7 @@ 
 	 */
 	public function DisableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -102,11 +102,11 @@ 
 	 */
 	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -122,7 +122,7 @@ 
 	 */
 	public function EnableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -139,10 +139,10 @@ 
 	 */
 	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if(!UserManager::delete_user($user_id)) {
+			if (!UserManager::delete_user($user_id)) {
 				return new WSError(101, "There was a problem while deleting this user");
 			} else {
 				return true;
@@ -159,11 +159,11 @@ 
 	 */
 	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 */
 	public function DeleteUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
 				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -223,11 +223,11 @@ 
 
 		// Add the original user id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
+		if ($user_id_field_name != "chamilo_user_id") {
 			$extras_associative[$user_id_field_name] = $user_id_value;
 		}
                 if (!empty($extras)) {
-                    foreach($extras as $extra) {
+                    foreach ($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
@@ -273,11 +273,11 @@ 
 	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -294,17 +294,17 @@ 
 	 */
 	public function CreateUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['user_id_value'] = $user_id_value;
 					$result_tmp['user_id_generated'] = 0;
@@ -353,10 +353,10 @@ 
 		$extras
 	) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($password == '') {
+			if ($password == '') {
 				$password = null;
 			}
 			$user_info = api_get_user_info($user_id);
@@ -417,19 +417,19 @@ 
 	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 
 			$extras_associative = array();
 			if (!empty($extras)) {
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
 			}
 
 			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -445,18 +445,18 @@ 
 	 */
 	public function EditUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {

main/work/downloadfolder.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
  * @param array $arr1 first array
  * @param array $arr2 second array
  *
- * @return array difference between the two arrays
+ * @return string difference between the two arrays
  */
 function diff($arr1, $arr2)
 {

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 
 $work_id = $_GET['id'];
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 $_course = api_get_course_info();
 
 // Protection
@@ -178,10 +178,10 @@ 
 if (!empty($files)) {
     $fileName = api_replace_dangerous_char($work_data['title']);
     // Logging
-    Event::event_download($fileName .'.zip (folder)');
+    Event::event_download($fileName.'.zip (folder)');
 
     //start download of created file
-    $name = $fileName .'.zip';
+    $name = $fileName.'.zip';
     if (Security::check_abs_path($temp_zip_file, api_get_path(SYS_ARCHIVE_PATH))) {
         DocumentManager::file_send_for_download($temp_zip_file, true, $name);
         @unlink($temp_zip_file);

plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php

Doc Comments +7 added lines, -7 removed lines

@@ -370,7 +370,7 @@ 
      * Register a user into a queue for a session
      * @param $userId
      * @param $sessionId
-     * @return bool|int
+     * @return false|string
      */
     public function addToQueue($userId, $sessionId)
     {
@@ -396,7 +396,7 @@ 
      * Register message with type and status
      * @param $mailId
      * @param $userId
-     * @param $sessionId
+     * @param integer $sessionId
      * @return bool|int
      */
     public function saveLastMessage($mailId, $userId, $sessionId)
@@ -509,7 +509,7 @@ 
 
     /**
      * Check if session is open for subscription
-     * @param $sessionId
+     * @param integer $sessionId
      * @param string $fieldVariable
      * @return bool
      */
@@ -531,8 +531,8 @@ 
 
     /**
      * Check if user is in the session's target group based on its area
-     * @param $userId
-     * @param $sessionId
+     * @param integer $userId
+     * @param integer $sessionId
      * @param string $userFieldVariable
      * @param string $sessionFieldVariable
      * @return bool
@@ -1002,7 +1002,7 @@ 
     /**
      * Return the session details data from a session ID (including the extra
      * fields used for the advanced subscription mechanism)
-     * @param $sessionId
+     * @param integer $sessionId
      * @return bool|mixed
      */
     public function getSessionDetails($sessionId)
@@ -1102,7 +1102,7 @@ 
 
     /**
      * Return the url to go to session
-     * @param $sessionId
+     * @param integer $sessionId
      *
      * @return string
      */

Indentation +1 added lines, -1 removed lines

@@ -1069,7 +1069,7 @@
      */
     public function getStatusMessage($status, $isAble = true)
     {
-	$message = '';
+    $message = '';
         switch ($status) {
             case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_NO_QUEUE:
                 if ($isAble) {

Spacing +41 added lines, -42 removed lines

@@ -106,15 +106,15 @@ 
     {
         $advancedSubscriptionQueueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
 
-        $sql = "CREATE TABLE IF NOT EXISTS $advancedSubscriptionQueueTable (" .
-            "id int UNSIGNED NOT NULL AUTO_INCREMENT, " .
-            "session_id int UNSIGNED NOT NULL, " .
-            "user_id int UNSIGNED NOT NULL, " .
-            "status int UNSIGNED NOT NULL, " .
-            "last_message_id int UNSIGNED NOT NULL, " .
-            "created_at datetime NOT NULL, " .
-            "updated_at datetime NULL, " .
-            "PRIMARY KEY PK_advanced_subscription_queue (id), " .
+        $sql = "CREATE TABLE IF NOT EXISTS $advancedSubscriptionQueueTable (".
+            "id int UNSIGNED NOT NULL AUTO_INCREMENT, ".
+            "session_id int UNSIGNED NOT NULL, ".
+            "user_id int UNSIGNED NOT NULL, ".
+            "status int UNSIGNED NOT NULL, ".
+            "last_message_id int UNSIGNED NOT NULL, ".
+            "created_at datetime NOT NULL, ".
+            "updated_at datetime NULL, ".
+            "PRIMARY KEY PK_advanced_subscription_queue (id), ".
             "UNIQUE KEY UK_advanced_subscription_queue (user_id, session_id)); ";
         Database::query($sql);
     }
@@ -265,11 +265,10 @@ 
         $now = new DateTime(api_get_utc_datetime());
         $newYearDate = $plugin->get('course_session_credit_year_start_date');
         $newYearDate = !empty($newYearDate) ?
-            new \DateTime($newYearDate . $now->format('/Y')) :
-            $now;
+            new \DateTime($newYearDate.$now->format('/Y')) : $now;
         $extra = new ExtraFieldValue('session');
-        $joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su INNER JOIN ' .
-            Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.session_id';
+        $joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER).' su INNER JOIN '.
+            Database::get_main_table(TABLE_MAIN_SESSION).' s ON s.id = su.session_id';
         $whereSessionParams = 'su.relation_type = ? AND s.access_start_date >= ? AND su.user_id = ?';
         $whereSessionParamsValues = array(
             0,
@@ -734,14 +733,14 @@ 
                     $tpl->assign('termsContent', $termsAndConditions);
                     $termsAndConditions = $tpl->fetch('/advanced_subscription/views/terms_and_conditions_to_pdf.tpl');
                     $pdf = new PDF();
-                    $filename = 'terms' . sha1(rand(0,99999));
+                    $filename = 'terms'.sha1(rand(0, 99999));
                     $pdf->content_to_pdf($termsAndConditions, null, $filename, null, 'F');
                     $fileAttachments['file'][] = array(
-                        'name' => $filename . '.pdf',
-                        'application/pdf' => $filename . '.pdf',
-                        'tmp_name' => api_get_path(SYS_ARCHIVE_PATH) . $filename . '.pdf',
+                        'name' => $filename.'.pdf',
+                        'application/pdf' => $filename.'.pdf',
+                        'tmp_name' => api_get_path(SYS_ARCHIVE_PATH).$filename.'.pdf',
                         'error' => UPLOAD_ERR_OK,
-                        'size' => filesize(api_get_path(SYS_ARCHIVE_PATH) . $filename . '.pdf'),
+                        'size' => filesize(api_get_path(SYS_ARCHIVE_PATH).$filename.'.pdf'),
                     );
                     $fileAttachments['comments'][] = get_lang('TermsAndConditions');
                 }
@@ -1032,7 +1031,7 @@ 
 
             $mergedArray = array_merge(array($sessionId), array_keys($fields));
 
-            $sql = "SELECT * FROM " . Database::get_main_table(TABLE_EXTRA_FIELD_VALUES) ."
+            $sql = "SELECT * FROM ".Database::get_main_table(TABLE_EXTRA_FIELD_VALUES)."
                     WHERE item_id = %d AND field_id IN (%d, %d, %d, %d, %d, %d, %d)";
             $sql = vsprintf($sql, $mergedArray);
             $sessionFieldValueList = Database::query($sql);
@@ -1048,10 +1047,10 @@ 
             $sessionArray['description'] = SessionManager::getDescriptionFromSessionId($sessionId);
 
             if (isset($sessionArray['brochure'])) {
-                $sessionArray['brochure'] = api_get_path(WEB_UPLOAD_PATH) . $sessionArray['brochure'];
+                $sessionArray['brochure'] = api_get_path(WEB_UPLOAD_PATH).$sessionArray['brochure'];
             }
             if (isset($sessionArray['banner'])) {
-                $sessionArray['banner'] = api_get_path(WEB_UPLOAD_PATH) . $sessionArray['banner'];
+                $sessionArray['banner'] = api_get_path(WEB_UPLOAD_PATH).$sessionArray['banner'];
             }
 
             return $sessionArray;
@@ -1108,7 +1107,7 @@ 
      */
     public function getSessionUrl($sessionId)
     {
-        $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . intval($sessionId);
+        $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.intval($sessionId);
 
         return $url;
     }
@@ -1157,16 +1156,16 @@ 
      */
     public function getQueueUrl($params)
     {
-        $url = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/ajax/advanced_subscription.ajax.php?' .
-            'a=' . Security::remove_XSS($params['action']) . '&' .
-            's=' . intval($params['sessionId']) . '&' .
-            'current_user_id=' . intval($params['currentUserId']) . '&' .
-            'e=' . intval($params['newStatus']) . '&' .
-            'u=' . intval($params['studentUserId']) . '&' .
-            'q=' . intval($params['queueId']) . '&' .
-            'is_connected=' . 1 . '&' .
-            'profile_completed=' . intval($params['profile_completed']) . '&' .
-            'v=' . $this->generateHash($params);
+        $url = api_get_path(WEB_PLUGIN_PATH).'advanced_subscription/ajax/advanced_subscription.ajax.php?'.
+            'a='.Security::remove_XSS($params['action']).'&'.
+            's='.intval($params['sessionId']).'&'.
+            'current_user_id='.intval($params['currentUserId']).'&'.
+            'e='.intval($params['newStatus']).'&'.
+            'u='.intval($params['studentUserId']).'&'.
+            'q='.intval($params['queueId']).'&'.
+            'is_connected='.1.'&'.
+            'profile_completed='.intval($params['profile_completed']).'&'.
+            'v='.$this->generateHash($params);
 
         return $url;
     }
@@ -1219,7 +1218,7 @@ 
         }
         $queueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
         $userTable = Database::get_main_table(TABLE_MAIN_USER);
-        $userJoinTable = $queueTable . ' q INNER JOIN ' . $userTable . ' u ON q.user_id = u.user_id';
+        $userJoinTable = $queueTable.' q INNER JOIN '.$userTable.' u ON q.user_id = u.user_id';
         $where = array(
             'where' => array(
                 'q.session_id = ?' => array(
@@ -1232,7 +1231,7 @@ 
         $students = Database::select($select, $userJoinTable, $where);
         foreach ($students as &$student) {
             $status = intval($student['status']);
-            switch($status) {
+            switch ($status) {
                 case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_NO_QUEUE:
                 case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_START:
                     $student['validation'] = '';
@@ -1246,7 +1245,7 @@ 
                     $student['validation'] = 'Yes';
                     break;
                 default:
-                    error_log(__FILE__ . ' ' . __FUNCTION__ . ' Student status no detected');
+                    error_log(__FILE__.' '.__FUNCTION__.' Student status no detected');
             }
         }
         $return = array(
@@ -1295,7 +1294,7 @@ 
         $dataPrepared['queueId'] = intval($data['queueId']);
         $dataPrepared['newStatus'] = intval($data['newStatus']);
         $dataPrepared = serialize($dataPrepared);
-        return sha1($dataPrepared . $key);
+        return sha1($dataPrepared.$key);
     }
 
     /**
@@ -1350,12 +1349,12 @@ 
                 break;
         }
 
-        $url = api_get_path(WEB_PLUGIN_PATH) . "advanced_subscription/src/terms_and_conditions.php?";
+        $url = api_get_path(WEB_PLUGIN_PATH)."advanced_subscription/src/terms_and_conditions.php?";
         $url .= http_build_query($urlParams);
 
         // Launch popup
         if ($mode == ADVANCED_SUBSCRIPTION_TERMS_MODE_POPUP) {
-            $url = 'javascript:void(window.open(\'' . $url .'\',\'AdvancedSubscriptionTerms\', \'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=700px,height=600px\', \'100\' ))';
+            $url = 'javascript:void(window.open(\''.$url.'\',\'AdvancedSubscriptionTerms\', \'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=700px,height=600px\', \'100\' ))';
         }
         return $url;
     }
@@ -1367,9 +1366,9 @@ 
      */
     public function getRenderMailUrl($params)
     {
-        $url = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/src/render_mail.php?' .
-            'q=' . $params['queueId'] . '&' .
-            'v=' . $this->generateHash($params);
+        $url = api_get_path(WEB_PLUGIN_PATH).'advanced_subscription/src/render_mail.php?'.
+            'q='.$params['queueId'].'&'.
+            'v='.$this->generateHash($params);
         return $url;
     }
 
@@ -1440,7 +1439,7 @@ 
                 sf.extra_field_type = $extraFieldType AND
                 sf.variable = 'is_induction_session' AND
                 su.relation_type = 0 AND
-                su.user_id = " . intval($userId);
+                su.user_id = ".intval($userId);
 
         $result = Database::query($sql);
 

plugin/bbb/lib/bbb.lib.php

Doc Comments +2 added lines, -2 removed lines

@@ -240,7 +240,7 @@ 
     /**
      * Returns a meeting "join" URL
      * @param string The name of the meeting (usually the course code)
-     * @return mixed The URL to join the meeting, or false on error
+     * @return false|string The URL to join the meeting, or false on error
      * @todo implement moderator pass
      * @assert ('') === false
      * @assert ('abcdefghijklmnopqrstuvwxyzabcdefghijklmno') === false
@@ -647,7 +647,7 @@ 
      * Closes a meeting (usually when the user click on the close button from
      * the conferences listing.
      * @param string The internal ID of the meeting (id field for this meeting)
-     * @return void
+     * @return false|null
      * @assert (0) === false
      */
     public function endMeeting($id)

Spacing +36 added lines, -36 removed lines

@@ -210,7 +210,7 @@ 
 
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
-        $max =  isset($max) ? $max : -1;
+        $max = isset($max) ? $max : -1;
 
         $params['status'] = 1;
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
@@ -243,23 +243,23 @@ 
             $duration = 300;
 
             $bbbParams = array(
-                'meetingId' => $params['remote_id'], 					// REQUIRED
-                'meetingName' => $meetingName, 	// REQUIRED
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
-                'dialNumber' => '', 					// The main number to call into. Optional.
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
+                'meetingId' => $params['remote_id'], // REQUIRED
+                'meetingName' => $meetingName, // REQUIRED
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
+                'dialNumber' => '', // The main number to call into. Optional.
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
                 'logoutUrl' =>  $this->logoutUrl,
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
             );
 
             if ($this->debug) {
-                error_log("create_meeting params: ".print_r($bbbParams,1));
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
             }
 
             $status = false;
@@ -272,7 +272,7 @@ 
                 if (isset($result) && strval($result['returncode']) == 'SUCCESS') {
                     if ($this->debug) {
                         error_log(
-                            "create_meeting result: " . print_r($result, 1)
+                            "create_meeting result: ".print_r($result, 1)
                         );
                     }
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -303,7 +303,7 @@ 
 
         $courseId = api_get_course_int_id();
         $sessionId = api_get_session_id();
-        $conditions =  array(
+        $conditions = array(
             'where' => array(
                 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 AND access_url = ?' =>
                     array($courseId, $sessionId, $meetingName, $this->accessUrl)
@@ -312,7 +312,7 @@ 
 
         if ($this->hasGroupSupport()) {
             $groupId = api_get_group_id();
-            $conditions =  array(
+            $conditions = array(
                 'where' => array(
                     'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 AND access_url = ?' =>
                         array($courseId, $sessionId, $meetingName, $groupId, $this->accessUrl)
@@ -409,7 +409,7 @@ 
 
             if ($this->debug) {
                 error_log(
-                    "meeting is running: " . intval($meetingInfoExists)
+                    "meeting is running: ".intval($meetingInfoExists)
                 );
             }
 
@@ -426,11 +426,11 @@ 
 
         if ($meetingInfoExists) {
             $joinParams = array(
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
-                'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
+                'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
             );
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -439,7 +439,7 @@ 
             $url = $this->logoutUrl;
         }
         if ($this->debug) {
-            error_log("return url :" . $url);
+            error_log("return url :".$url);
         }
 
         return $url;
@@ -480,7 +480,7 @@ 
      */
     public function getAllMeetingsInCourse($courseId, $sessionId, $status)
     {
-        $conditions =  array(
+        $conditions = array(
             'where' => array(
                 'status = ? AND c_id = ? AND session_id = ? ' => array(
                     $status,
@@ -512,7 +512,7 @@ 
         $courseId = api_get_course_int_id();
         $sessionId = api_get_session_id();
 
-        $conditions =  array(
+        $conditions = array(
             'where' => array(
                 'c_id = ? AND session_id = ? AND access_url = ?' => array(
                     $courseId,
@@ -524,7 +524,7 @@ 
 
         if ($this->hasGroupSupport()) {
             $groupId = api_get_group_id();
-            $conditions =  array(
+            $conditions = array(
                 'where' => array(
                     'c_id = ? AND session_id = ? AND group_id = ? AND access_url = ?' =>
                         array($courseId, $sessionId, $groupId, $this->accessUrl)
@@ -533,7 +533,7 @@ 
         }
 
         if ($isGlobalPerUser) {
-            $conditions =  array(
+            $conditions = array(
                 'where' => array(
                     'user_id = ? AND access_url = ?' =>
                         array($this->userId, $this->accessUrl)
@@ -568,7 +568,7 @@ 
             }
             $meetingBBB['end_url'] = $this->endUrl($meetingDB);
 
-            if (isset($meetingBBB['returncode']) && (string)$meetingBBB['returncode'] == 'FAILED') {
+            if (isset($meetingBBB['returncode']) && (string) $meetingBBB['returncode'] == 'FAILED') {
                 if ($meetingDB['status'] == 1 && $this->isConferenceManager()) {
                     $this->endMeeting($meetingDB['id']);
                 }
@@ -737,7 +737,7 @@ 
                     $actionLinksArray[] = $actionLinks;
                     $item['action_links'] = implode('<br />', $actionLinksArray);
                 }
-                $item['show_links']  = implode('<br />', $recordArray);
+                $item['show_links'] = implode('<br />', $recordArray);
                 $item['action_links'] = implode('<br />', $actionLinksArray);
             }
 
@@ -750,11 +750,11 @@ 
 
             if ($meetingDB['status'] == 1) {
                 $joinParams = array(
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
-                    'userID' => '',			//	-- OPTIONAL - string
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
+                    'userID' => '', //	-- OPTIONAL - string
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
                 );
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -815,8 +815,8 @@ 
         $pass = $this->getUserMeetingPassword();
 
         $endParams = array(
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
         );
         $this->api->endMeetingWithXmlResponseArray($endParams);
         Database::update(
@@ -1067,7 +1067,7 @@ 
      */
     public function redirectToBBB($url)
     {
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
+        if (file_exists(__DIR__.'/../config.vm.php')) {
             // Using VM
             echo Display::url(get_lang('ClickToContinue'), $url);
             exit;

plugin/bbb/lib/bbb_api.php

Doc Comments +3 added lines

@@ -59,6 +59,9 @@
 		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
 	}
 
+	/**
+	 * @param string $url
+	 */
 	private function _processXmlResponse($url){
 	/*
 	A private utility method used by other public methods to process XML responses.

Spacing +21 added lines, -21 removed lines

@@ -55,25 +55,25 @@ 
 	*/
 		// BASE CONFIGS - set these for your BBB server in config.php and they will
 		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+		$this->_securitySalt = CONFIG_SECURITY_SALT;
+		$this->_bbbServerBaseUrl = CONFIG_SERVER_BASE_URL;
 	}
 
-	private function _processXmlResponse($url){
+	private function _processXmlResponse($url) {
 	/*
 	A private utility method used by other public methods to process XML responses.
 	*/
 		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
+			$ch = curl_init() or die (curl_error($ch));
 			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+			$data = curl_exec($ch);
+			curl_close($ch);
+
+			if ($data)
 				return (new SimpleXMLElement($data));
 			else
 				return false;
@@ -137,10 +137,10 @@ 
 		'&duration='.urlencode($creationParams['duration']);
 		//'&meta_category='.urlencode($creationParams['meta_category']);
 		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
+		if (trim($welcomeMessage))
 			$params .= '&welcome='.urlencode($welcomeMessage);
 		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+		return ($creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt));
 	}
 
 	public function createMeetingWithXmlResponseArray($creationParams) {
@@ -165,7 +165,7 @@ 
 		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
+			if ($xml->meetingID)
 				return array(
 					'returncode' => $xml->returncode,
 					'message' => $xml->message,
@@ -283,7 +283,7 @@ 
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
 		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'running' => $xml->running 	// -- Returns true/false.
@@ -310,7 +310,7 @@ 
 		and then handle the results that we get in the XML response.
 		*/
 		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code, stop processing and return just the returncode:
 			if ($xml->returncode != 'SUCCESS') {
 				$result = array(
@@ -379,7 +379,7 @@ 
 		);
 		*/
 		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code or messageKey, find out why:
 			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
 				$result = array(
@@ -454,7 +454,7 @@ 
 		probably be required in user code when 'recording' is set to true.
 		*/
 		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code or messageKey, find out why:
 			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
 				$result = array(
@@ -524,7 +524,7 @@ 
 		);
 		*/
 		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'published' => $xml->published 	// -- Returns true/false.
@@ -557,7 +557,7 @@ 
 		*/
 
 		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'deleted' => $xml->deleted 	// -- Returns true/false.

Braces +28 added lines, -40 removed lines

@@ -73,10 +73,11 @@ 
 			$data = curl_exec( $ch );
 			curl_close( $ch );
 
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
+			if($data) {
+							return (new SimpleXMLElement($data));
+			} else {
+							return false;
+			}
 		}
 		return (simplexml_load_file($url));
 	}
@@ -85,11 +86,9 @@ 
 		/* Process required params and throw errors if we don't get values */
 		if ((isset($param)) && ($param != '')) {
 			return $param;
-		}
-		elseif (!isset($param)) {
+		} elseif (!isset($param)) {
 			throw new Exception('Missing parameter.');
-		}
-		else {
+		} else {
 			throw new Exception(''.$param.' is required.');
 		}
 	}
@@ -99,8 +98,7 @@ 
 		/* Don't know if we'll use this one, but let's build it in case. */
 		if ((isset($param)) && ($param != '')) {
 			return $param;
-		}
-		else {
+		} else {
 			$param = '';
 			return $param;
 		}
@@ -137,8 +135,9 @@ 
 		'&duration='.urlencode($creationParams['duration']);
 		//'&meta_category='.urlencode($creationParams['meta_category']);
 		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
+		if(trim($welcomeMessage)) {
+					$params .= '&welcome='.urlencode($welcomeMessage);
+		}
 		// Return the complete URL:
 		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
 	}
@@ -165,8 +164,8 @@ 
 		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
+			if($xml->meetingID) {
+							return array(
 					'returncode' => $xml->returncode,
 					'message' => $xml->message,
 					'messageKey' => $xml->messageKey,
@@ -176,14 +175,14 @@ 
 					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
 					'createTime' => $xml->createTime
 					);
-			else
-				return array(
+			} else {
+							return array(
 					'returncode' => $xml->returncode,
 					'message' => $xml->message,
 					'messageKey' => $xml->messageKey
 					);
-		}
-		else {
+			}
+		} else {
 			return null;
 		}
 	}
@@ -253,8 +252,7 @@ 
 				'message' => $xml->message,
 				'messageKey' => $xml->messageKey
 				);
-		}
-		else {
+		} else {
 			return null;
 		}
 
@@ -288,8 +286,7 @@ 
 				'returncode' => $xml->returncode,
 				'running' => $xml->running 	// -- Returns true/false.
 				);
-		}
-		else {
+		} else {
 			return null;
 		}
 
@@ -317,8 +314,7 @@ 
 					'returncode' => $xml->returncode
 				);
 				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
+			} elseif ($xml->messageKey == 'noMeetings') {
 				/* No meetings on server, so return just this info: */
 				$result = array(
 					'returncode' => $xml->returncode,
@@ -326,8 +322,7 @@ 
 					'message' => $xml->message
 				);
 				return $result;
-			}
-			else {
+			} else {
 				// In this case, we have success and meetings. First return general response:
 				$result = array(
 					'returncode' => $xml->returncode,
@@ -348,8 +343,7 @@ 
 					}
 				return $result;
 			}
-		}
-		else {
+		} else {
 			return null;
 		}
 
@@ -388,8 +382,7 @@ 
 					'message' => $xml->message
 				);
 				return $result;
-			}
-			else {
+			} else {
 				// In this case, we have success and meeting info:
 				$result = array(
 					'returncode' => $xml->returncode,
@@ -418,8 +411,7 @@ 
 					}
 				return $result;
 			}
-		}
-		else {
+		} else {
 			return null;
 		}
 
@@ -463,8 +455,7 @@ 
 					'message' => $xml->message
 				);
 				return $result;
-			}
-			else {
+			} else {
 				// In this case, we have success and recording info:
 				$result = array(
 					'returncode' => $xml->returncode,
@@ -495,8 +486,7 @@ 
 					}
 				return $result;
 			}
-		}
-		else {
+		} else {
 			return null;
 		}
 	}
@@ -529,8 +519,7 @@ 
 				'returncode' => $xml->returncode,
 				'published' => $xml->published 	// -- Returns true/false.
 				);
-		}
-		else {
+		} else {
 			return null;
 		}
 
@@ -562,8 +551,7 @@ 
 				'returncode' => $xml->returncode,
 				'deleted' => $xml->deleted 	// -- Returns true/false.
 				);
-		}
-		else {
+		} else {
 			return null;
 		}
 

Indentation +403 added lines, -403 removed lines

@@ -44,107 +44,107 @@ 
 
 class BigBlueButtonBN {
 
-	private $_securitySalt;
-	private $_bbbServerBaseUrl;
+    private $_securitySalt;
+    private $_bbbServerBaseUrl;
 
-	/* ___________ General Methods for the BigBlueButton Class __________ */
+    /* ___________ General Methods for the BigBlueButton Class __________ */
 
-	function __construct() {
-	/*
+    function __construct() {
+    /*
 	Establish just our basic elements in the constructor:
 	*/
-		// BASE CONFIGS - set these for your BBB server in config.php and they will
-		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
-	}
-
-	private function _processXmlResponse($url){
-	/*
+        // BASE CONFIGS - set these for your BBB server in config.php and they will
+        // simply flow in here via the constants:
+        $this->_securitySalt 		= CONFIG_SECURITY_SALT;
+        $this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+    }
+
+    private function _processXmlResponse($url){
+    /*
 	A private utility method used by other public methods to process XML responses.
 	*/
-		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
-			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
-		}
-		return (simplexml_load_file($url));
-	}
-
-	private function _requiredParam($param) {
-		/* Process required params and throw errors if we don't get values */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		elseif (!isset($param)) {
-			throw new Exception('Missing parameter.');
-		}
-		else {
-			throw new Exception(''.$param.' is required.');
-		}
-	}
-
-	private function _optionalParam($param) {
-		/* Pass most optional params through as set value, or set to '' */
-		/* Don't know if we'll use this one, but let's build it in case. */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		else {
-			$param = '';
-			return $param;
-		}
-	}
-
-	/* __________________ BBB ADMINISTRATION METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        if (extension_loaded('curl')) {
+            $ch = curl_init() or die ( curl_error($ch) );
+            $timeout = 10;
+            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt( $ch, CURLOPT_URL, $url );
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $data = curl_exec( $ch );
+            curl_close( $ch );
+
+            if($data)
+                return (new SimpleXMLElement($data));
+            else
+                return false;
+        }
+        return (simplexml_load_file($url));
+    }
+
+    private function _requiredParam($param) {
+        /* Process required params and throw errors if we don't get values */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        elseif (!isset($param)) {
+            throw new Exception('Missing parameter.');
+        }
+        else {
+            throw new Exception(''.$param.' is required.');
+        }
+    }
+
+    private function _optionalParam($param) {
+        /* Pass most optional params through as set value, or set to '' */
+        /* Don't know if we'll use this one, but let's build it in case. */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        else {
+            $param = '';
+            return $param;
+        }
+    }
+
+    /* __________________ BBB ADMINISTRATION METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- create
 	-- join
 	-- end
 	*/
 
-	public function getCreateMeetingUrl($creationParams) {
-		/*
+    public function getCreateMeetingUrl($creationParams) {
+        /*
 		USAGE:
 		(see $creationParams array in createMeetingArray method.)
 		*/
-		$this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
-		$this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
-		// Set up the basic creation URL:
-		$creationUrl = $this->_bbbServerBaseUrl."api/create?";
-		// Add params:
-		$params =
-		'name='.urlencode($this->_meetingName).
-		'&meetingID='.urlencode($this->_meetingId).
-		'&attendeePW='.urlencode($creationParams['attendeePw']).
-		'&moderatorPW='.urlencode($creationParams['moderatorPw']).
-		'&dialNumber='.urlencode($creationParams['dialNumber']).
-		'&voiceBridge='.urlencode($creationParams['voiceBridge']).
-		'&webVoice='.urlencode($creationParams['webVoice']).
-		'&logoutURL='.urlencode($creationParams['logoutUrl']).
-		'&maxParticipants='.urlencode($creationParams['maxParticipants']).
-		'&record='.urlencode($creationParams['record']).
-		'&duration='.urlencode($creationParams['duration']);
-		//'&meta_category='.urlencode($creationParams['meta_category']);
-		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
-		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
-	}
-
-	public function createMeetingWithXmlResponseArray($creationParams) {
-		/*
+        $this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
+        $this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
+        // Set up the basic creation URL:
+        $creationUrl = $this->_bbbServerBaseUrl."api/create?";
+        // Add params:
+        $params =
+        'name='.urlencode($this->_meetingName).
+        '&meetingID='.urlencode($this->_meetingId).
+        '&attendeePW='.urlencode($creationParams['attendeePw']).
+        '&moderatorPW='.urlencode($creationParams['moderatorPw']).
+        '&dialNumber='.urlencode($creationParams['dialNumber']).
+        '&voiceBridge='.urlencode($creationParams['voiceBridge']).
+        '&webVoice='.urlencode($creationParams['webVoice']).
+        '&logoutURL='.urlencode($creationParams['logoutUrl']).
+        '&maxParticipants='.urlencode($creationParams['maxParticipants']).
+        '&record='.urlencode($creationParams['record']).
+        '&duration='.urlencode($creationParams['duration']);
+        //'&meta_category='.urlencode($creationParams['meta_category']);
+        $welcomeMessage = $creationParams['welcomeMsg'];
+        if(trim($welcomeMessage))
+            $params .= '&welcome='.urlencode($welcomeMessage);
+        // Return the complete URL:
+        return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+    }
+
+    public function createMeetingWithXmlResponseArray($creationParams) {
+        /*
 		USAGE:
 		$creationParams = array(
 			'name' => 'Meeting Name',	-- A name for the meeting (or username)
@@ -162,34 +162,34 @@ 
 			'meta_category' => '', 		-- Use to pass additional info to BBB server. See API docs to enable.
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
+        $xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
-					'returncode' => $xml->returncode->__toString(),
-					'message' => $xml->message->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'meetingId' => $xml->meetingID->__toString(),
-					'attendeePw' => $xml->attendeePW->__toString(),
-					'moderatorPw' => $xml->moderatorPW->__toString(),
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
-					'createTime' => $xml->createTime->__toString()
-					);
-			else
-				return array(
-					'returncode' => $xml->returncode->__toString(),
-					'message' => $xml->message->__toString(),
-					'messageKey' => $xml->messageKey->__toString()
-					);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getJoinMeetingURL($joinParams) {
-		/*
+            if($xml->meetingID)
+                return array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'message' => $xml->message->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'meetingId' => $xml->meetingID->__toString(),
+                    'attendeePw' => $xml->attendeePW->__toString(),
+                    'moderatorPw' => $xml->moderatorPW->__toString(),
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
+                    'createTime' => $xml->createTime->__toString()
+                    );
+            else
+                return array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'message' => $xml->message->__toString(),
+                    'messageKey' => $xml->messageKey->__toString()
+                    );
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getJoinMeetingURL($joinParams) {
+        /*
 		NOTE: At this point, we don't use a corresponding joinMeetingWithXmlResponse here because the API
 		doesn't respond on success, but you can still code that method if you need it. Or, you can take the URL
 		that's returned from this method and simply send your users off to that URL in your code.
@@ -203,249 +203,249 @@ 
 			'webVoiceConf' => ''		-- OPTIONAL - string
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
-		$this->_username = $this->_requiredParam($joinParams['username']);
-		$this->_password = $this->_requiredParam($joinParams['password']);
-		// Establish the basic join URL:
-		$joinUrl = $this->_bbbServerBaseUrl."api/join?";
-		// Add parameters to the URL:
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&fullName='.urlencode($this->_username).
-		'&password='.urlencode($this->_password).
-		'&userID='.urlencode($joinParams['userID']).
-		'&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
-		// Only use createTime if we really want to use it. If it's '', then don't pass it:
-		if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
-			$params .= '&createTime='.urlencode($joinParams['createTime']);
-		}
-		// Return the URL:
-		return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
-	}
-
-	public function getEndMeetingURL($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
+        $this->_username = $this->_requiredParam($joinParams['username']);
+        $this->_password = $this->_requiredParam($joinParams['password']);
+        // Establish the basic join URL:
+        $joinUrl = $this->_bbbServerBaseUrl."api/join?";
+        // Add parameters to the URL:
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&fullName='.urlencode($this->_username).
+        '&password='.urlencode($this->_password).
+        '&userID='.urlencode($joinParams['userID']).
+        '&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
+        // Only use createTime if we really want to use it. If it's '', then don't pass it:
+        if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
+            $params .= '&createTime='.urlencode($joinParams['createTime']);
+        }
+        // Return the URL:
+        return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
+    }
+
+    public function getEndMeetingURL($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($endParams['meetingId']);
-		$this->_password = $this->_requiredParam($endParams['password']);
-		$endUrl = $this->_bbbServerBaseUrl."api/end?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
-	}
-
-	public function endMeetingWithXmlResponseArray($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($endParams['meetingId']);
+        $this->_password = $this->_requiredParam($endParams['password']);
+        $endUrl = $this->_bbbServerBaseUrl."api/end?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
+    }
+
+    public function endMeetingWithXmlResponseArray($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
-		if ($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'message' => $xml->message->__toString(),
-				'messageKey' => $xml->messageKey->__toString()
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB MONITORING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
+        if ($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'message' => $xml->message->__toString(),
+                'messageKey' => $xml->messageKey->__toString()
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB MONITORING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- isMeetingRunning
 	-- getMeetings
 	-- getMeetingInfo
 	*/
 
-	public function getIsMeetingRunningUrl($meetingId) {
-		/* USAGE:
+    public function getIsMeetingRunningUrl($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$this->_meetingId = $this->_requiredParam($meetingId);
-		$runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId);
-		return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
-	}
-
-	public function isMeetingRunningWithXmlResponseArray($meetingId) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($meetingId);
+        $runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId);
+        return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
+    }
+
+    public function isMeetingRunningWithXmlResponseArray($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'running' => $xml->running->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getGetMeetingsUrl() {
-		/* Simply formulate the getMeetings URL
+        $xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'running' => $xml->running->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getGetMeetingsUrl() {
+        /* Simply formulate the getMeetings URL
 		We do this in a separate function so we have the option to just get this
 		URL and print it if we want for some reason.
 		*/
-		$getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
-		return $getMeetingsUrl;
-	}
+        $getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
+        return $getMeetingsUrl;
+    }
 
-	public function getMeetingsWithXmlResponseArray() {
-		/* USAGE:
+    public function getMeetingsWithXmlResponseArray() {
+        /* USAGE:
 		We don't need to pass any parameters with this one, so we just send the query URL off to BBB
 		and then handle the results that we get in the XML response.
 		*/
-		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
-			// If we don't get a success code, stop processing and return just the returncode:
-			if ($xml->returncode != 'SUCCESS') {
-				$result = array(
-					'returncode' => $xml->returncode->__toString()
-				);
-				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
-				/* No meetings on server, so return just this info: */
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meetings. First return general response:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				// Then interate through meeting results and return them as part of the array:
-				foreach ($xml->meetings->meeting as $m) {
-					$result[] = array(
-						'meetingId' => $m->meetingID->__toString(),
-						'meetingName' => $m->meetingName->__toString(),
-						'createTime' => $m->createTime->__toString(),
-						'attendeePw' => $m->attendeePW->__toString(),
-						'moderatorPw' => $m->moderatorPW->__toString(),
-						'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded->__toString(),
-						'running' => $m->running->__toString()
-					);
-				}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getMeetingInfoUrl($infoParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
+        if($xml) {
+            // If we don't get a success code, stop processing and return just the returncode:
+            if ($xml->returncode != 'SUCCESS') {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString()
+                );
+                return $result;
+            }
+            elseif ($xml->messageKey == 'noMeetings') {
+                /* No meetings on server, so return just this info: */
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meetings. First return general response:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                // Then interate through meeting results and return them as part of the array:
+                foreach ($xml->meetings->meeting as $m) {
+                    $result[] = array(
+                        'meetingId' => $m->meetingID->__toString(),
+                        'meetingName' => $m->meetingName->__toString(),
+                        'createTime' => $m->createTime->__toString(),
+                        'attendeePw' => $m->attendeePW->__toString(),
+                        'moderatorPw' => $m->moderatorPW->__toString(),
+                        'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded->__toString(),
+                        'running' => $m->running->__toString()
+                    );
+                }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getMeetingInfoUrl($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
-		$this->_password = $this->_requiredParam($infoParams['password']);
-		$infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
-	}
-
-	public function getMeetingInfoWithXmlResponseArray($infoParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
+        $this->_password = $this->_requiredParam($infoParams['password']);
+        $infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
+    }
+
+    public function getMeetingInfoWithXmlResponseArray($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meeting info:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'meetingName' => $xml->meetingName->__toString(),
-					'meetingId' => $xml->meetingID->__toString(),
-					'createTime' => $xml->createTime->__toString(),
-					'voiceBridge' => $xml->voiceBridge->__toString(),
-					'attendeePw' => $xml->attendeePW->__toString(),
-					'moderatorPw' => $xml->moderatorPW->__toString(),
-					'running' => $xml->running->__toString(),
-					'recording' => $xml->recording->__toString(),
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
-					'startTime' => $xml->startTime->__toString(),
-					'endTime' => $xml->endTime->__toString(),
-					'participantCount' => $xml->participantCount->__toString(),
-					'maxUsers' => $xml->maxUsers->__toString(),
-					'moderatorCount' => $xml->moderatorCount->__toString(),
-				);
-				// Then interate through attendee results and return them as part of the array:
-				foreach ($xml->attendees->attendee as $a) {
-					$result[] = array(
-						'userId' => $a->userID->__toString(),
-						'fullName' => $a->fullName->__toString(),
-						'role' => $a->role->__toString()
-					);
-				}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB RECORDING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meeting info:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'meetingName' => $xml->meetingName->__toString(),
+                    'meetingId' => $xml->meetingID->__toString(),
+                    'createTime' => $xml->createTime->__toString(),
+                    'voiceBridge' => $xml->voiceBridge->__toString(),
+                    'attendeePw' => $xml->attendeePW->__toString(),
+                    'moderatorPw' => $xml->moderatorPW->__toString(),
+                    'running' => $xml->running->__toString(),
+                    'recording' => $xml->recording->__toString(),
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
+                    'startTime' => $xml->startTime->__toString(),
+                    'endTime' => $xml->endTime->__toString(),
+                    'participantCount' => $xml->participantCount->__toString(),
+                    'maxUsers' => $xml->maxUsers->__toString(),
+                    'moderatorCount' => $xml->moderatorCount->__toString(),
+                );
+                // Then interate through attendee results and return them as part of the array:
+                foreach ($xml->attendees->attendee as $a) {
+                    $result[] = array(
+                        'userId' => $a->userID->__toString(),
+                        'fullName' => $a->fullName->__toString(),
+                        'role' => $a->role->__toString()
+                    );
+                }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB RECORDING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- getRecordings
 	-- publishRecordings
 	-- deleteRecordings
 	*/
 
-	public function getRecordingsUrl($recordingParams) {
-		/* USAGE:
+    public function getRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
-		$params = 'meetingID='.urlencode($recordingParams['meetingId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
+        $params = 'meetingID='.urlencode($recordingParams['meetingId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function getRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function getRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
@@ -453,121 +453,121 @@ 
 		when creating a meeting, it will kick users out after the duration. Should
 		probably be required in user code when 'recording' is set to true.
 		*/
-		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and recording info:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-
-				foreach ($xml->recordings->recording as $r) {
-					$result[] = array(
-						'recordId' => $r->recordID->__toString(),
-						'meetingId' => $r->meetingID->__toString(),
-						'name' => $r->name->__toString(),
-						'published' => $r->published->__toString(),
-						'startTime' => $r->startTime->__toString(),
-						'endTime' => $r->endTime->__toString(),
-						'playbackFormatType' => $r->playback->format->type->__toString(),
-						'playbackFormatUrl' => $r->playback->format->url->__toString(),
-						'playbackFormatLength' => $r->playback->format->length->__toString(),
-						'metadataTitle' => $r->metadata->title->__toString(),
-						'metadataSubject' => $r->metadata->subject->__toString(),
-						'metadataDescription' => $r->metadata->description->__toString(),
-						'metadataCreator' => $r->metadata->creator->__toString(),
-						'metadataContributor' => $r->metadata->contributor->__toString(),
-						'metadataLanguage' => $r->metadata->language->__toString(),
-						// Add more here as needed for your app depending on your
-						// use of metadata when creating recordings.
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getPublishRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and recording info:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+
+                foreach ($xml->recordings->recording as $r) {
+                    $result[] = array(
+                        'recordId' => $r->recordID->__toString(),
+                        'meetingId' => $r->meetingID->__toString(),
+                        'name' => $r->name->__toString(),
+                        'published' => $r->published->__toString(),
+                        'startTime' => $r->startTime->__toString(),
+                        'endTime' => $r->endTime->__toString(),
+                        'playbackFormatType' => $r->playback->format->type->__toString(),
+                        'playbackFormatUrl' => $r->playback->format->url->__toString(),
+                        'playbackFormatLength' => $r->playback->format->length->__toString(),
+                        'metadataTitle' => $r->metadata->title->__toString(),
+                        'metadataSubject' => $r->metadata->subject->__toString(),
+                        'metadataDescription' => $r->metadata->description->__toString(),
+                        'metadataCreator' => $r->metadata->creator->__toString(),
+                        'metadataContributor' => $r->metadata->contributor->__toString(),
+                        'metadataLanguage' => $r->metadata->language->__toString(),
+                        // Add more here as needed for your app depending on your
+                        // use of metadata when creating recordings.
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getPublishRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']).
-		'&publish='.urlencode($recordingParams['publish']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']).
+        '&publish='.urlencode($recordingParams['publish']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function publishRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function publishRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'published' => $xml->published->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-
-	}
-
-	public function getDeleteRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'published' => $xml->published->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+
+    }
+
+    public function getDeleteRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
-	}
-
-	public function deleteRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
+    }
+
+    public function deleteRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
 
-		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'deleted' => $xml->deleted->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-	}
+        $xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'deleted' => $xml->deleted->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+    }
 
 
 

plugin/buycourses/src/paypalfunctions.php

Doc Comments +2 added lines

@@ -324,6 +324,8 @@
  * @nvpStr is nvp string.

  * returns an associtive array containing the response from the server.

  *

+ * @param string $methodName
+ * @param string $nvpStr
  */

 function hash_call($methodName, $nvpStr)

 {

Indentation +4 added lines, -4 removed lines

@@ -111,8 +111,8 @@ 
  *		phoneNum:			the phoneNum  entered on the merchant's site

  */

 function CallMarkExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL,

-                                 $cancelURL, $shipToName, $shipToStreet, $shipToCity, $shipToState,

-                                 $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum

+                                    $cancelURL, $shipToName, $shipToStreet, $shipToCity, $shipToState,

+                                    $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum

 )

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

@@ -265,8 +265,8 @@ 
  */

 

 function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCardNumber,

-                       $expDate, $cvv2, $firstName, $lastName, $street, $city, $state, $zip,

-                       $countryCode, $currencyCode)

+                        $expDate, $cvv2, $firstName, $lastName, $street, $city, $state, $zip,

+                        $countryCode, $currencyCode)

 {

     //Construct the parameter string that describes DoDirectPayment

     $nvpstr = "&AMT=" . $paymentAmount;

Spacing +44 added lines, -44 removed lines

@@ -67,12 +67,12 @@ 
 function CallShortcutExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $extra)

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;

-    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=" . $paymentAmount;

-    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;

-    $nvpstr .= "&RETURNURL=" . $returnURL;

-    $nvpstr .= "&CANCELURL=" . $cancelURL;

-    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;

+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;

+    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=".$paymentAmount;

+    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;

+    $nvpstr .= "&RETURNURL=".$returnURL;

+    $nvpstr .= "&CANCELURL=".$cancelURL;

+    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;

     $nvpstr .= $extra;

 

     $_SESSION["currencyCodeType"] = $currencyCodeType;

@@ -116,20 +116,20 @@ 
 )

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;

-    $nvpstr = $nvpstr . "&RETURNURL=" . $returnURL;

-    $nvpstr = $nvpstr . "&CANCELURL=" . $cancelURL;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;

-    $nvpstr = $nvpstr . "&ADDROVERRIDE=1";

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTONAME=" . $shipToName;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET=" . $shipToStreet;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET2=" . $shipToStreet2;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCITY=" . $shipToCity;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTATE=" . $shipToState;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=" . $shipToCountryCode;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOZIP=" . $shipToZip;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOPHONENUM=" . $phoneNum;

+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;

+    $nvpstr = $nvpstr."&RETURNURL=".$returnURL;

+    $nvpstr = $nvpstr."&CANCELURL=".$cancelURL;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;

+    $nvpstr = $nvpstr."&ADDROVERRIDE=1";

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTONAME=".$shipToName;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET=".$shipToStreet;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET2=".$shipToStreet2;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCITY=".$shipToCity;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTATE=".$shipToState;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=".$shipToCountryCode;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOZIP=".$shipToZip;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOPHONENUM=".$phoneNum;

 

     $_SESSION["currencyCodeType"] = $currencyCodeType;

     $_SESSION["PaymentType"] = $paymentType;

@@ -172,7 +172,7 @@ 
      * Build a second API request to PayPal, using the token as the

      * ID to get the details on the payment authorization

      */

-    $nvpstr = "&TOKEN=" . $token;

+    $nvpstr = "&TOKEN=".$token;

 

     /**

      * Make the API call and store the results in an array.

@@ -213,9 +213,9 @@ 
     $payerID = urlencode($_SESSION['payer_id']);

     $serverName = urlencode($_SERVER['SERVER_NAME']);

 

-    $nvpstr = '&TOKEN=' . $token . '&PAYERID=' . $payerID . '&PAYMENTREQUEST_0_PAYMENTACTION=' . $paymentType . '&PAYMENTREQUEST_0_AMT=' . $FinalPaymentAmt;

-    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE=' . $currencyCodeType . '&IPADDRESS=' . $serverName;

-    $nvpstr = '&' . http_build_query([

+    $nvpstr = '&TOKEN='.$token.'&PAYERID='.$payerID.'&PAYMENTREQUEST_0_PAYMENTACTION='.$paymentType.'&PAYMENTREQUEST_0_AMT='.$FinalPaymentAmt;

+    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE='.$currencyCodeType.'&IPADDRESS='.$serverName;

+    $nvpstr = '&'.http_build_query([

         'TOKEN' => $token,

         'PAYERID' => $payerID,

         'PAYMENTACTION' => $paymentType,

@@ -269,20 +269,20 @@ 
                        $countryCode, $currencyCode)

 {

     //Construct the parameter string that describes DoDirectPayment

-    $nvpstr = "&AMT=" . $paymentAmount;

-    $nvpstr = $nvpstr . "&CURRENCYCODE=" . $currencyCode;

-    $nvpstr = $nvpstr . "&PAYMENTACTION=" . $paymentType;

-    $nvpstr = $nvpstr . "&CREDITCARDTYPE=" . $creditCardType;

-    $nvpstr = $nvpstr . "&ACCT=" . $creditCardNumber;

-    $nvpstr = $nvpstr . "&EXPDATE=" . $expDate;

-    $nvpstr = $nvpstr . "&CVV2=" . $cvv2;

-    $nvpstr = $nvpstr . "&FIRSTNAME=" . $firstName;

-    $nvpstr = $nvpstr . "&LASTNAME=" . $lastName;

-    $nvpstr = $nvpstr . "&STREET=" . $street;

-    $nvpstr = $nvpstr . "&CITY=" . $city;

-    $nvpstr = $nvpstr . "&STATE=" . $state;

-    $nvpstr = $nvpstr . "&COUNTRYCODE=" . $countryCode;

-    $nvpstr = $nvpstr . "&IPADDRESS=" . $_SERVER['REMOTE_ADDR'];

+    $nvpstr = "&AMT=".$paymentAmount;

+    $nvpstr = $nvpstr."&CURRENCYCODE=".$currencyCode;

+    $nvpstr = $nvpstr."&PAYMENTACTION=".$paymentType;

+    $nvpstr = $nvpstr."&CREDITCARDTYPE=".$creditCardType;

+    $nvpstr = $nvpstr."&ACCT=".$creditCardNumber;

+    $nvpstr = $nvpstr."&EXPDATE=".$expDate;

+    $nvpstr = $nvpstr."&CVV2=".$cvv2;

+    $nvpstr = $nvpstr."&FIRSTNAME=".$firstName;

+    $nvpstr = $nvpstr."&LASTNAME=".$lastName;

+    $nvpstr = $nvpstr."&STREET=".$street;

+    $nvpstr = $nvpstr."&CITY=".$city;

+    $nvpstr = $nvpstr."&STATE=".$state;

+    $nvpstr = $nvpstr."&COUNTRYCODE=".$countryCode;

+    $nvpstr = $nvpstr."&IPADDRESS=".$_SERVER['REMOTE_ADDR'];

 

     $resArray = hash_call("DoDirectPayment", $nvpstr);

 

@@ -345,13 +345,13 @@ 
     //if USE_PROXY constant set to TRUE in Constants.php, then only proxy will be enabled.

     //Set proxy name to PROXY_HOST and port number to PROXY_PORT in constants.php

     if ($USE_PROXY) {

-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST . ":" . $PROXY_PORT);

+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);

     }

 

     //NVPRequest for submitting to server

-    $nvpreq = "METHOD=" . urlencode($methodName) . "&VERSION=" . urlencode($version) .

-        "&PWD=" . urlencode($API_Password) . "&USER=" . urlencode($API_UserName) .

-        "&SIGNATURE=" . urlencode($API_Signature) . $nvpStr . "&BUTTONSOURCE=" . urlencode($sBNCode);

+    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($version).

+        "&PWD=".urlencode($API_Password)."&USER=".urlencode($API_UserName).

+        "&SIGNATURE=".urlencode($API_Signature).$nvpStr."&BUTTONSOURCE=".urlencode($sBNCode);

 

     //setting the nvpreq as POST FIELD to curl

     curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);

@@ -385,8 +385,8 @@ 
 {

     global $PAYPAL_URL;

     // Redirect to paypal.com here

-    $payPalURL = $PAYPAL_URL . $token;

-    header("Location: " . $payPalURL);

+    $payPalURL = $PAYPAL_URL.$token;

+    header("Location: ".$payPalURL);

     exit;

 }