chamilo / chamilo-lms

main/webservices/cm_webservice_user.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
     /**
     * Get a list of users of which the given conditions match with a LIKE '%cond%'
     * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
+    * @param string[] $order_by a list of fields on which sort
     * @return array An array with all users of the platform.
     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class

Indentation +7 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
     {
         global $charset;
         if ($this->verifyUserPass($username, $password) == "valid") {
-		    $user_id = UserManager::get_user_id_from_username($username);
+            $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
             $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
 
@@ -135,14 +135,14 @@ 
 
 
     /**
-    * Get a list of users of which the given conditions match with a LIKE '%cond%'
-    * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
-    * @return array An array with all users of the platform.
-    * @todo optional course code parameter, optional sorting parameters...
+     * Get a list of users of which the given conditions match with a LIKE '%cond%'
+     * @param array $conditions a list of condition (exemple : status=>STUDENT)
+     * @param array $order_by a list of fields on which sort
+     * @return array An array with all users of the platform.
+     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class
      * @todo security filter order by
-    */
+     */
     private static function get_user_list_like_start($conditions = array(), $order_by = array())
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 
     public function find_id_user($username, $password, $name)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
 
             $listResult = "#";
@@ -40,9 +40,9 @@ 
             }
 
             $listArrayResult = array_unique($listArray);
-            foreach($listArrayResult as $result)
+            foreach ($listArrayResult as $result)
             {
-                $listResult .= $result . "#";
+                $listResult .= $result."#";
             }
 
             return $listResult;
@@ -97,12 +97,12 @@ 
         if ($this->verifyUserPass($username, $password) == "valid") {
 		    $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
-            $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
+            $count_is_true = SocialManager::send_invitation_friend($user_id, $userfriend_id, $message_title, $content_message);
 
             if ($count_is_true) {
-                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES,$charset),false);
+                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES, $charset), false);
             } else {
-                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES,$charset),false);
+                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES, $charset), false);
             }
         }
         return get_lang('InvalidId');

main/webservices/lp.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 
 define('WS_ERROR_SECRET_KEY', 1);
 
+/**
+ * @param integer $code
+ */
 function return_error($code) {
     $fault = null;
     switch ($code) {

Indentation +1 added lines, -1 removed lines

@@ -581,7 +581,7 @@
     /*$sessionIdName = isset($params['session_id_name']) ? $params['session_id_name'] : null;
     $sessionIdValue = isset($params['session_id_value']) ? $params['session_id_value'] : null;*/
 
-     $courseInfo = CourseManager::getCourseInfoFromOriginalId(
+        $courseInfo = CourseManager::getCourseInfoFromOriginalId(
         $courseIdValue,
         $courseIdName
     );

Spacing +37 added lines, -37 removed lines

@@ -65,7 +65,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -120,13 +120,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSImportLP',                            // method name
-    array('params' => 'tns:params'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSImportLP',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSImportLP', // method name
+    array('params' => 'tns:params'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSImportLP', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -183,7 +183,7 @@ 
 
     $uniqueFile = uniqid();
     $userId = 1; // admin
-    $filePath = api_get_path(SYS_ARCHIVE_PATH) . $uniqueFile;
+    $filePath = api_get_path(SYS_ARCHIVE_PATH).$uniqueFile;
     file_put_contents($filePath, $fileData);
 
     $fileName = $params['filename'];
@@ -257,8 +257,8 @@ 
     'all',
     '',
     array(
-        'id'    => array('name' => 'id',    'type' => 'xsd:string'),
-        'name'  => array('name' => 'name',  'type' => 'xsd:string'),
+        'id'    => array('name' => 'id', 'type' => 'xsd:string'),
+        'name'  => array('name' => 'name', 'type' => 'xsd:string'),
     )
 );
 
@@ -274,13 +274,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetLpList',                            // method name
-    array('params' => 'tns:paramsGetLpList'),  // input parameters
-    array('return' => 'tns:lpList'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSGetLpList',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSGetLpList', // method name
+    array('params' => 'tns:paramsGetLpList'), // input parameters
+    array('return' => 'tns:lpList'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSGetLpList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -369,13 +369,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteLp',                            // method name
-    array('params' => 'tns:paramsDeleteLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSDeleteLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSDeleteLp', // method name
+    array('params' => 'tns:paramsDeleteLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSDeleteLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a LP'                                               // documentation
 );
 
@@ -434,9 +434,9 @@ 
     if ($lp) {
         if ($debug) error_log("LP deleted $lpId");
 
-        $course_dir = $courseInfo['directory'] . '/document';
+        $course_dir = $courseInfo['directory'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         $items = $lp->get_flat_ordered_items_list($lpId, 0, $courseId);
 
@@ -495,9 +495,9 @@ 
     'all',
     '',
     array(
-        'data'  => array('name' => 'data',  'type' => 'xsd:string'),
-        'title'  => array('name' => 'title',  'type' => 'xsd:string'),
-        'filename'  => array('name' => 'filename',  'type' => 'xsd:string'),
+        'data'  => array('name' => 'data', 'type' => 'xsd:string'),
+        'title'  => array('name' => 'title', 'type' => 'xsd:string'),
+        'filename'  => array('name' => 'filename', 'type' => 'xsd:string'),
     )
 );
 
@@ -548,13 +548,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateLp',                            // method name
-    array('params' => 'tns:paramsCreateLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSCreateLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateLp', // method name
+    array('params' => 'tns:paramsCreateLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSCreateLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service creates a LP'                                               // documentation
 );
 

Braces +48 added lines, -20 removed lines

@@ -48,19 +48,22 @@ 
         list($ip1, $ip2) = 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);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -76,8 +79,9 @@ 
     }
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -140,7 +144,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSImportLP');
+    if ($debug) {
+        error_log('WSImportLP');
+    }
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -156,7 +162,9 @@ 
     $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
-        if ($debug) error_log('Course not found');
+        if ($debug) {
+            error_log('Course not found');
+        }
         return 'Course not found';
     }
 
@@ -169,7 +177,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -196,7 +206,9 @@ 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
 
     if (!$manifest) {
-        if ($debug) error_log('manifest.xml file not found');
+        if ($debug) {
+            error_log('manifest.xml file not found');
+        }
         //if api_set_failure
         return 'manifest.xml file not found';
     }
@@ -215,10 +227,14 @@ 
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
 
-        if ($debug) error_log('scorm was added');
+        if ($debug) {
+            error_log('scorm was added');
+        }
         return 1;
     } else {
-        if ($debug) error_log('manifest data empty');
+        if ($debug) {
+            error_log('manifest data empty');
+        }
         return 'manifest data empty';
     }
 }
@@ -311,7 +327,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
 
@@ -326,7 +344,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -407,7 +427,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
     $courseId = $courseInfo['real_id'];
@@ -432,7 +454,9 @@ 
 
     $lp = new learnpath($courseCode, $lpId, null);
     if ($lp) {
-        if ($debug) error_log("LP deleted $lpId");
+        if ($debug) {
+            error_log("LP deleted $lpId");
+        }
 
         $course_dir = $courseInfo['directory'] . '/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
@@ -448,7 +472,9 @@ 
                 if ($item) {
                     $documentId = $item->get_path();
 
-                    if ($debug) error_log("lp item id found #$itemId");
+                    if ($debug) {
+                        error_log("lp item id found #$itemId");
+                    }
 
                     $documentInfo = DocumentManager::get_document_data_by_id(
                         $documentId,
@@ -474,7 +500,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log("Document not found #$itemId");
+                    if ($debug) {
+                        error_log("Document not found #$itemId");
+                    }
                 }
             }
         }

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);

Indentation +3 added lines, -3 removed lines

@@ -4930,9 +4930,9 @@
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
- * @param array $params
- * @return array|null|soap_fault
- */
+     * @param array $params
+     * @return array|null|soap_fault
+     */
 function WSUnSubscribeUserFromCourseSimple($params)
 {
     global $debug;

Spacing +454 added lines, -454 removed lines

@@ -80,7 +80,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -138,7 +138,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'
 );
 
@@ -171,7 +171,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'
 );
 
@@ -210,17 +210,17 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:result_createUsers[]')),'tns:result_createUsers'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:result_createUsers[]')), 'tns:result_createUsers'
 );
 
 // 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
 );
 
@@ -401,7 +401,7 @@ 
             continue;
         }
 
-        $results[] =  $userId;
+        $results[] = $userId;
 
     } // end principal foreach
 
@@ -447,13 +447,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
 );
 
@@ -558,7 +558,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 */
@@ -606,7 +606,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) {
@@ -658,7 +658,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')
@@ -686,7 +686,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')
     )
 );
@@ -716,13 +716,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
 );
 
@@ -769,7 +769,7 @@ 
         $salt = '';
 
         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";
                     $results[] = $msg;
@@ -792,7 +792,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;
                 }
@@ -847,7 +847,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) {
@@ -967,7 +967,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_value' => $orig_user_id_value[$i],
             'result' => $results[$i],
@@ -986,9 +986,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
@@ -1044,9 +1044,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,
@@ -1082,7 +1082,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);
 
@@ -1095,13 +1095,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;
 }
@@ -1133,7 +1133,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);
 
@@ -1147,7 +1147,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;
         }
@@ -1155,7 +1155,7 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) error_log('Final Result: '.$result);
 
     return $result;
 }
@@ -1173,32 +1173,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
 );
 
@@ -1208,7 +1208,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);
@@ -1241,7 +1241,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);
@@ -1303,7 +1303,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)."',
@@ -1312,7 +1312,7 @@ 
                     expiration_date='".Database::escape_string($expiration_date)."',
                     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]."'";
             if ($debug) error_log($sql);
             Database::query($sql);
 
@@ -1492,13 +1492,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
 );
 
@@ -1597,13 +1597,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
 );
 
@@ -1795,13 +1795,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
 );
 
@@ -1972,13 +1972,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
 );
 
@@ -2036,8 +2036,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) {
@@ -2108,7 +2108,7 @@ 
         ->setExpirationDate($expiration_date)
         ->setHrDeptId($hr_dept_id)
         ->setActive(true)
-        ->setPictureUri($pictureUri);;
+        ->setPictureUri($pictureUri); ;
 
     if (!is_null($creator_id)) {
         $user->setCreatorId($creator_id);
@@ -2205,13 +2205,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
 );
 
@@ -2219,7 +2219,7 @@ 
 function WSEditUsersPasswordCrypted($params) {
     global $_configuration;
 
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
@@ -2256,7 +2256,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;
@@ -2271,11 +2271,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;
@@ -2411,13 +2411,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
 );
 
@@ -2461,7 +2461,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;
@@ -2602,7 +2602,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(
@@ -2618,35 +2618,35 @@ 
 );
 
 function WSHelperActionOnUsers($params, $type) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
     $original_user_ids = $params['ids'];
-    foreach($original_user_ids as $original_user_id) {
+    foreach ($original_user_ids as $original_user_id) {
         $user_id = UserManager::get_user_id_from_original_id(
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if($user_id > 0) {
-            if($type == "delete") {
+        if ($user_id > 0) {
+            if ($type == "delete") {
                 UserManager::delete_user($user_id);
-            } else if($type == "disable") {
+            } else if ($type == "disable") {
                 UserManager::disable($user_id);
-            } else if($type == "enable") {
+            } else if ($type == "enable") {
                 UserManager::enable($user_id);
             }
         }
     }
 }
 
-$server->register('WSDeleteUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                   // input parameters
-    array(),                                               // 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(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Deletes users provided as parameters from the system' // documentation
 );
 
@@ -2655,13 +2655,13 @@ 
 }
 
 /** WSDisableUsers **/
-$server->register('WSDisableUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                    // input parameters
-    array(),                                                // 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(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDisableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Disables users provided as parameters from the system' // documentation
 );
 
@@ -2670,13 +2670,13 @@ 
 }
 
 /** WSEnableUsers **/
-$server->register('WSEnableUsers',            // method name
-    array('user_ids' => 'tns:user_ids'),      // input parameters
-    array(),                                  // 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(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEnableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Enables users provided as parameters'    // documentation
 );
 
@@ -2726,7 +2726,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
@@ -2767,13 +2767,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
 );
 
@@ -2829,7 +2829,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']."'";
@@ -2879,7 +2879,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();
@@ -3010,13 +3010,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
 );
 
@@ -3247,18 +3247,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)) {
@@ -3413,13 +3413,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
 );
 
@@ -3472,14 +3472,14 @@ 
     }
 
     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'];
     }
 
     $count_results = count($default_titles);
     $output = array();
-    for($i = 1; $i <= $count_results; $i++) {
+    for ($i = 1; $i <= $count_results; $i++) {
         $output[] = array(
             'course_desc_id' => $array_course_desc_id[$i],
             'course_desc_default_title' => $array_course_desc_default_title[$i],
@@ -3559,13 +3559,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
 );
 
@@ -3609,7 +3609,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;
@@ -3643,7 +3643,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_course_id_value' => $orig_course_id_value[$i],
             'result' => $results[$i],
@@ -3715,13 +3715,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
 );
 
@@ -3847,13 +3847,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
 );
 
@@ -3907,8 +3907,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 = "";
@@ -3926,7 +3926,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");
@@ -4029,7 +4029,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_session_id_value' => $orig_session_id_value[$i],
             'result' => $results[$i],
@@ -4114,13 +4114,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
 );
 
@@ -4170,11 +4170,11 @@ 
         }
 
         if (empty($nolimit)) {
-            $date_start="$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start);
-            $date_end="$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end);
+            $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+            $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
         } else {
-            $date_start="";
-            $date_end="";
+            $date_start = "";
+            $date_end = "";
         }
         if (empty($name)) {
             $results[] = 0; //SessionNameIsRequired
@@ -4318,13 +4318,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
 );
 
@@ -4406,10 +4406,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')
     )
 );
 
@@ -4419,9 +4419,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')
     )
 );
 
@@ -4446,9 +4446,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')
     )
 );
 
@@ -4464,13 +4464,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
 );
 
@@ -4480,7 +4480,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'];
@@ -4548,8 +4548,8 @@ 
     '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')
     )
 );
@@ -4562,18 +4562,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
 );
 
@@ -4582,7 +4582,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);
     }
@@ -4630,9 +4630,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')
     )
 );
 
@@ -4643,21 +4643,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
 );
 
@@ -4701,17 +4701,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
 );
 
@@ -4752,10 +4752,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'),
     )
 );
 
@@ -4808,13 +4808,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
 );
 
@@ -4826,7 +4826,7 @@ 
     }
 
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
-    $table_course     = Database :: get_main_table(TABLE_MAIN_COURSE);
+    $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
     $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 
     $userscourses_params = $params['userscourses'];
@@ -4836,8 +4836,8 @@ 
     foreach ($userscourses_params as $usercourse_param) {
 
         $original_user_id_values     = $usercourse_param['original_user_id_values'];
-        $original_user_id_name         = $usercourse_param['original_user_id_name'];
-        $original_course_id_value     = $usercourse_param['original_course_id_value'];
+        $original_user_id_name = $usercourse_param['original_user_id_name'];
+        $original_course_id_value = $usercourse_param['original_course_id_value'];
         $original_course_id_name     = $usercourse_param['original_course_id_name'];
         $orig_course_id_value[] = $original_course_id_value;
 
@@ -4858,7 +4858,7 @@ 
             $usersList[] = $user_id;
         }
 
-        $orig_user_id_value[] = implode(',',$usersList);
+        $orig_user_id_value[] = implode(',', $usersList);
 
         $courseInfo = CourseManager::getCourseInfoFromOriginalId(
             $original_course_id_value,
@@ -4891,7 +4891,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_values' => $orig_user_id_value[$i],
             'original_course_id_value' => $orig_course_id_value[$i],
@@ -4920,13 +4920,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSUnSubscribeUserFromCourseSimple',                         // method name
+$server->register('WSUnSubscribeUserFromCourseSimple', // method name
     array('unSubscribeUserFromCourseSimple' => 'tns:unSubscribeUserFromCourseSimple'), // input parameters
-    array('return' => 'tns:result_createUsersPassEncrypt'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:result_createUsersPassEncrypt'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
@@ -4996,10 +4996,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')
     )
 );
 
@@ -5093,13 +5093,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
 );
 
@@ -5176,7 +5176,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_values' => $orig_user_id_value[$i],
             'original_session_id_value' => $orig_session_id_value[$i],
@@ -5196,25 +5196,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
@@ -5223,8 +5223,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);
@@ -5325,13 +5325,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
 );
 
@@ -5345,7 +5345,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);
@@ -5437,7 +5437,7 @@ 
     'all',
     '',
     array(
-        'course_code'   => array('name' => 'course_code',   'type' => 'xsd:string'),
+        'course_code'   => array('name' => 'course_code', 'type' => 'xsd:string'),
     )
 );
 
@@ -5473,9 +5473,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')
     )
 );
 
@@ -5528,13 +5528,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
 );
 
@@ -5672,13 +5672,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
 );
 
@@ -5785,7 +5785,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_course_id_values' => $orig_course_id_value[$i],
             'original_session_id_value' => $orig_session_id_value[$i],
@@ -5829,13 +5829,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSListCourses',                                                  // method name
+$server->register('WSListCourses', // method name
     array('secret_key' => 'xsd:string', 'original_course_id_name' => 'xsd:string'), // 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
 );
 
@@ -5902,27 +5902,27 @@ 
     '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
 );
 
 
 function WSUpdateUserApiKey($params) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
@@ -5964,9 +5964,9 @@ 
     'all',
     '',
     array(
-        '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')
+        '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')
     )
 );
 
@@ -5977,11 +5977,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'),
     )
 );
 
@@ -6000,13 +6000,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
 );
 
@@ -6021,7 +6021,7 @@ 
  * @return array Sessions list (id=>[title=>'title',url='http://...',date_start=>'...',date_end=>''])
  */
 function WSListSessions($params) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
     $sql_params = array();
@@ -6060,20 +6060,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
 );
 
@@ -6087,7 +6087,7 @@ 
     global $debug;
 
     if ($debug) error_log('WSUserSubscribedInCourse');
-    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);
@@ -6095,7 +6095,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));
 }
 
 
@@ -6123,8 +6123,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')
     )
 );
 
@@ -6186,12 +6186,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
 );
 
@@ -6246,12 +6246,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
 );
 
@@ -6328,16 +6328,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
 );
 
@@ -6403,13 +6403,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
 );
 
@@ -6452,13 +6452,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
 );
 
@@ -6503,13 +6503,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
 );
 
@@ -6546,13 +6546,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
 );
 
@@ -6588,13 +6588,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
 );
 
@@ -6628,13 +6628,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
 );
 
@@ -6671,13 +6671,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
 );
 
@@ -6716,13 +6716,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
 );
 

Braces +169 added lines, -62 removed lines

@@ -63,19 +63,22 @@ 
         list($ip1, $ip2) = 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);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -92,8 +95,9 @@ 
 
     $result = api_is_valid_secret_key($secret_key, $security_key);
 
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -553,7 +557,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;
     }
 
@@ -1012,7 +1018,9 @@ 
     if (empty($userId) && empty($sessionId) && empty($courseId)) {
         // try original values
 
-        if ($debug) error_log('try original values');
+        if ($debug) {
+            error_log('try original values');
+        }
 
         $userIdName = isset($params['original_user_id_name']) ? $params['original_user_id_name'] : 0;
         $userIdValue = isset($params['original_user_id_value']) ? $params['original_user_id_value'] : 0;
@@ -1044,9 +1052,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,
@@ -1076,13 +1090,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);
 
@@ -1095,13 +1113,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;
 }
@@ -1127,13 +1149,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);
 
@@ -1147,7 +1173,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;
         }
@@ -1155,7 +1183,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1207,8 +1237,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);
@@ -1244,22 +1278,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;
     }
 
@@ -1279,10 +1321,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??
@@ -1293,7 +1339,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)."',
@@ -1313,7 +1361,9 @@ 
                     active='1',
                     hr_dept_id=".intval($hr_dept_id);
             $sql .=    " 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) {
@@ -1330,11 +1380,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.
@@ -1350,7 +1404,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;
     }
 
@@ -1372,7 +1428,9 @@ 
             expiration_date     = '".Database::escape_string($expiration_date)."',
             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();
@@ -1384,7 +1442,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(
@@ -1421,7 +1481,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
         return 0;
     }
 
@@ -4480,7 +4542,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'];
@@ -4499,7 +4563,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
@@ -4517,13 +4583,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: ');
+                    }
                 }
             }
         }
@@ -4581,8 +4653,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);
     }
@@ -4597,7 +4673,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)) {
@@ -4605,14 +4683,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;
             }
         }
@@ -4664,8 +4750,12 @@ 
 // define the method WSGetUser
 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);
@@ -4718,8 +4808,12 @@ 
 // define the method WSGetUserFromUsername
 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);
@@ -5169,7 +5263,9 @@ 
                 $orig_session_id_value[] = $original_session_id_value;
                 $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
@@ -5253,7 +5349,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;
         }
     }
@@ -5399,7 +5497,9 @@ 
                 $orig_session_id_value[] = $original_session_id_value;
                 $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
@@ -5546,7 +5646,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();
@@ -5584,7 +5686,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;
                 $orig_course_id_value[] = $original_session_id_value;
@@ -5935,8 +6039,7 @@ 
             UserManager::create_extra_field($params['original_user_id_name'], 1, $params['original_user_id_name'], '');
             // Save the external system's id into user_field_value table.
             UserManager::update_extra_field_value($user_id, $params['original_user_id_name'], $params['original_user_id_value']);
-        }
-        else {
+        } else {
             return 0;
         }
     }
@@ -6086,8 +6189,12 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSUserSubscribedInCourse');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSUserSubscribedInCourse');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
 
         return returnError(WS_ERROR_SECRET_KEY);

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']);

Indentation +222 added lines, -222 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @package chamilo.webservices
- */
+     * @package chamilo.webservices
+     */
 require_once(dirname(__FILE__).'/../inc/global.inc.php');
 
 /**
@@ -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";
+    }
 }
 

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 {

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 +426 added lines, -426 removed lines

@@ -11,458 +11,458 @@
  */
 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()) {
         global $api_failureList;
-		// 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) {
-			$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') {
-				return new WSError(103, 'The encryption of the password is invalid');
-			} else {
-				return new WSError(104, 'There was an error creating the user');
-			}
-		} else {
-			return $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) {
+            $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') {
+                return new WSError(103, 'The encryption of the password is invalid');
+            } else {
+                return new WSError(104, 'There was an error creating the user');
+            }
+        } 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
-	) {
+    /**
+     * 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
+    ) {
         global $api_failureList;
-		$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;
-			}
+        $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) {
-				$failure = $api_failureList[0];
-				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');
-				}
-			} else {
-				return $result;
-			}
-		}
-	}
+            $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) {
+                $failure = $api_failureList[0];
+                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');
+                }
+            } 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 +36 added lines, -36 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,20 +223,20 @@ 
         global $api_failureList;
 		// 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'];
                     }
                 }
 		$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) {
 			$failure = $api_failureList[0];
-			if($failure == 'login-pass already taken') {
+			if ($failure == 'login-pass already taken') {
 				return new WSError(102, 'This username is already taken');
-			} else if($failure == 'encrypt_method invalid') {
+			} else if ($failure == 'encrypt_method invalid') {
 				return new WSError(103, 'The encryption of the password is invalid');
 			} else {
 				return new WSError(104, 'There was an error creating the user');
@@ -270,11 +270,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;
@@ -291,17 +291,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;
@@ -351,10 +351,10 @@ 
 	) {
         global $api_failureList;
 		$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);
@@ -383,7 +383,7 @@ 
 			);
 			if (!$result) {
 				$failure = $api_failureList[0];
-				if($failure == 'encrypt_method invalid') {
+				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');
@@ -415,19 +415,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);
 			}
 		}
@@ -443,18 +443,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/wiki/wiki.inc.php

Unused Use Statements -6 removed lines

@@ -1,14 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use Chamilo\CoreBundle\Component\Editor\Connector;
 use Chamilo\CoreBundle\Component\Filesystem\Data;
 use ChamiloSession as Session;
-use MediaAlchemyst\Alchemyst;
-use MediaAlchemyst\DriversContainer;
-use Neutron\TemporaryFilesystem\Manager;
-use Neutron\TemporaryFilesystem\TemporaryFilesystem;
-use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Class Wiki

Spacing +648 added lines, -648 removed lines

@@ -99,25 +99,25 @@ 
      **/
     public function links_to($input)
     {
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
         $all_links = array();
 
         foreach ($input_array as $key=>$value) {
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' &&
-                isset($input_array[$key+1]) && $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' &&
+                isset($input_array[$key + 1]) && $input_array[$key + 1] == ']]'
             ) {
                 if (api_strpos($value, "|") !== false) {
-                    $full_link_array=explode("|", $value);
-                    $link=trim($full_link_array[0]);
-                    $title=trim($full_link_array[1]);
+                    $full_link_array = explode("|", $value);
+                    $link = trim($full_link_array[0]);
+                    $title = trim($full_link_array[1]);
                 } else {
-                    $link=trim($value);
-                    $title=trim($value);
+                    $link = trim($value);
+                    $title = trim($value);
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
                 //replace blank spaces by _ within the links. But to remove links at the end add a blank space
-                $all_links[]= Database::escape_string(str_replace(' ','_',$link)).' ';
+                $all_links[] = Database::escape_string(str_replace(' ', '_', $link)).' ';
             }
         }
         $output = implode($all_links);
@@ -131,9 +131,9 @@ 
      **/
     public function detect_external_link($input)
     {
-        $exlink='href=';
-        $exlinkStyle='class="wiki_link_ext" href=';
-        $output=str_replace($exlink, $exlinkStyle, $input);
+        $exlink = 'href=';
+        $exlinkStyle = 'class="wiki_link_ext" href=';
+        $output = str_replace($exlink, $exlinkStyle, $input);
         return $output;
     }
 
@@ -144,7 +144,7 @@ 
     public function detect_anchor_link($input)
     {
         $anchorlink = 'href="#';
-        $anchorlinkStyle='class="wiki_anchor_link" href="#';
+        $anchorlinkStyle = 'class="wiki_anchor_link" href="#';
         $output = str_replace($anchorlink, $anchorlinkStyle, $input);
 
         return $output;
@@ -169,7 +169,7 @@ 
      **/
     public function detect_ftp_link($input)
     {
-        $ftplink='href="ftp';
+        $ftplink = 'href="ftp';
         $ftplinkStyle = 'class="wiki_ftp_link" href="ftp';
         $output = str_replace($ftplink, $ftplinkStyle, $input);
 
@@ -214,21 +214,21 @@ 
     {
         $groupId = api_get_group_id();
         //now doubles brackets
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 
         foreach ($input_array as $key => $value) {
             //now doubles brackets
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' AND
-                $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' AND
+                $input_array[$key + 1] == ']]'
             ) {
                 // now full wikilink
-                if (api_strpos($value, "|") !== false){
-                    $full_link_array=explode("|", $value);
-                    $link=trim(strip_tags($full_link_array[0]));
-                    $title=trim($full_link_array[1]);
+                if (api_strpos($value, "|") !== false) {
+                    $full_link_array = explode("|", $value);
+                    $link = trim(strip_tags($full_link_array[0]));
+                    $title = trim($full_link_array[1]);
                 } else {
-                    $link=trim(strip_tags($value));
-                    $title=trim($value);
+                    $link = trim(strip_tags($value));
+                    $title = trim($value);
                 }
 
                 //if wikilink is homepage
@@ -240,17 +240,17 @@ 
                 }
 
                 // note: checkreflink checks if the link is still free. If it is not used then it returns true, if it is used, then it returns false. Now the title may be different
-                if (self::checktitle(strtolower(str_replace(' ','_',$link)))) {
+                if (self::checktitle(strtolower(str_replace(' ', '_', $link)))) {
                     $link = api_html_entity_decode($link);
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
                 } else {
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ','_',$link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ', '_', $link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
             }
         }
-        $output = implode('',$input_array);
+        $output = implode('', $input_array);
         return $output;
     }
 
@@ -292,11 +292,11 @@ 
         // are not made here, but through the interce buttons
 
         // cleaning the variables
-        if (api_get_setting('htmlpurifier_wiki') == 'true'){
+        if (api_get_setting('htmlpurifier_wiki') == 'true') {
             //$purifier = new HTMLPurifier();
             $values['content'] = Security::remove_XSS($values['content']);
         }
-        $version = intval($values['version']) + 1 ;
+        $version = intval($values['version']) + 1;
         $linkTo = self::links_to($values['content']); //and check links content
 
         //cleaning config variables
@@ -319,7 +319,7 @@ 
             $_clean['startdate_assig'] = '0000-00-00 00:00:00';
         }
 
-        if (isset($values['initenddate']) && $values['initenddate']==1) {
+        if (isset($values['initenddate']) && $values['initenddate'] == 1) {
             $_clean['enddate_assig'] = $values['enddate_assig'];
         } else {
             $_clean['enddate_assig'] = '0000-00-00 00:00:00';
@@ -330,7 +330,7 @@ 
         }
 
         if (!empty($values['max_text']) || !empty($values['max_version'])) {
-            $_clean['max_text']	= $values['max_text'];
+            $_clean['max_text'] = $values['max_text'];
             $_clean['max_version'] = $values['max_version'];
         }
 
@@ -379,7 +379,7 @@ 
                 $groupId
             );
 
-            if ($values['page_id']== 0) {
+            if ($values['page_id'] == 0) {
                 $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'"
                         WHERE c_id = '.$course_id.' AND iid ="'.$id.'"';
                 Database::query($sql);
@@ -463,7 +463,7 @@ 
         $_course = $this->courseInfo;
         $r_user_id = api_get_user_id();
         $r_dtime = api_get_utc_datetime();
-        $r_version = $r_version+1;
+        $r_version = $r_version + 1;
         $r_comment = get_lang('RestoredFromVersion').': '.$c_version;
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
@@ -568,9 +568,9 @@ 
         // Unlike ordinary pages of pages of assignments.
         // Allow create a ordinary page although there is a assignment with the same name
         if ($_clean['assignment'] == 2 || $_clean['assignment'] == 1) {
-            $page = str_replace(' ','_',$values['title']."_uass".$assig_user_id);
+            $page = str_replace(' ', '_', $values['title']."_uass".$assig_user_id);
         } else {
-            $page = str_replace(' ','_',$values['title']);
+            $page = str_replace(' ', '_', $values['title']);
         }
         $_clean['reflink'] = $page;
         $_clean['title']   = trim($values['title']);
@@ -606,7 +606,7 @@ 
 
         $groupId = api_get_group_id();
 
-        $_clean['linksto'] = self::links_to($_clean['content']);	//check wikilinks
+        $_clean['linksto'] = self::links_to($_clean['content']); //check wikilinks
 
         // cleaning config variables
         $_clean['task'] = isset($values['task']) ? $values['task'] : '';
@@ -722,7 +722,7 @@ 
      */
     public function setForm($form, $row = array())
     {
-        $toolBar = api_is_allowed_to_edit(null,true)
+        $toolBar = api_is_allowed_to_edit(null, true)
             ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
             : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student');
 
@@ -733,7 +733,7 @@ 
 
         $form->addElement('select', 'progress', get_lang('Progress'), $progress);
 
-        if ((api_is_allowed_to_edit(false,true) ||
+        if ((api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin()) &&
             isset($row['reflink']) && $row['reflink'] != 'index'
         ) {
@@ -873,13 +873,13 @@ 
         if ($newtitle) {
             $pageMIX = $newtitle; //display the page after it is created
         } else {
-            $pageMIX = $page;//display current page
+            $pageMIX = $page; //display current page
         }
 
         $filter = null;
         if (isset($_GET['view']) && $_GET['view']) {
             $_clean['view'] = Database::escape_string($_GET['view']);
-            $filter =' AND w.id="'.$_clean['view'].'"';
+            $filter = ' AND w.id="'.$_clean['view'].'"';
         }
 
         // First, check page visibility in the first page version
@@ -921,14 +921,14 @@ 
         }
 
         // if both are empty and we are displaying the index page then we display the default text.
-        if ($row['content']=='' && $row['title']=='' && $page=='index') {
+        if ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
             if (api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
                 GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())
             ) {
                 //Table structure for better export to pdf
-                $default_table_for_content_Start='<table align="center" border="0"><tr><td align="center">';
-                $default_table_for_content_End='</td></tr></table>';
+                $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
+                $default_table_for_content_End = '</td></tr></table>';
                 $content = $default_table_for_content_Start.
                     sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).
                     $default_table_for_content_End;
@@ -943,23 +943,23 @@ 
 
         //assignment mode: identify page type
         $icon_assignment = null;
-        if ($row['assignment']==1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-        } elseif($row['assignment']==2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
+        if ($row['assignment'] == 1) {
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+        } elseif ($row['assignment'] == 2) {
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
         }
 
         //task mode
         $icon_task = null;
         if (!empty($row['task'])) {
-            $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+            $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
         }
 
         // Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view
         if ($KeyVisibility == "1" ||
             api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
-            ($row['assignment'] == 2 && $KeyVisibility=="0" && (api_get_user_id() == $row['user_id']))
+            ($row['assignment'] == 2 && $KeyVisibility == "0" && (api_get_user_id() == $row['user_id']))
         ) {
             $actionsLeft = '';
 
@@ -984,13 +984,13 @@ 
             $protect_page = null;
             $lock_unlock_protect = null;
             // page action: protecting (locking) the page
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                if (self::check_protect_page()==1) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                if (self::check_protect_page() == 1) {
                     $protect_page = Display::return_icon('lock.png', get_lang('PageLockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='unlock';
+                    $lock_unlock_protect = 'unlock';
                 } else {
                     $protect_page = Display::return_icon('unlock.png', get_lang('PageUnlockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='lock';
+                    $lock_unlock_protect = 'lock';
                 }
             }
 
@@ -1002,13 +1002,13 @@ 
             $visibility_page = null;
             $lock_unlock_visibility = null;
             //page action: visibility
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 if (self::check_visibility_page() == 1) {
-                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'invisible';
 
                 } else {
-                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'visible';
                 }
             }
@@ -1020,11 +1020,11 @@ 
 
             //page action: notification
             if (api_is_allowed_to_session_edit()) {
-                if (self::check_notify_page($page)==1) {
-                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                if (self::check_notify_page($page) == 1) {
+                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'unlocknotify';
                 } else {
-                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'locknotify';
                 }
             }
@@ -1036,33 +1036,33 @@ 
                 ) {
                     // menu discuss page
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=discuss&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('discuss').'>'.
-                        Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('discuss.png', get_lang('DiscussThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 //menu history
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=history&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('history').'>'.
-                    Display::return_icon('history.png',get_lang('ShowPageHistory'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('history.png', get_lang('ShowPageHistory'), '', ICON_SIZE_MEDIUM).'</a>';
                 //menu linkspages
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'action=links&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('links').'>'.
-                    Display::return_icon('what_link_here.png',get_lang('LinksPages'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 //menu delete wikipage
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?action=delete&'.api_get_cidreq().'&title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('delete').'>'.
-                        Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('delete.png', get_lang('DeleteThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=showpage&actionpage='.$lock_unlock_notify_page.'&title='.api_htmlentities(urlencode($page)).'">'.
                     $notify_page.'</a>';
 
                 // Page action: copy last version to doc area
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export2doc&wiki_id='.$row['id'].'">'.
                         Display::return_icon('export_to_documents.png', get_lang('ExportToDocArea'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf&wiki_id='.$row['id'].'">'.
-                    Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 $unoconv = api_get_configuration_value('unoconv.binaries');
                 if ($unoconv) {
@@ -1118,7 +1118,7 @@ 
                     )
                 );
 
-            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress']*10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
+            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress'] * 10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
 
             echo Display::panel($pageWiki, $pageTitle, $footerWiki);
         } //end filter visibility
@@ -1142,7 +1142,7 @@ 
 
         # strip all html tags
         $wc = strip_tags($document);
-        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8');// TODO:test also old html_entity_decode(utf8_encode($wc))
+        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8'); // TODO:test also old html_entity_decode(utf8_encode($wc))
 
         # remove 'words' that don't consist of alphanumerical characters or punctuation. And fix accents and some letters
         $pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@|á|é|í|ó|ú|à|è|ì|ò|ù|ä|ë|ï|ö|ü|Á|É|Í|Ó|Ú|À|È|Ò|Ù|Ä|Ë|Ï|Ö|Ü|â|ê|î|ô|û|Â|Ê|Î|Ô|Û|ñ|Ñ|ç|Ç)]+#";
@@ -1175,15 +1175,15 @@ 
 
         $course_id = api_get_course_int_id();
 
-        $sql='SELECT id FROM '.$tbl_wiki.'
+        $sql = 'SELECT id FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 title="'.Database::escape_string($title).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
-        $result=Database::query($sql);
-        $cant=Database::num_rows($result);
-        if ($cant>0) {
+        $result = Database::query($sql);
+        $cant = Database::num_rows($result);
+        if ($cant > 0) {
             return true;
         } else {
             return false;
@@ -1265,20 +1265,20 @@ 
         $page = $this->page;
 
         $course_id = api_get_course_int_id();
-        $sql='SELECT * FROM '.$tbl_wiki.'
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 reflink="'.Database::escape_string($page).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
 
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $status_editlock = $row['editlock'];
         $id = $row['id'];
 
         ///change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lock' && $status_editlock == 0) {
                 $status_editlock = 1;
             }
@@ -1290,13 +1290,13 @@ 
                     WHERE c_id = '.$course_id.' AND id="'.$id.'"';
             Database::query($sql);
 
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
@@ -1327,13 +1327,13 @@ 
         $row = Database::fetch_array($result);
         $status_visibility = $row['visibility'];
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='visible' && $status_visibility==0) {
-                $status_visibility=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'visible' && $status_visibility == 0) {
+                $status_visibility = 1;
 
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='invisible' && $status_visibility==1) {
-                $status_visibility=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'invisible' && $status_visibility == 1) {
+                $status_visibility = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility="'.Database::escape_string($status_visibility).'"
@@ -1350,12 +1350,12 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
         if (empty($row['id'])) {
-            $row['visibility']= 1;
+            $row['visibility'] = 1;
         }
 
         //show status
@@ -1382,18 +1382,18 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $status_visibility_disc = $row['visibility_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0) {
-                $status_visibility_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'showdisc' && $status_visibility_disc == 0) {
+                $status_visibility_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1) {
-                $status_visibility_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'hidedisc' && $status_visibility_disc == 1) {
+                $status_visibility_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility_disc="'.Database::escape_string($status_visibility_disc).'"
@@ -1441,14 +1441,14 @@ 
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
 
-        $status_addlock_disc=$row['addlock_disc'];
+        $status_addlock_disc = $row['addlock_disc'];
 
         //change status
         if (api_is_allowed_to_edit() || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockdisc' && $status_addlock_disc == 0) {
                 $status_addlock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockdisc' && $status_addlock_disc == 1) {
                 $status_addlock_disc = 0;
             }
 
@@ -1470,8 +1470,8 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['addlock_disc'];
@@ -1496,17 +1496,17 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $status_ratinglock_disc=$row['ratinglock_disc'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $status_ratinglock_disc = $row['ratinglock_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0) {
-                $status_ratinglock_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockrating' && $status_ratinglock_disc == 0) {
+                $status_ratinglock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockrating' && $status_ratinglock_disc==1) {
-                $status_ratinglock_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockrating' && $status_ratinglock_disc == 1) {
+                $status_ratinglock_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.'
@@ -1522,14 +1522,14 @@ 
             // these three lines remain necessary. They do that by changing the
             // page state is made when you press the button and not have to wait
             // to change his page
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['ratinglock_disc'];
@@ -1554,24 +1554,24 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $id = $row['id'];
-        $sql='SELECT * FROM '.$tbl_wiki_mailcue.'
+        $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
               WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify=0;
+            $status_notify = 0;
         } else {
-            $status_notify=1;
+            $status_notify = 1;
         }
 
         // Change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotify' && $status_notify==0) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotify' && $status_notify == 0) {
             $sql = "SELECT id FROM $tbl_wiki_mailcue
                     WHERE c_id = $course_id AND id = $id AND user_id = $userId";
             $result = Database::query($sql);
@@ -1580,18 +1580,18 @@ 
                 $exist = true;
             }
             if ($exist == false) {
-                $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+                $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
                 ($course_id, '".$id."','".api_get_user_id()."','P','".$groupId."','".$session_id."')";
                 Database::query($sql);
             }
-            $status_notify=1;
+            $status_notify = 1;
         }
 
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotify' && $status_notify==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotify' && $status_notify == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify=0;
+            $status_notify = 0;
         }
 
         return $status_notify;
@@ -1617,9 +1617,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $id=$row['id'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $id = $row['id'];
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"';
         $result = Database::query($sql);
@@ -1627,23 +1627,23 @@ 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         } else {
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifydisc' && $status_notify_disc==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifydisc' && $status_notify_disc == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".$id."','".api_get_user_id()."','D','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotifydisc' && $status_notify_disc==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotifydisc' && $status_notify_disc == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         }
 
         return $status_notify_disc;
@@ -1658,7 +1658,7 @@ 
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $course_id = api_get_course_int_id();
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
 
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE
@@ -1667,31 +1667,31 @@ 
                     type="F" AND
                     group_id="'.$groupId.'" AND
                     session_id="'.$session_id.'"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
-        $idm=$row['user_id'];
+        $idm = $row['user_id'];
 
         if (empty($idm)) {
-            $status_notify_all=0;
+            $status_notify_all = 0;
         } else {
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifyall' && $status_notify_all==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifyall' && $status_notify_all == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".api_get_user_id()."','F','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         if (isset($_GET['actionpage']) &&
             isset($_GET['actionpage']) &&
-            $_GET['actionpage']  =='unlocknotifyall' &&
+            $_GET['actionpage'] == 'unlocknotifyall' &&
             $status_notify_all == 1
         ) {
-            $sql ='DELETE FROM '.$tbl_wiki_mailcue.'
+            $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                    WHERE
                     c_id = '.$course_id.' AND
                     user_id="'.api_get_user_id().'" AND
@@ -1700,7 +1700,7 @@ 
                     session_id="'.$session_id.'" AND
                     c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_all=0;
+            $status_notify_all = 0;
         }
 
         //show status
@@ -1710,7 +1710,7 @@ 
     /**
      * Sends pending e-mails
      */
-    public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
+    public function check_emailcue($id_or_ref, $type, $lastime = '', $lastuser = '')
     {
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $tbl_wiki = $this->tbl_wiki;
@@ -1718,14 +1718,14 @@ 
         $groupfilter = $this->groupfilter;
         $_course = $this->courseInfo;
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-        $group_properties  = GroupManager :: get_group_properties($groupId);
+        $group_properties = GroupManager :: get_group_properties($groupId);
         $group_name = $group_properties['name'];
         $allow_send_mail = false; //define the variable to below
         $email_assignment = null;
-        if ($type=='P') {
+        if ($type == 'P') {
             //if modifying a wiki page
             //first, current author and time
             //Who is the author?
@@ -1736,22 +1736,22 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE  c_id = '.$course_id.' AND reflink="'.$id_or_ref.'" AND '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $id=$row['id'];
-            $email_page_name=$row['title'];
-            if ($row['visibility']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $id = $row['id'];
+            $email_page_name = $row['title'];
+            if ($row['visibility'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1761,10 +1761,10 @@ 
                             group_id="'.$groupId.'" AND
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full.
-                $result=Database::query($sql);
-                $emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $result = Database::query($sql);
+                $emailtext = get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif ($type=='D') {
+        } elseif ($type == 'D') {
             //if added a post to discuss
 
             //first, current author and time
@@ -1776,25 +1776,25 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
 
-            $id=$id_or_ref; //$id_or_ref is id from tblwiki
+            $id = $id_or_ref; //$id_or_ref is id from tblwiki
 
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'"
                     ORDER BY id ASC';
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $email_page_name=$row['title'];
-            if ($row['visibility_disc']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $email_page_name = $row['title'];
+            if ($row['visibility_disc'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1805,22 +1805,22 @@ 
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full
                 $result = Database::query($sql);
-                $emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $emailtext = get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif($type=='A') {
+        } elseif ($type == 'A') {
             //for added pages
-            $id=0; //for tbl_wiki_mailcue
+            $id = 0; //for tbl_wiki_mailcue
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.'
                     ORDER BY id DESC'; //the added is always the last
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
-            $email_page_name=$row['title'];
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
+            $email_page_name = $row['title'];
 
             //Who is the author?
             $userinfo = api_get_user_info($row['user_id']);
-            $email_user_author= get_lang('AddedBy').': '.$userinfo['complete_name'];
+            $email_user_author = get_lang('AddedBy').': '.$userinfo['complete_name'];
 
             //When ?
             $year = substr($row['dtime'], 0, 4);
@@ -1829,33 +1829,33 @@ 
             $hours = substr($row['dtime'], 11, 2);
             $minutes = substr($row['dtime'], 14, 2);
             $seconds = substr($row['dtime'], 17, 2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
-
-            if($row['assignment']==0) {
-                $allow_send_mail=true;
-            } elseif($row['assignment']==1) {
-                $email_assignment=get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
-                $allow_send_mail=true;
-            } elseif($row['assignment']==2) {
-                $allow_send_mail=false; //Mode tasks: avoids notifications to all users about all users
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+
+            if ($row['assignment'] == 0) {
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 1) {
+                $email_assignment = get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 2) {
+                $allow_send_mail = false; //Mode tasks: avoids notifications to all users about all users
             }
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND  id="'.$id.'" AND type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"';
             //type: P=page, D=discuss, F=full
-            $result=Database::query($sql);
+            $result = Database::query($sql);
 
-            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki');
-        } elseif ($type=='E') {
-            $id=0;
-            $allow_send_mail=true;
+            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '.get_lang('Wiki');
+        } elseif ($type == 'E') {
+            $id = 0;
+            $allow_send_mail = true;
 
             //Who is the author?
-            $userinfo = api_get_user_info(api_get_user_id());	//current user
+            $userinfo = api_get_user_info(api_get_user_id()); //current user
             $email_user_author = get_lang('DeletedBy').': '.$userinfo['complete_name'];
             //When ?
-            $today = date('r');		//current time
-            $email_date_changes=$today;
+            $today = date('r'); //current time
+            $email_date_changes = $today;
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE
@@ -1869,16 +1869,16 @@ 
         ///make and send email
         if ($allow_send_mail) {
             while ($row = Database::fetch_array($result)) {
-                $userinfo = api_get_user_info($row['user_id']);	//$row['user_id'] obtained from tbl_wiki_mailcue
+                $userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
                 $name_to = $userinfo['complete_name'];
                 $email_to = $userinfo['email'];
                 $sender_name = api_get_setting('emailAdministrator');
                 $sender_email = api_get_setting('emailAdministrator');
                 $email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code'];
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
-                if($session_id==0){
+                if ($session_id == 0) {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -1956,25 +1956,25 @@ 
             $template);
 
         if (0 != $groupId) {
-            $groupPart = '_group' . $groupId; // and add groupId to put the same document title in different groups
-            $group_properties  = GroupManager :: get_group_properties($groupId);
+            $groupPart = '_group'.$groupId; // and add groupId to put the same document title in different groups
+            $group_properties = GroupManager :: get_group_properties($groupId);
             $groupPath = $group_properties['directory'];
         } else {
             $groupPart = '';
-            $groupPath ='';
+            $groupPath = '';
         }
 
-        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path(). '/document'.$groupPath;
-        $exportFile = api_replace_dangerous_char($wikiTitle) . $groupPart;
+        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$groupPath;
+        $exportFile = api_replace_dangerous_char($wikiTitle).$groupPart;
         $wikiContents = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $wikiContents));
         //TODO: put link instead of title
 
         $wikiContents = str_replace('{CONTENT}', $wikiContents, $template);
 
         // replace relative path by absolute path for courses, so you can see items into this page wiki (images, mp3, etc..) exported in documents
-        if (api_strpos($wikiContents,'../../courses/') !== false) {
+        if (api_strpos($wikiContents, '../../courses/') !== false) {
             $web_course_path = api_get_path(WEB_COURSE_PATH);
-            $wikiContents = str_replace('../../courses/',$web_course_path,$wikiContents);
+            $wikiContents = str_replace('../../courses/', $web_course_path, $wikiContents);
         }
 
         $i = 1;
@@ -1983,8 +1983,8 @@ 
             $i++;
         }
 
-        $wikiFileName = $exportFile . '_' . $i . '.html';
-        $exportPath = $exportDir . '/' . $wikiFileName;
+        $wikiFileName = $exportFile.'_'.$i.'.html';
+        $exportPath = $exportDir.'/'.$wikiFileName;
 
         file_put_contents($exportPath, $wikiContents);
         $doc_id = add_document(
@@ -2029,14 +2029,14 @@ 
         $content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding());
 
         //clean wiki links
-        $content_pdf=trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
+        $content_pdf = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
         //TODO: It should be better to display the link insted of the tile but it is hard for [[title]] links
 
         $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding());
         $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
         $content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
 
-        $html='
+        $html = '
         <!-- defines the headers/footers - this must occur before the headers/footers are set -->
 
         <!--mpdf
@@ -2091,9 +2091,9 @@ 
         $session_id = $this->session_id;
         $groupId = api_get_group_id();
 
-        if ($groupId==0) {
+        if ($groupId == 0) {
             //extract course members
-            if(!empty($session_id)) {
+            if (!empty($session_id)) {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id);
             } else {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), 0);
@@ -2119,7 +2119,7 @@ 
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username'], ENT_QUOTES));
         $name = $userinfo['complete_name']." - ".$username;
 
-        $photo = '<img src="' . $userinfo['avatar'] . '" alt="' . $name . '"  width="40" height="50" align="top" title="' . $name . '"  />';
+        $photo = '<img src="'.$userinfo['avatar'].'" alt="'.$name.'"  width="40" height="50" align="top" title="'.$name.'"  />';
 
         // teacher assignment title
         $title_orig = $values['title'];
@@ -2147,24 +2147,24 @@ 
                 $userPicture = UserManager::getUserPicture($assig_user_id);
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $o_user_to_add['username'], ENT_QUOTES));
                 $name = api_get_person_name($o_user_to_add['firstname'], $o_user_to_add['lastname'])." . ".$username;
-                $photo= '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
+                $photo = '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
 
                 $is_tutor_of_group = GroupManager::is_tutor_of_group($assig_user_id, $groupId); //student is tutor
                 $is_tutor_and_member = GroupManager::is_tutor_of_group($assig_user_id, $groupId) && GroupManager::is_subscribed($assig_user_id, $groupId);
                 // student is tutor and member
 
                 if ($is_tutor_and_member) {
-                    $status_in_group=get_lang('GroupTutorAndMember');
+                    $status_in_group = get_lang('GroupTutorAndMember');
                 } else {
-                    if($is_tutor_of_group) {
-                        $status_in_group=get_lang('GroupTutor');
+                    if ($is_tutor_of_group) {
+                        $status_in_group = get_lang('GroupTutor');
                     } else {
-                        $status_in_group=" "; //get_lang('GroupStandardMember')
+                        $status_in_group = " "; //get_lang('GroupStandardMember')
                     }
                 }
 
-                if ($assignment_type==1) {
-                    $values['title']= $title_orig;
+                if ($assignment_type == 1) {
+                    $values['title'] = $title_orig;
                     $values['content'] = '<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6">
                     <table border="0">
                     <tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr>
@@ -2180,7 +2180,7 @@ 
                         ).
                         ' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>';
                     //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
-                    $values['assignment']=2;
+                    $values['assignment'] = 2;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2189,12 +2189,12 @@ 
 
         foreach ($a_users_to_add as $o_user_to_add) {
             if ($o_user_to_add['user_id'] == $userId) {
-                $assig_user_id=$o_user_to_add['user_id'];
+                $assig_user_id = $o_user_to_add['user_id'];
                 if ($assignment_type == 1) {
-                    $values['title']= $title_orig;
-                    $values['comment']=get_lang('AssignmentDesc');
+                    $values['title'] = $title_orig;
+                    $values['comment'] = get_lang('AssignmentDesc');
                     sort($all_students_pages);
-                    $values['content']=$content_orig_A.$content_orig_B.'<br/>
+                    $values['content'] = $content_orig_A.$content_orig_B.'<br/>
                     <div align="center" style="font-size:18px; background-color: #F5F8FB; border:solid; border-color:#E6E6E6">
                     '.get_lang('AssignmentLinkstoStudentsPage').'
                     </div><br/>
@@ -2202,7 +2202,7 @@ 
                     <ol>'.implode($all_students_pages).'</ol>
                     </div>
                     <br/>';
-                    $values['assignment']=1;
+                    $values['assignment'] = 1;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2216,7 +2216,7 @@ 
      * @param   int     Whether to search the contents (1) or just the titles (0)
      * @param int
      */
-    public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0)
+    public function display_wiki_search_results($search_term, $search_content = 0, $all_vers = 0)
     {
         $tbl_wiki = $this->tbl_wiki;
         $condition_session = $this->condition_session;
@@ -2228,9 +2228,9 @@ 
         echo '</legend>';
 
         //only by professors when page is hidden
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if ($all_vers=='1') {
-                if ($search_content=='1') {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if ($all_vers == '1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
@@ -2247,7 +2247,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if ($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2298,7 +2298,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2346,17 +2346,17 @@ 
                 $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
-                if($obj->assignment==1) {
-                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
                 $row = array();
                 $row[] = $ShowAssignment;
 
-                if($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&view='.$obj->id.'&session_id='.api_htmlentities(urlencode($_GET['$session_id'])).'&group_id='.api_htmlentities(urlencode($_GET['group_id'])).'">'.
                         api_htmlentities($obj->title).'</a>';
                 } else {
@@ -2367,21 +2367,21 @@ 
                 $row[] = $obj->user_id != 0 ? UserManager::getUserProfileLink($userinfo) : get_lang('Anonymous').' ('.$obj->user_ip.')';
                 $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
 
-                if ($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = $obj->version;
                 } else {
                     $showdelete = '';
-                    if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                        $showdelete=' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                        $showdelete = ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                     }
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
@@ -2406,16 +2406,16 @@ 
                     'all_vers' => $all_vers,
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
             if ($all_vers == '1') {
-                $table->set_header(2,get_lang('Author'), true);
-                $table->set_header(3,get_lang('Date'), true);
-                $table->set_header(4,get_lang('Version'), true);
+                $table->set_header(2, get_lang('Author'), true);
+                $table->set_header(3, get_lang('Date'), true);
+                $table->set_header(4, get_lang('Version'), true);
             } else {
-                $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(4,get_lang('Actions'), false, array ('style' => 'width:130px;'));
+                $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(4, get_lang('Actions'), false, array('style' => 'width:130px;'));
             }
             $table->display();
         } else {
@@ -2428,14 +2428,14 @@ 
      * @todo replace this function with the formvalidator datepicker
      *
      */
-    public function draw_date_picker($prefix,$default='')
+    public function draw_date_picker($prefix, $default = '')
     {
         if (empty($default)) {
             $default = date('Y-m-d H:i:s');
         }
         $parts = explode(' ', $default);
-        list($d_year,$d_month,$d_day) = explode('-',$parts[0]);
-        list($d_hour,$d_minute) = explode(':',$parts[1]);
+        list($d_year, $d_month, $d_day) = explode('-', $parts[0]);
+        list($d_hour, $d_minute) = explode(':', $parts[1]);
 
         $month_list = array(
             1 => get_lang('JanuaryLong'),
@@ -2452,9 +2452,9 @@ 
             12 => get_lang('DecemberLong'),
         );
 
-        $minute = range(10,59);
-        array_unshift($minute,'00','01','02','03','04','05','06','07','08','09');
-        $date_form = self::make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day);
+        $minute = range(10, 59);
+        array_unshift($minute, '00', '01', '02', '03', '04', '05', '06', '07', '08', '09');
+        $date_form = self::make_select($prefix.'_day', array_combine(range(1, 31), range(1, 31)), $d_day);
         $date_form .= self::make_select($prefix.'_month', $month_list, $d_month);
         $date_form .= self::make_select(
                 $prefix.'_year',
@@ -2467,7 +2467,7 @@ 
                 ),
                 $d_year
             ).'&nbsp;&nbsp;&nbsp;&nbsp;';
-        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : ';
+        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0, 23), range(0, 23)), $d_hour).' : ';
         $date_form .= self::make_select($prefix.'_minute', $minute, $d_minute);
 
         return $date_form;
@@ -2477,11 +2477,11 @@ 
      * Draws an HTML form select with the given options
      *
      */
-    public function make_select($name,$values,$checked='')
+    public function make_select($name, $values, $checked = '')
     {
         $output = '<select name="'.$name.'" id="'.$name.'">';
-        foreach($values as $key => $value) {
-            $output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>';
+        foreach ($values as $key => $value) {
+            $output .= '<option value="'.$key.'" '.(($checked == $key) ? 'selected="selected"' : '').'>'.$value.'</option>';
         }
         $output .= '</select>';
         return $output;
@@ -2505,7 +2505,7 @@ 
      */
     public function two_digits($number)
     {
-        $number = (int)$number;
+        $number = (int) $number;
         return ($number < 10) ? '0'.$number : $number;
     }
 
@@ -2523,7 +2523,7 @@ 
                 WHERE c_id = '.$course_id.' AND id = '.$id.' ';
         $result = Database::query($sql);
         $data = array();
-        while ($row=Database::fetch_array($result,'ASSOC'))   {
+        while ($row = Database::fetch_array($result, 'ASSOC')) {
             $data = $row;
         }
         return $data;
@@ -2577,7 +2577,7 @@ 
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
-            $data = Database::fetch_array($result,'ASSOC');
+            $data = Database::fetch_array($result, 'ASSOC');
         }
 
         return $data;
@@ -2671,9 +2671,9 @@ 
         $result = self::getAllWiki();
         if (!empty($result)) {
             foreach ($result  as $is_editing_block) {
-                $max_edit_time	= 1200; // 20 minutes
-                $timestamp_edit	= strtotime($is_editing_block['time_edit']);
-                $time_editing	= time()-$timestamp_edit;
+                $max_edit_time = 1200; // 20 minutes
+                $timestamp_edit = strtotime($is_editing_block['time_edit']);
+                $time_editing = time() - $timestamp_edit;
 
                 // First prevent concurrent users and double version
                 if ($is_editing_block['is_editing'] == $userId) {
@@ -2682,7 +2682,7 @@ 
                     unset($_SESSION['_version']);
                 }
                 // Second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author
-                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action!='edit')) {
+                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action != 'edit')) {
                     self::updateWikiIsEditing($is_editing_block['is_editing']);
                 }
             }
@@ -2730,7 +2730,7 @@ 
                 FROM ".$tbl_wiki."
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
 
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
             $total_versions = $row['TOTAL_VERS'];
             $total_visits = intval($row['TOTAL_VISITS']);
@@ -2740,30 +2740,30 @@ 
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $total_words = $total_words + self::word_count($row['content']);
-            $total_links 			= $total_links+substr_count($row['content'], "href=");
-            $total_links_anchors 	= $total_links_anchors+substr_count($row['content'], 'href="#');
-            $total_links_mail		= $total_links_mail+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp 		= $total_links_ftp+substr_count($row['content'], 'href="ftp');
-            $total_links_irc		= $total_links_irc+substr_count($row['content'], 'href="irc');
-            $total_links_news 		= $total_links_news+substr_count($row['content'], 'href="news');
-            $total_wlinks 			= $total_wlinks+substr_count($row['content'], "[[");
-            $total_images 			= $total_images+substr_count($row['content'], "<img");
+            $total_links = $total_links + substr_count($row['content'], "href=");
+            $total_links_anchors = $total_links_anchors + substr_count($row['content'], 'href="#');
+            $total_links_mail		= $total_links_mail + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp 		= $total_links_ftp + substr_count($row['content'], 'href="ftp');
+            $total_links_irc = $total_links_irc + substr_count($row['content'], 'href="irc');
+            $total_links_news = $total_links_news + substr_count($row['content'], 'href="news');
+            $total_wlinks 			= $total_wlinks + substr_count($row['content'], "[[");
+            $total_images 			= $total_images + substr_count($row['content'], "<img");
             $clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash			= $total_flash+substr_count($clean_total_flash, '.swf"');
+            $total_flash = $total_flash + substr_count($clean_total_flash, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3				= $total_mp3+substr_count($row['content'], ".mp3");
-            $total_flv_p = $total_flv_p+substr_count($row['content'], ".flv");
-            $total_flv				=	$total_flv_p/5;
-            $total_youtube			= $total_youtube+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia		= $total_multimedia+substr_count($row['content'], "video/x-msvideo");
-            $total_tables			= $total_tables+substr_count($row['content'], "<table");
+            $total_mp3				= $total_mp3 + substr_count($row['content'], ".mp3");
+            $total_flv_p = $total_flv_p + substr_count($row['content'], ".flv");
+            $total_flv				= $total_flv_p / 5;
+            $total_youtube = $total_youtube + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia = $total_multimedia + substr_count($row['content'], "video/x-msvideo");
+            $total_tables = $total_tables + substr_count($row['content'], "<table");
         }
 
         //check only last version of all pages (current page)
 
-        $sql =' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
+        $sql = ' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=(
                     SELECT MAX(s2.id)
@@ -2774,9 +2774,9 @@ 
                         '.$groupfilter.' AND
                         session_id='.$session_id.')';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_pages	 		= $row['TOTAL_PAGES'];
-            $total_visits_lv 		= intval($row['TOTAL_VISITS_LV']);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_pages = $row['TOTAL_PAGES'];
+            $total_visits_lv = intval($row['TOTAL_VISITS_LV']);
         }
 
         $total_words_lv = 0;
@@ -2808,29 +2808,29 @@ 
                 )';
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            $total_words_lv 		= $total_words_lv+ self::word_count($row['content']);
-            $total_links_lv 		= $total_links_lv+substr_count($row['content'], "href=");
-            $total_links_anchors_lv	= $total_links_anchors_lv+substr_count($row['content'], 'href="#');
-            $total_links_mail_lv 	= $total_links_mail_lv+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp_lv 	= $total_links_ftp_lv+substr_count($row['content'], 'href="ftp');
-            $total_links_irc_lv 	= $total_links_irc_lv+substr_count($row['content'], 'href="irc');
-            $total_links_news_lv 	= $total_links_news_lv+substr_count($row['content'], 'href="news');
-            $total_wlinks_lv 		= $total_wlinks_lv+substr_count($row['content'], "[[");
-            $total_images_lv 		= $total_images_lv+substr_count($row['content'], "<img");
+        while ($row = Database::fetch_array($allpages)) {
+            $total_words_lv 		= $total_words_lv + self::word_count($row['content']);
+            $total_links_lv 		= $total_links_lv + substr_count($row['content'], "href=");
+            $total_links_anchors_lv = $total_links_anchors_lv + substr_count($row['content'], 'href="#');
+            $total_links_mail_lv 	= $total_links_mail_lv + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp_lv 	= $total_links_ftp_lv + substr_count($row['content'], 'href="ftp');
+            $total_links_irc_lv 	= $total_links_irc_lv + substr_count($row['content'], 'href="irc');
+            $total_links_news_lv 	= $total_links_news_lv + substr_count($row['content'], 'href="news');
+            $total_wlinks_lv 		= $total_wlinks_lv + substr_count($row['content'], "[[");
+            $total_images_lv 		= $total_images_lv + substr_count($row['content'], "<img");
             $clean_total_flash_lv = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash_lv			= $total_flash_lv+substr_count($clean_total_flash_lv, '.swf"');
+            $total_flash_lv = $total_flash_lv + substr_count($clean_total_flash_lv, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3_lv			= $total_mp3_lv+substr_count($row['content'], ".mp3");
-            $total_flv_p_lv = $total_flv_p_lv+substr_count($row['content'], ".flv");
-            $total_flv_lv			= $total_flv_p_lv/5;
-            $total_youtube_lv		= $total_youtube_lv+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia_lv	= $total_multimedia_lv+substr_count($row['content'], "video/x-msvideo");
-            $total_tables_lv		= $total_tables_lv+substr_count($row['content'], "<table");
+            $total_mp3_lv			= $total_mp3_lv + substr_count($row['content'], ".mp3");
+            $total_flv_p_lv = $total_flv_p_lv + substr_count($row['content'], ".flv");
+            $total_flv_lv			= $total_flv_p_lv / 5;
+            $total_youtube_lv = $total_youtube_lv + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia_lv = $total_multimedia_lv + substr_count($row['content'], "video/x-msvideo");
+            $total_tables_lv = $total_tables_lv + substr_count($row['content'], "<table");
         }
 
         //Total pages edited at this time
-        $total_editing_now=0;
+        $total_editing_now = 0;
         $sql = 'SELECT *, COUNT(*) AS TOTAL_EDITING_NOW
                 FROM  '.$tbl_wiki.' s1
                 WHERE is_editing!=0 AND s1.c_id = '.$course_id.' AND
@@ -2845,66 +2845,66 @@ 
         )';
 
         // Can not use group by because the mark is set in the latest version
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_editing_now	= $row['TOTAL_EDITING_NOW'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_editing_now = $row['TOTAL_EDITING_NOW'];
         }
 
         // Total hidden pages
-        $total_hidden=0;
+        $total_hidden = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND visibility=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of hidden places it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_hidden = $total_hidden+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_hidden = $total_hidden + 1;
         }
 
         //Total protect pages
-        $total_protected=0;
+        $total_protected = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND editlock=1 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of protected page is the first version of the page, I can use group by
 
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_protected = $total_protected+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_protected = $total_protected + 1;
         }
 
         // Total empty versions.
-        $total_empty_content=0;
+        $total_empty_content = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE
                     c_id = '.$course_id.' AND
                     content="" AND
                     '.$groupfilter.$condition_session.'';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_empty_content	= $total_empty_content+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_empty_content = $total_empty_content + 1;
         }
 
         //Total empty pages (last version)
 
-        $total_empty_content_lv=0;
+        $total_empty_content_lv = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND content="" AND id=(
                 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s1.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_empty_content_lv	= $total_empty_content_lv+1;
+            $total_empty_content_lv = $total_empty_content_lv + 1;
         }
 
         // Total locked discuss pages
-        $total_lock_disc=0;
+        $total_lock_disc = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND addlock_disc=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_lock_disc	= $total_lock_disc+1;
+            $total_lock_disc = $total_lock_disc + 1;
         }
 
         // Total hidden discuss pages.
@@ -2915,7 +2915,7 @@ 
         //group by because mark lock in all vers, then always is ok
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_hidden_disc	= $total_hidden_disc+1;
+            $total_hidden_disc = $total_hidden_disc + 1;
         }
 
         //Total versions with any short comment by user or system
@@ -2923,44 +2923,44 @@ 
         $total_comment_version = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.'';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_comment_version	= $total_comment_version+1;
+            $total_comment_version = $total_comment_version + 1;
         }
 
         // Total pages that can only be scored by teachers.
 
-        $total_only_teachers_rating=0;
+        $total_only_teachers_rating = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND
                 ratinglock_disc = 0 AND
                 '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_only_teachers_rating	= $total_only_teachers_rating+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_only_teachers_rating = $total_only_teachers_rating + 1;
         }
 
         // Total pages scored by peers
         // put always this line alfter check num all pages and num pages rated by teachers
-        $total_rating_by_peers=$total_pages-$total_only_teachers_rating;
+        $total_rating_by_peers = $total_pages - $total_only_teachers_rating;
 
         //Total pages identified as standard task
 
-        $total_task=0;
-        $sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
+        $total_task = 0;
+        $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
               WHERE '.$tbl_wiki_conf.'.c_id = '.$course_id.' AND
                '.$tbl_wiki_conf.'.task!="" AND
                '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND
                 '.$tbl_wiki.'.'.$groupfilter.$condition_session;
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_task=$total_task+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_task = $total_task + 1;
         }
 
         //Total pages identified as teacher page (wiki portfolio mode - individual assignment)
 
-        $total_teacher_assignment=0;
+        $total_teacher_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=(
                     SELECT MAX(s2.id)
@@ -2970,20 +2970,20 @@ 
         //mark all versions, but do not use group by reflink because y want the pages not versions
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_teacher_assignment=$total_teacher_assignment+1;
+            $total_teacher_assignment = $total_teacher_assignment + 1;
         }
 
         //Total pages identifies as student page (wiki portfolio mode - individual assignment)
 
-        $total_student_assignment=0;
+        $total_student_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=2 AND
                 id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
         //mark all versions, but do not use group by reflink because y want the pages not versions
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_student_assignment = $total_student_assignment+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_student_assignment = $total_student_assignment + 1;
         }
 
         //Current Wiki status add new pages
@@ -2992,36 +2992,36 @@ 
                 GROUP BY addlock';//group by because mark 0 in all vers, then always is ok
         $allpages = Database::query($sql);
         $wiki_add_lock = null;
-        while ($row=Database::fetch_array($allpages)) {
-            $wiki_add_lock=$row['addlock'];
+        while ($row = Database::fetch_array($allpages)) {
+            $wiki_add_lock = $row['addlock'];
         }
 
-        if ($wiki_add_lock==1) {
-            $status_add_new_pag=get_lang('Yes');
+        if ($wiki_add_lock == 1) {
+            $status_add_new_pag = get_lang('Yes');
         } else {
-            $status_add_new_pag=get_lang('No');
+            $status_add_new_pag = get_lang('No');
         }
 
         //Creation date of the oldest wiki page and version
 
-        $first_wiki_date='0000-00-00 00:00:00';
+        $first_wiki_date = '0000-00-00 00:00:00';
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 ORDER BY dtime ASC LIMIT 1';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $first_wiki_date=$row['dtime'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $first_wiki_date = $row['dtime'];
         }
 
         // Date of publication of the latest wiki version.
 
-        $last_wiki_date='0000-00-00 00:00:00';
+        $last_wiki_date = '0000-00-00 00:00:00';
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 ORDER BY dtime DESC LIMIT 1';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $last_wiki_date=$row['dtime'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $last_wiki_date = $row['dtime'];
         }
 
         // Average score of all wiki pages. (If a page has not scored zero rated)
@@ -3033,18 +3033,18 @@ 
         // Do not use "count" because using "group by", would give a wrong value
         $allpages = Database::query($sql);
         $total_score = 0;
-        while ($row=Database::fetch_array($allpages)) {
-            $total_score = $total_score+$row['TOTAL_SCORE'];
+        while ($row = Database::fetch_array($allpages)) {
+            $total_score = $total_score + $row['TOTAL_SCORE'];
         }
 
         if (!empty($total_pages)) {
-            $media_score = $total_score/$total_pages;
+            $media_score = $total_score / $total_pages;
             //put always this line alfter check num all pages
         }
 
         // Average user progress in his pages.
 
-        $media_progress=0;
+        $media_progress = 0;
         $sql = 'SELECT  *, SUM(progress) AS TOTAL_PROGRESS
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=
@@ -3058,24 +3058,24 @@ 
         // As the value is only the latest version I can not use group by
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_progress	= $row['TOTAL_PROGRESS'];
+            $total_progress = $row['TOTAL_PROGRESS'];
         }
 
         if (!empty($total_pages)) {
-            $media_progress=$total_progress/$total_pages;
+            $media_progress = $total_progress / $total_pages;
             //put always this line alfter check num all pages
         }
 
         //Total users that have participated in the Wiki
 
-        $total_users=0;
+        $total_users = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY user_id';
         //as the mark of user it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_users = $total_users+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_users = $total_users + 1;
         }
 
         // Total of different IP addresses that have participated in the wiki
@@ -3083,9 +3083,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
               GROUP BY user_ip';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_ip	= $total_ip+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_ip = $total_ip + 1;
         }
 
         echo '<table class="data_table">';
@@ -3284,11 +3284,11 @@ 
                 } else {
                     $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                 }
-                $row[] ='<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
+                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'MostActiveUsersA_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'MostActiveUsersA_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -3297,8 +3297,8 @@ 
                     'group_id' => Security::remove_XSS($_GET['group_id'])
                 )
             );
-            $table->set_header(0,get_lang('Author'), true);
-            $table->set_header(1,get_lang('Contributions'), true,array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Author'), true);
+            $table->set_header(1, get_lang('Contributions'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -3314,8 +3314,8 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_discuss = $this->tbl_wiki_discuss;
 
-        if (api_get_session_id()!=0 &&
-            api_is_allowed_to_session_edit(false,true)==false
+        if (api_get_session_id() != 0 &&
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -3378,9 +3378,9 @@ 
         //mode assignment: previous to show  page type
         $icon_assignment = null;
         if ($row['assignment'] == 1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
         } elseif ($row['assignment'] == 2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
         $countWPost = null;
@@ -3391,23 +3391,23 @@ 
             // Show discussion to students if isn't hidden.
             // Show page to all teachers if is hidden.
             // Mode assignments: If is hidden, show pages to student only if student is the author
-            if ($row['visibility_disc']==1 ||
-                api_is_allowed_to_edit(false,true) ||
+            if ($row['visibility_disc'] == 1 ||
+                api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
-                ($row['assignment']==2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id']))
+                ($row['assignment'] == 2 && $row['visibility_disc'] == 0 && (api_get_user_id() == $row['user_id']))
             ) {
                 echo '<div id="wikititle">';
 
                 // discussion action: protecting (locking) the discussion
                 $addlock_disc = null;
                 $lock_unlock_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_addlock_discuss() == 1) {
-                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='unlockdisc';
+                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'unlockdisc';
                     } else {
-                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='lockdisc';
+                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'lockdisc';
                     }
                 }
                 echo '<span style="float:right">';
@@ -3417,13 +3417,13 @@ 
                 // discussion action: visibility.  Show discussion to students if isn't hidden. Show page to all teachers if is hidden.
                 $visibility_disc = null;
                 $hide_show_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                    if (self::check_visibility_discuss()==1) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                    if (self::check_visibility_discuss() == 1) {
                         /// TODO: 	Fix Mode assignments: If is hidden, show discussion to student only if student is the author
-                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'hidedisc';
                     } else {
-                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'showdisc';
                     }
                 }
@@ -3434,12 +3434,12 @@ 
                 //discussion action: check add rating lock. Show/Hide list to rating for all student
                 $lock_unlock_rating_disc = null;
                 $ratinglock_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_ratinglock_discuss() == 1) {
-                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'unlockrating';
                     } else {
-                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'lockrating';
                     }
                 }
@@ -3450,11 +3450,11 @@ 
 
                 //discussion action: email notification
                 if (self::check_notify_discuss($page) == 1) {
-                    $notify_disc= Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='unlocknotifydisc';
+                    $notify_disc = Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'unlocknotifydisc';
                 } else {
-                    $notify_disc= Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='locknotifydisc';
+                    $notify_disc = Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'locknotifydisc';
                 }
                 echo '<span style="float:right">';
                 echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_notify_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_disc.'</a>';
@@ -3466,22 +3466,22 @@ 
 
                 echo '</div>';
 
-                if ($row['addlock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if ($row['addlock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     //show comments but students can't add theirs
                     ?>
                     <form name="form1" method="post" action="">
                         <table>
                             <tr>
-                                <td valign="top" ><?php echo get_lang('Comments');?>:</td>
-                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post ?>
+                                <td valign="top" ><?php echo get_lang('Comments'); ?>:</td>
+                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">'; //prevent double post ?>
                                 <td><textarea name="comment" cols="80" rows="5" id="comment"></textarea></td>
                             </tr>
                             <tr>
                                 <?php
                                 //check if rating is allowed
-                                if ($row['ratinglock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                                if ($row['ratinglock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                                     ?>
-                                    <td><?php echo get_lang('Rating');?>: </td>
+                                    <td><?php echo get_lang('Rating'); ?>: </td>
                                     <td valign="top"><select name="rating" id="rating">
                                             <option value="-" selected>-</option>
                                             <option value="0">0</option>
@@ -3498,7 +3498,7 @@ 
                                         </select></td>
                                 <?php
                                 } else {
-                                    echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically
+                                    echo '<input type=hidden name="rating" value="-">'; // must pass a default value to avoid rate automatically
                                 }
                                 ?>
                             </tr>
@@ -3538,12 +3538,12 @@ 
                 $sql = "SELECT * FROM $tbl_wiki_discuss
                         WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
                 $result3 = Database::query($sql);
-                $countWPost_score= Database::num_rows($result3);
+                $countWPost_score = Database::num_rows($result3);
 
-                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
+                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score; //
 
-                if ($countWPost_score!=0) {
-                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10';
+                if ($countWPost_score != 0) {
+                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score, 2).' / 10';
                 } else {
                     $avg_WPost_score = $countWPost_score;
                 }
@@ -3561,16 +3561,16 @@ 
 
                 echo '<hr noshade size="1">';
 
-                while ($row=Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result)) {
                     $userinfo = api_get_user_info($row['userc_id']);
-                    if (($userinfo['status'])=="5") {
-                        $author_status=get_lang('Student');
+                    if (($userinfo['status']) == "5") {
+                        $author_status = get_lang('Student');
                     } else {
-                        $author_status=get_lang('Teacher');
+                        $author_status = get_lang('Teacher');
                     }
 
                     $name = $userinfo['complete_name'];
-                    $author_photo= '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
+                    $author_photo = '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
 
                     //stars
                     $p_score = $row['p_score'];
@@ -3649,7 +3649,7 @@ 
         }
         echo '</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT  *
                     FROM  '.$tbl_wiki.' s1
         		    WHERE s1.c_id = '.$course_id.' AND id=(
@@ -3675,26 +3675,26 @@ 
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 //get icon task
                 if (!empty($obj->task)) {
-                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                    $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
                 } else {
-                    $icon_task= Display::return_icon('px_transparent.gif');
+                    $icon_task = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
                 $row[] = $ShowAssignment.$icon_task;
                 $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">
                 '.api_htmlentities($obj->title).'</a>';
-                if ($obj->user_id <>0) {
+                if ($obj->user_id <> 0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
                 }
                 else {
@@ -3702,29 +3702,29 @@ 
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
                 $showdelete = '';
-                if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                    $showdelete =' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                    $showdelete = ' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                 }
-                if (api_is_allowed_to_session_edit(false,true) ) {
+                if (api_is_allowed_to_session_edit(false, true)) {
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'AllPages_table','','','ASC');
-            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'group_id'=>Security::remove_XSS($_GET['group_id'])));
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-            $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-            if (api_is_allowed_to_session_edit(false,true) ) {
-                $table->set_header(4,get_lang('Actions'), true, array ('style' => 'width:130px;'));
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'AllPages_table', '', '', 'ASC');
+            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']), 'action'=>Security::remove_XSS($action), 'group_id'=>Security::remove_XSS($_GET['group_id'])));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+            $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+            if (api_is_allowed_to_session_edit(false, true)) {
+                $table->set_header(4, get_lang('Actions'), true, array('style' => 'width:130px;'));
             }
             $table->display();
         }
@@ -3744,13 +3744,13 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_conf = $this->tbl_wiki_conf;
 
-        if (api_is_allowed_to_session_edit(false,true) ) {
-            if (self::check_notify_all()==1) {
-                $notify_all= Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
-                $lock_unlock_notify_all='unlocknotifyall';
+        if (api_is_allowed_to_session_edit(false, true)) {
+            if (self::check_notify_all() == 1) {
+                $notify_all = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
+                $lock_unlock_notify_all = 'unlocknotifyall';
             } else {
-                $notify_all=Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
-                $lock_unlock_notify_all='locknotifyall';
+                $notify_all = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
+                $lock_unlock_notify_all = 'locknotifyall';
             }
         }
 
@@ -3758,7 +3758,7 @@ 
         echo '<a href="index.php?action=recentchanges&amp;actionpage='.$lock_unlock_notify_all.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_all.'</a>';
         echo '</span>'.get_lang('RecentChanges').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
         		WHERE 	'.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
         				'.$tbl_wiki.'.c_id= '.$course_id.' AND
@@ -3786,19 +3786,19 @@ 
                 $userinfo = api_get_user_info($obj->user_id);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment=Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 // Get icon task
                 if (!empty($obj->task)) {
-                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                    $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
                 } else {
-                    $icon_task=Display::return_icon('px_transparent.gif');
+                    $icon_task = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -3806,8 +3806,8 @@ 
                 $row[] = $ShowAssignment.$icon_task;
                 $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'.
                     api_htmlentities($obj->title).'</a>';
-                $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
-                if ($obj->user_id <> 0 ) {
+                $row[] = $obj->version > 1 ? get_lang('EditedBy') : get_lang('AddedBy');
+                if ($obj->user_id <> 0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
                 } else {
                     $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
@@ -3815,7 +3815,7 @@ 
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 0, 10, 'RecentPages_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' =>api_get_course_id(),
@@ -3824,11 +3824,11 @@ 
                     'group_id' => api_get_group_id()
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true);
-            $table->set_header(3,get_lang('Actions'), true, array ('style' => 'width:80px;'));
-            $table->set_header(4,get_lang('Author'), true);
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true);
+            $table->set_header(3, get_lang('Actions'), true, array('style' => 'width:80px;'));
+            $table->set_header(4, get_lang('Author'), true);
             $table->display();
         }
     }
@@ -3860,17 +3860,17 @@ 
 
             //get type assignment icon
             $ShowAssignment = '';
-            if ($row['assignment']==1) {
-                $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==2) {
-                $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==0) {
-                $ShowAssignment=Display::return_icon('px_transparent.gif');
+            if ($row['assignment'] == 1) {
+                $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 2) {
+                $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 0) {
+                $ShowAssignment = Display::return_icon('px_transparent.gif');
             }
 
             //fix Title to reflink (link Main Page)
-            if ($page==get_lang('DefaultTitle')) {
-                $page='index';
+            if ($page == get_lang('DefaultTitle')) {
+                $page = 'index';
             }
 
             echo '<div id="wikititle">';
@@ -3881,11 +3881,11 @@ 
             //fix index to title Main page into linksto
 
             if ($page == 'index') {
-                $page = str_replace(' ','_',get_lang('DefaultTitle'));
+                $page = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
 
             //table
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 //only by professors if page is hidden
                 $sql = "SELECT * FROM ".$tbl_wiki." s1
                         WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string($page)."%' AND id=(
@@ -3912,25 +3912,25 @@ 
                     //get time
                     $year 	 = substr($obj->dtime, 0, 4);
                     $month	 = substr($obj->dtime, 5, 2);
-                    $day 	 = substr($obj->dtime, 8, 2);
-                    $hours   = substr($obj->dtime, 11,2);
-                    $minutes = substr($obj->dtime, 14,2);
-                    $seconds = substr($obj->dtime, 17,2);
+                    $day = substr($obj->dtime, 8, 2);
+                    $hours   = substr($obj->dtime, 11, 2);
+                    $minutes = substr($obj->dtime, 14, 2);
+                    $seconds = substr($obj->dtime, 17, 2);
 
                     //get type assignment icon
-                    if ($obj->assignment==1) {
-                        $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                    } elseif ($obj->assignment==2) {
-                        $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                    } elseif ($obj->assignment==0) {
-                        $ShowAssignment=Display::return_icon('px_transparent.gif');
+                    if ($obj->assignment == 1) {
+                        $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                    } elseif ($obj->assignment == 2) {
+                        $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                    } elseif ($obj->assignment == 0) {
+                        $ShowAssignment = Display::return_icon('px_transparent.gif');
                     }
 
                     $row = array();
-                    $row[] =$ShowAssignment;
+                    $row[] = $ShowAssignment;
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
                         api_htmlentities($obj->title).'</a>';
-                    if ($obj->user_id <>0) {
+                    if ($obj->user_id <> 0) {
                         $row[] = UserManager::getUserProfileLink($userinfo);
                     }
                     else {
@@ -4039,7 +4039,7 @@ 
             '&session_id='.$this->session_id.'&group_id='.$this->group_id.'">
             </a></div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE
@@ -4064,19 +4064,19 @@ 
                 // Get time
                 $year 	 = substr($obj->dtime, 0, 4);
                 $month	 = substr($obj->dtime, 5, 2);
-                $day 	 = substr($obj->dtime, 8, 2);
-                $hours   = substr($obj->dtime, 11,2);
-                $minutes = substr($obj->dtime, 14,2);
-                $seconds = substr($obj->dtime, 17,2);
+                $day = substr($obj->dtime, 8, 2);
+                $hours   = substr($obj->dtime, 11, 2);
+                $minutes = substr($obj->dtime, 14, 2);
+                $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4092,7 +4092,7 @@ 
 
             }
 
-            $table = new SortableTableFromArrayConfig($rows,2,10,'UsersContributions_table','','','ASC');
+            $table = new SortableTableFromArrayConfig($rows, 2, 10, 'UsersContributions_table', '', '', 'ASC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4102,13 +4102,13 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true, array ('style' => 'width:200px;'));
-            $table->set_header(3,get_lang('Version'), true, array ('style' => 'width:30px;'));
-            $table->set_header(4,get_lang('Comment'), true, array ('style' => 'width:200px;'));
-            $table->set_header(5,get_lang('Progress'), true, array ('style' => 'width:30px;'));
-            $table->set_header(6,get_lang('Rating'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true, array('style' => 'width:200px;'));
+            $table->set_header(3, get_lang('Version'), true, array('style' => 'width:30px;'));
+            $table->set_header(4, get_lang('Comment'), true, array('style' => 'width:200px;'));
+            $table->set_header(5, get_lang('Progress'), true, array('style' => 'width:30px;'));
+            $table->set_header(6, get_lang('Rating'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -4126,7 +4126,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostChangedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, MAX(version) AS MAX FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';//TODO:check MAX and group by return last version
@@ -4144,12 +4144,12 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4177,9 +4177,9 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Changes'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Changes'), true);
             $table->display();
         }
     }
@@ -4204,7 +4204,7 @@ 
         /* Only teachers and platform admin can edit the index page.
         Only teachers and platform admin can edit an assignment teacher*/
         if (($current_row['reflink'] == 'index' || $current_row['reflink'] == '' || $current_row['assignment'] == 1) &&
-            (!api_is_allowed_to_edit(false,true) && $this->group_id == 0)
+            (!api_is_allowed_to_edit(false, true) && $this->group_id == 0)
         ) {
             self::setMessage(
                 Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'), false, true)
@@ -4214,7 +4214,7 @@ 
             // check if is a wiki group
             if ($current_row['group_id'] != 0) {
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $this->group_id)
                 ) {
@@ -4232,9 +4232,9 @@ 
             //$icon_assignment = null;
             if ($current_row['assignment'] == 1) {
                 self::setMessage(Display::display_normal_message(get_lang('EditAssignmentWarning'), false, true));
-            } elseif($current_row['assignment']==2) {
-                if (($userId == $current_row['user_id'])==false) {
-                    if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            } elseif ($current_row['assignment'] == 2) {
+                if (($userId == $current_row['user_id']) == false) {
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
                         self::setMessage(Display::display_warning_message(get_lang('LockByTeacher'), false, true));
@@ -4248,11 +4248,11 @@ 
             //show editor if edit is allowed
             if ($PassEdit) {
                 if ($current_row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     self::setMessage(Display::display_normal_message(get_lang('PageLockedExtra'), false, true));
                 } else {
-                    if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) {
+                    if ($last_row['is_editing'] != 0 && $last_row['is_editing'] != $userId) {
                         // Checking for concurrent users
                         $timestamp_edit = strtotime($last_row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
@@ -4261,7 +4261,7 @@ 
                         $userinfo = api_get_user_info($last_row['is_editing']);
                         $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'.
                             Display::tag('span', $userinfo['complete_name_with_username']).
-                            get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes');
+                            get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes');
                         self::setMessage(Display::display_normal_message($is_being_edited, false, true));
                     } else {
                         self::setMessage(Display::display_confirmation_message(
@@ -4369,9 +4369,9 @@ 
                 GROUP BY reflink
                 ORDER BY reflink ASC';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index') {
-                $row['reflink']=str_replace(' ', '_', get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4389,16 +4389,16 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             //remove self reference
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"]));
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"]));
             $refs = explode(" ", trim($row["linksto"]));
 
             // Find linksto into reflink. If found ->page is linked
             foreach ($refs as $v) {
                 if (in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $linked[]=$v;
+                    if (trim($v) != "") {
+                        $linked[] = $v;
                     }
                 }
             }
@@ -4410,12 +4410,12 @@ 
         $rows = array();
         foreach ($linked as $linked_show) {
             $row = array();
-            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                str_replace('_',' ',$linked_show).'</a>';
+            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_', ' ', $linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                str_replace('_', ' ', $linked_show).'</a>';
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'LinkedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4424,7 +4424,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4449,8 +4449,8 @@ 
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
             $pages[] = $row['reflink'];
         }
 
@@ -4465,14 +4465,14 @@ 
                 )';
         $allpages = Database::query($sql);
         $array_refs_linked = array();
-        while ($row=Database::fetch_array($allpages)) {
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
+        while ($row = Database::fetch_array($allpages)) {
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
             $refs = explode(" ", trim($row["linksto"]));
-            foreach ($refs as $ref_linked){
-                if ($ref_linked==str_replace(' ','_',get_lang('DefaultTitle'))) {
-                    $ref_linked='index';
+            foreach ($refs as $ref_linked) {
+                if ($ref_linked == str_replace(' ', '_', get_lang('DefaultTitle'))) {
+                    $ref_linked = 'index';
                 }
-                $array_refs_linked[]= $ref_linked;
+                $array_refs_linked[] = $ref_linked;
             }
         }
 
@@ -4494,20 +4494,20 @@ 
 		                '.$groupfilter.$condition_session.' AND
 		                reflink="'.Database::escape_string($orphaned_show).'"
                     GROUP BY reflink';
-            $allpages=Database::query($sql);
-            while ($row=Database::fetch_array($allpages)) {
-                $orphaned_title=$row['title'];
-                $orphaned_visibility=$row['visibility'];
-                if ($row['assignment']==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+            $allpages = Database::query($sql);
+            while ($row = Database::fetch_array($allpages)) {
+                $orphaned_title = $row['title'];
+                $orphaned_visibility = $row['visibility'];
+                if ($row['assignment'] == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
             }
 
-            if (!api_is_allowed_to_edit(false,true) || !api_is_platform_admin() && $orphaned_visibility==0){
+            if (!api_is_allowed_to_edit(false, true) || !api_is_platform_admin() && $orphaned_visibility == 0) {
                 continue;
             }
 
@@ -4519,7 +4519,7 @@ 
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,1, 10, 'OrphanedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 1, 10, 'OrphanedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4528,8 +4528,8 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-        $table->set_header(1,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+        $table->set_header(1, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4551,11 +4551,11 @@ 
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index'){
-                $row['reflink']=str_replace(' ','_',get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4569,31 +4569,31 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $refs = explode(" ", trim($row["linksto"]));
             // Find linksto into reflink. If not found ->page is wanted
             foreach ($refs as $v) {
 
                 if (!in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $wanted[]=$v;
+                    if (trim($v) != "") {
+                        $wanted[] = $v;
                     }
                 }
             }
         }
 
-        $wanted = array_unique($wanted);//make a unique list
+        $wanted = array_unique($wanted); //make a unique list
 
         //show table
         $rows = array();
         foreach ($wanted as $wanted_show) {
             $row = array();
             $wanted_show = Security::remove_XSS($wanted_show);
-            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities
+            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_', ' ', $wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_', ' ', $wanted_show).'</a>'; //meter un remove xss en lugar de htmlentities
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'WantedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4602,7 +4602,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4619,7 +4619,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostVisitedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';
@@ -4640,11 +4640,11 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
@@ -4673,7 +4673,7 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
             $table->set_header(1, get_lang('Title'), true);
             $table->set_header(2, get_lang('Visits'), true);
             $table->display();
@@ -4698,8 +4698,8 @@ 
 
         if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) {
             // menu add page
-            $actionsLeft .= '<a href="index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('addnew').'>'
-            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $actionsLeft .= '<a href="index.php?cidReq='.$_course['id'].'&action=addnew&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('addnew').'>'
+            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $lock_unlock_addnew = null;
@@ -4707,12 +4707,12 @@ 
 
         if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             // page action: enable or disable the adding of new pages
-            if (self::check_addnewpagelock()==0) {
+            if (self::check_addnewpagelock() == 0) {
                 $protect_addnewpage = Display::return_icon('off.png', get_lang('AddOptionProtected'));
-                $lock_unlock_addnew ='unlockaddnew';
+                $lock_unlock_addnew = 'unlockaddnew';
             } else {
                 $protect_addnewpage = Display::return_icon('on.png', get_lang('AddOptionUnprotected'));
-                $lock_unlock_addnew ='lockaddnew';
+                $lock_unlock_addnew = 'lockaddnew';
             }
         }
 
@@ -4732,7 +4732,7 @@ 
             get_lang('RecentChanges').'</a>';
 
 
-        echo Display::toolbarAction('toolbar-wiki', array( 0 => $actionsLeft));
+        echo Display::toolbarAction('toolbar-wiki', array(0 => $actionsLeft));
     }
 
     /**
@@ -4750,7 +4750,7 @@ 
             return;
         }
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             self::setMessage('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>');
 
             if ($page == "index") {
@@ -4792,7 +4792,7 @@ 
         $userId = api_get_user_id();
 
         if (api_get_session_id() != 0 &&
-            api_is_allowed_to_session_edit(false,true) == false
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -4815,12 +4815,12 @@ 
                 Display::display_error_message(get_lang('MustSelectPage'), false, true)
             );
             return;
-        } elseif ($row['content']=='' && $row['title']=='' && $page=='index') {
+        } elseif ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
 
             // Table structure for better export to pdf
             $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
             $default_table_for_content_End = '</td></tr></table>';
-            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'),api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
+            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
             $title = get_lang('DefaultTitle');
             $page_id = 0;
         } else {
@@ -4845,7 +4845,7 @@ 
             // Check if is a wiki group
             if (!empty($groupId)) {
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $groupId)
                 ) {
@@ -4858,7 +4858,7 @@ 
                     );
                 }
             } else {
-                $PassEdit=true;
+                $PassEdit = true;
             }
 
             $icon_assignment = null;
@@ -4868,10 +4868,10 @@ 
                     Display::return_message(get_lang('EditAssignmentWarning'))
                 );
 
-                $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+                $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
             } elseif ($row['assignment'] == 2) {
-                $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
-                if (($userId == $row['user_id'])==false) {
+                $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
+                if (($userId == $row['user_id']) == false) {
                     if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
@@ -4891,7 +4891,7 @@ 
             if ($PassEdit) {
                 //show editor if edit is allowed
                 if ($row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     Display::addFlash(
                         Display::return_message(
@@ -4902,8 +4902,8 @@ 
                     // Check tasks
 
                     if (!empty($row['startdate_assig']) &&
-                        $row['startdate_assig']!='0000-00-00 00:00:00' &&
-                        time()<strtotime($row['startdate_assig'])
+                        $row['startdate_assig'] != '0000-00-00 00:00:00' &&
+                        time() < strtotime($row['startdate_assig'])
                     ) {
                         $message = get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig'], null, date_default_timezone_get());
 
@@ -4920,10 +4920,10 @@ 
                     }
 
                     if (!empty($row['enddate_assig']) &&
-                        $row['enddate_assig']!='0000-00-00 00:00:00' &&
+                        $row['enddate_assig'] != '0000-00-00 00:00:00' &&
                         time() > strtotime($row['enddate_assig']) &&
-                        $row['enddate_assig']!='0000-00-00 00:00:00' &&
-                        $row['delayedsubmit']==0
+                        $row['enddate_assig'] != '0000-00-00 00:00:00' &&
+                        $row['delayedsubmit'] == 0
                     ) {
                         $message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig'], null, date_default_timezone_get());
                         Display::addFlash(
@@ -4932,25 +4932,25 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
-                    if (!empty($row['max_version']) && $row['version']>=$row['max_version']) {
-                        $message=get_lang('HasReachedMaxiNumVersions');
+                    if (!empty($row['max_version']) && $row['version'] >= $row['max_version']) {
+                        $message = get_lang('HasReachedMaxiNumVersions');
                         Display::addFlash(
                             Display::return_message(
                                 $message,
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
-                    if (!empty($row['max_text']) && $row['max_text']<=self::word_count($row['content'])) {
+                    if (!empty($row['max_text']) && $row['max_text'] <= self::word_count($row['content'])) {
                         $message = get_lang('HasReachedMaxNumWords');
                         Display::addFlash(
                             Display::return_message(
@@ -4958,50 +4958,50 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
                     if (!empty($row['task'])) {
                         //previous change 0 by text
-                        if ($row['startdate_assig']=='0000-00-00 00:00:00') {
-                            $message_task_startdate  =get_lang('No');
+                        if ($row['startdate_assig'] == '0000-00-00 00:00:00') {
+                            $message_task_startdate = get_lang('No');
                         } else {
                             $message_task_startdate = api_get_local_time($row['startdate_assig'], null, date_default_timezone_get());
                         }
 
-                        if ($row['enddate_assig']=='0000-00-00 00:00:00') {
+                        if ($row['enddate_assig'] == '0000-00-00 00:00:00') {
                             $message_task_enddate = get_lang('No');
                         } else {
                             $message_task_enddate = api_get_local_time($row['enddate_assig'], null, date_default_timezone_get());
                         }
 
-                        if ($row['delayedsubmit']==0) {
-                            $message_task_delayedsubmit=get_lang('No');
+                        if ($row['delayedsubmit'] == 0) {
+                            $message_task_delayedsubmit = get_lang('No');
                         } else {
-                            $message_task_delayedsubmit=get_lang('Yes');
+                            $message_task_delayedsubmit = get_lang('Yes');
                         }
 
-                        if ($row['max_version']==0) {
-                            $message_task_max_version=get_lang('No');
+                        if ($row['max_version'] == 0) {
+                            $message_task_max_version = get_lang('No');
                         } else {
-                            $message_task_max_version=$row['max_version'];
+                            $message_task_max_version = $row['max_version'];
                         }
 
-                        if ($row['max_text']==0) {
-                            $message_task_max_text=get_lang('No');
+                        if ($row['max_text'] == 0) {
+                            $message_task_max_text = get_lang('No');
                         } else {
-                            $message_task_max_text=$row['max_text'];
+                            $message_task_max_text = $row['max_text'];
                         }
 
                         // Comp message
-                        $message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
-                        $message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
-                        $message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate;
-                        $message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
-                        $message_task.='<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
-                        $message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text;
+                        $message_task = '<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
+                        $message_task .= '<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
+                        $message_task .= '<p>'.get_lang('EndDate').': '.$message_task_enddate;
+                        $message_task .= ' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
+                        $message_task .= '<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
+                        $message_task .= ' '.get_lang('NMaxWords').': '.$message_task_max_text;
                         // Display message
                         Display::addFlash(
                             Display::return_message(
@@ -5012,11 +5012,11 @@ 
 
                     $feedback_message = '';
                     if ($row['progress'] == $row['fprogress1'] && !empty($row['fprogress1'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress2'] && !empty($row['fprogress2'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress3'] && !empty($row['fprogress3'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
                     }
 
                     if (!empty($feedback_message)) {
@@ -5041,14 +5041,14 @@ 
                                 WHERE c_id = '.$course_id.' AND id="'.$row['id'].'"';
                         Database::query($sql);
                     } elseif ($row['is_editing'] != $userId) {
-                        $timestamp_edit=strtotime($row['time_edit']);
+                        $timestamp_edit = strtotime($row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
                         $max_edit_time = 1200; // 20 minutes
                         $rest_time = $max_edit_time - $time_editing;
 
                         $userinfo = api_get_user_info($row['is_editing']);
                         $is_being_edited = get_lang('ThisPageisBeginEditedBy').' '.UserManager::getUserProfileLink($userinfo).'
-                            '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').'';
+                            '.get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes').'';
 
                         Display::addFlash(
                             Display::return_message(
@@ -5062,7 +5062,7 @@ 
                     // Form.
                     $url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'&'.api_get_cidreq();
                     $form = new FormValidator('wiki', 'post', $url);
-                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;',3).api_htmlentities($title));
+                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;', 3).api_htmlentities($title));
                     self::setForm($form, $row);
                     $form->addElement('hidden', 'title');
                     $form->addElement('button', 'SaveWikiChange', get_lang('Save'));
@@ -5085,7 +5085,7 @@ 
                             );
                         } elseif (!self::double_post($_POST['wpost_id'])) {
                             //double post
-                        } elseif ($_POST['version']!='' && $_SESSION['_version'] !=0 && $_POST['version'] != $_SESSION['_version']) {
+                        } elseif ($_POST['version'] != '' && $_SESSION['_version'] != 0 && $_POST['version'] != $_SESSION['_version']) {
                             //prevent concurrent users and double version
                             Display::addFlash(
                                 Display::return_message(
@@ -5147,7 +5147,7 @@ 
         $KeyAssignment = null;
         $KeyTitle = null;
         $KeyUserId = null;
-        while ($row=Database::fetch_array($result)) {
+        while ($row = Database::fetch_array($result)) {
             $KeyVisibility = $row['visibility'];
             $KeyAssignment = $row['assignment'];
             $KeyTitle = $row['title'];
@@ -5156,7 +5156,7 @@ 
         $icon_assignment = null;
         if ($KeyAssignment == 1) {
             $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
-        } elseif($KeyAssignment == 2) {
+        } elseif ($KeyAssignment == 2) {
             $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
@@ -5164,10 +5164,10 @@ 
 
         //if the page is hidden and is a job only sees its author and professor
         if ($KeyVisibility == 1 ||
-            api_is_allowed_to_edit(false,true) ||
+            api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
             (
-                $KeyAssignment==2 && $KeyVisibility==0 &&
+                $KeyAssignment == 2 && $KeyVisibility == 0 &&
                 ($userId == $KeyUserId)
             )
         ) {
@@ -5197,7 +5197,7 @@ 
                     get_lang('ShowDifferences').' '.get_lang('WordsDiff').'</button>';
                 echo '<br/><br/>';
 
-                $counter=0;
+                $counter = 0;
                 $total_versions = Database::num_rows($result);
 
                 while ($row = Database::fetch_array($result)) {
@@ -5205,10 +5205,10 @@ 
                     $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                     echo '<li style="margin-bottom: 5px;">';
-                    ($counter==0) ? $oldstyle='style="visibility: hidden;"':$oldstyle='';
-                    ($counter==0) ? $newchecked=' checked': $newchecked='';
-                    ($counter==$total_versions-1) ? $newstyle='style="visibility: hidden;"':$newstyle='';
-                    ($counter==1) ? $oldchecked=' checked':$oldchecked='';
+                    ($counter == 0) ? $oldstyle = 'style="visibility: hidden;"' : $oldstyle = '';
+                    ($counter == 0) ? $newchecked = ' checked' : $newchecked = '';
+                    ($counter == $total_versions - 1) ? $newstyle = 'style="visibility: hidden;"' : $newstyle = '';
+                    ($counter == 1) ? $oldchecked = ' checked' : $oldchecked = '';
                     echo '<input name="old" value="'.$row['id'].'" type="radio" '.$oldstyle.' '.$oldchecked.'/> ';
                     echo '<input name="new" value="'.$row['id'].'" type="radio" '.$newstyle.' '.$newchecked.'/> ';
                     echo '<a href="'.api_get_self().'?action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&amp;view='.$row['id'].'">';
@@ -5226,7 +5226,7 @@ 
                     $comment = $row['comment'];
                     if (!empty($comment)) {
                         echo get_lang('Comments').': '.api_htmlentities(api_substr($row['comment'], 0, 100));
-                        if (api_strlen($row['comment'])>100) {
+                        if (api_strlen($row['comment']) > 100) {
                             echo '... ';
                         }
                     } else {
@@ -5251,8 +5251,8 @@ 
 
                 $sql_new = "SELECT * FROM $tbl_wiki
                             WHERE c_id = $course_id AND id='".Database::escape_string($_POST['new'])."'";
-                $result_new=Database::query($sql_new);
-                $version_new=Database::fetch_array($result_new);
+                $result_new = Database::query($sql_new);
+                $version_new = Database::fetch_array($result_new);
                 $oldTime = isset($version_old['dtime']) ? $version_old['dtime'] : null;
                 $oldContent = isset($version_old['content']) ? $version_old['content'] : null;
 
@@ -5279,9 +5279,9 @@ 
 
 
                 if (isset($_POST['HistoryDifferences'])) {
-                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line' ).'</table>'; // format_line mode is better for words
+                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line').'</table>'; // format_line mode is better for words
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5300,7 +5300,7 @@ 
                     $renderer = new Text_Diff_Renderer_inline();
                     echo '<style>del{background:#fcc}ins{background:#cfc}</style>'.$renderer->render($diff); // Code inline
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5348,7 +5348,7 @@ 
         echo '<td style="vertical-align:top">';
         echo '<ul>';
         // Submenu Statistics
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=statistics&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Statistics').'</a></li>';
         }
         echo '      </ul>';
@@ -5421,7 +5421,7 @@ 
                 break;
             case 'deletewiki':
                 $title = '<div class="actions">'.get_lang('DeleteWiki').'</div>';
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $message = get_lang('ConfirmDeleteWiki');
                     $message .= '<p>
                         <a href="index.php?'.api_get_cidreq().'">'.get_lang('No').'</a>
@@ -5452,14 +5452,14 @@ 
                 self::getLinks($page);
                 break;
             case 'addnew':
-                if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+                if (api_get_session_id() != 0 && api_is_allowed_to_session_edit(false, true) == false) {
                     api_not_allowed();
                 }
                 echo '<div class="actions">'.get_lang('AddNew').'</div>';
                 echo '<br/>';
                 //first, check if page index was created. chektitle=false
                 if (self::checktitle('index')) {
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())
                     ) {
@@ -5467,10 +5467,10 @@ 
                     } else {
                         self::setMessage(Display::display_normal_message(get_lang('WikiStandBy'), false, true));
                     }
-                } elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) {
+                } elseif (self::check_addnewpagelock() == 0 && (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)) {
                     self::setMessage(Display::display_error_message(get_lang('AddPagesLocked'), false, true));
                 } else {
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id()) ||
                         $_GET['group_id'] == 0

Braces +4 added lines, -7 removed lines

@@ -1878,7 +1878,7 @@ 
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
                 if($session_id==0){
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else{
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -2261,8 +2261,7 @@ 
                                         s1.reflink = s2.reflink AND
                                         ".$groupfilter.$condition_session.")";
                     // warning don't use group by reflink because don't return the last version
-                }
-                else {
+                } else {
                     $sql = " SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -3696,8 +3695,7 @@ 
                 '.api_htmlentities($obj->title).'</a>';
                 if ($obj->user_id <>0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
-                }
-                else {
+                } else {
                     $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
@@ -3932,8 +3930,7 @@ 
                         api_htmlentities($obj->title).'</a>';
                     if ($obj->user_id <>0) {
                         $row[] = UserManager::getUserProfileLink($userinfo);
-                    }
-                    else {
+                    } else {
                         $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                     }
                     $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;

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)
 {

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 if (api_is_allowed_to_edit() || api_is_coach()) {
     //Search for all files that are not deleted => visibility != 2
-   $sql = "SELECT DISTINCT
+    $sql = "SELECT DISTINCT
                 url,
                 title,
                 description,

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);

main/work/upload_corrections.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use ChamiloSession as Session;
 use Symfony\Component\Finder\Finder;
 
 require_once '../inc/global.inc.php';

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 use Symfony\Component\Finder\Finder;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 
@@ -70,7 +70,7 @@ 
         $zip = new PclZip($_FILES['file']['tmp_name']);
 
         // Check the zip content (real size and file extension)
-        $zipFileList = (array)$zip->listContent();
+        $zipFileList = (array) $zip->listContent();
 
         $realSize = 0;
         foreach ($zipFileList as & $this_content) {