chamilo / chamilo-lms

main/inc/ajax/chat.ajax.php

Switch Indentation +49 added lines, -49 removed lines

@@ -55,56 +55,56 @@
 }
 
 switch ($action) {
-    case 'chatheartbeat':
-        $chat->heartbeat();
-        break;
-    case 'closechat':
-        $chat->close();
-        break;
-    case 'sendchat':
-        $chat->send(api_get_user_id(), $to_user_id, $message);
-        break;
-    case 'startchatsession':
-        $chat->startSession();
-        break;
-    case 'set_status':
-        $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
-        $chat->setUserStatus($status);
-        break;
-    case 'create_room':
-        $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
-
-        if ($room === false) {
-            $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
-
-            if ($createdRoom === false) {
-                echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
-                break;
+        case 'chatheartbeat':
+            $chat->heartbeat();
+            break;
+        case 'closechat':
+            $chat->close();
+            break;
+        case 'sendchat':
+            $chat->send(api_get_user_id(), $to_user_id, $message);
+            break;
+        case 'startchatsession':
+            $chat->startSession();
+            break;
+        case 'set_status':
+            $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
+            $chat->setUserStatus($status);
+            break;
+        case 'create_room':
+            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
+
+            if ($room === false) {
+                $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
+
+                if ($createdRoom === false) {
+                    echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
+                    break;
+                }
+
+                $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
             }
 
-            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
-        }
-
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
-        $videoChatLink = Display::url(
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
-            $videoChatUrl
-        );
-
-        $chat->send(
-            api_get_user_id(),
-            $to_user_id,
-            $videoChatLink,
-            false,
-            false
-        );
-
-        echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
-        break;
-    case 'notify_not_support':
-        $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
-        break;
-    default:
-        echo '';
+            $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
+            $videoChatLink = Display::url(
+                Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
+                $videoChatUrl
+            );
+
+            $chat->send(
+                api_get_user_id(),
+                $to_user_id,
+                $videoChatLink,
+                false,
+                false
+            );
+
+            echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
+            break;
+        case 'notify_not_support':
+            $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
+            break;
+        default:
+            echo '';
 }
 exit;

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
  * Responses to AJAX calls
  */
 
-$_dont_save_user_course_access  = true;
+$_dont_save_user_course_access = true;
 
 require_once '../global.inc.php';
 
@@ -34,7 +34,7 @@ 
 }
 
 $to_user_id = isset($_REQUEST['to']) ? $_REQUEST['to'] : null;
-$message	= isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
+$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
 
 if (!isset($_SESSION['chatHistory'])) {
     $_SESSION['chatHistory'] = array();
@@ -45,7 +45,7 @@ 
 }
 
 $chat = new Chat();
-if (chat::disableChat()){
+if (chat::disableChat()) {
     exit;
 }
 if ($chat->is_chat_blocked_by_exercises()) {
@@ -85,9 +85,9 @@ 
             $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
         }
 
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
+        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH)."chat/video.php?room={$room['id']}";
         $videoChatLink = Display::url(
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
+            Display::returnFontAwesomeIcon('video-camera').get_lang('StartVideoChat'),
             $videoChatUrl
         );
 

main/inc/ajax/myspace.ajax.php

Spacing +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
             $db['is_empty'] = false;
             $db['result'] = convert_to_string($sql_result);
             $rst = get_stats($user_id, $course_code, $start_date, $end_date);
-            $foo_stats = '<strong>' . get_lang('Total') . ': </strong>' . $rst['total'] . '<br />';
-            $foo_stats .= '<strong>' . get_lang('Average') . ': </strong>' . $rst['avg'] . '<br />';
-            $foo_stats .= '<strong>' . get_lang('Quantity') . ' : </strong>' . $rst['times'] . '<br />';
+            $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
+            $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
+            $foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
             $db['stats'] = $foo_stats;
             $db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type);
         } else {

main/inc/ajax/user_manager.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
                 <div class="row">
                     <div class="col-sm-10 col-sm-offset-2">
                         <a class="btn btn-primary" id="send_message_link">
-                            <em class="fa fa-envelope"></em> ' . get_lang('Send') . '
+                            <em class="fa fa-envelope"></em> ' . get_lang('Send').'
                         </a>
                     </div>
                 </div>
@@ -112,7 +112,7 @@ 
 
             if (!empty($user_id)) {
                 $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-                $sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
+                $sql = "UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
                 $result = Database::query($sql);
 
                 //Send and email if account is active
@@ -122,13 +122,13 @@ 
                     $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
                     $email_admin = api_get_setting('emailAdministrator');
                     $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
-                    $emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
+                    $emailbody = get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
 
-                    $emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
-                    $emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
-                    $emailbody.=get_lang('HaveFun')."\n\n";
+                    $emailbody .= sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
+                    $emailbody .= sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
+                    $emailbody .= get_lang('HaveFun')."\n\n";
                     //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
-                    $emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
+                    $emailbody .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
 
                     $additionalParameters = array(
                         'smsType' => SmsPlugin::ACCOUNT_APPROVED_CONNECT,

main/inc/ajax/model.ajax.php

Indentation +2 added lines, -2 removed lines

@@ -731,7 +731,7 @@ 
         }
 
         break;
-	case 'get_user_skill_ranking':
+    case 'get_user_skill_ranking':
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@ 
 
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
-                 $item['has_certificates'] = '1';
+                    $item['has_certificates'] = '1';
             } else {
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
                 $item['has_certificates'] = '0';

Spacing +40 added lines, -40 removed lines

@@ -11,8 +11,8 @@ 
 $action = $_GET['a'];
 $page = intval($_REQUEST['page']); //page
 $limit = intval($_REQUEST['rows']); //quantity of rows
-$sidx = $_REQUEST['sidx'];         //index (field) to filter
-$sord = $_REQUEST['sord'];         //asc or desc
+$sidx = $_REQUEST['sidx']; //index (field) to filter
+$sord = $_REQUEST['sord']; //asc or desc
 
 if (strpos(strtolower($sidx), 'asc') !== false) {
     $sidx = str_replace(array('asc', ','), '', $sidx);
@@ -24,7 +24,7 @@ 
     $sord = 'desc';
 }
 
-if (!in_array($sord, array('asc','desc'))) {
+if (!in_array($sord, array('asc', 'desc'))) {
     $sord = 'desc';
 }
 
@@ -64,19 +64,19 @@ 
 function getWhereClause($col, $oper, $val)
 {
     $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -100,10 +100,10 @@ 
 
 // If there is no search request sent by jqgrid, $where should be empty
 $whereCondition = '';
-$operation = isset($_REQUEST['oper'])  ? $_REQUEST['oper']  : false;
-$exportFormat = isset($_REQUEST['export_format'])  ? $_REQUEST['export_format']  : 'csv';
-$searchField = isset($_REQUEST['searchField'])  ? $_REQUEST['searchField']  : false;
-$searchOperator = isset($_REQUEST['searchOper'])   ? $_REQUEST['searchOper']   : false;
+$operation = isset($_REQUEST['oper']) ? $_REQUEST['oper'] : false;
+$exportFormat = isset($_REQUEST['export_format']) ? $_REQUEST['export_format'] : 'csv';
+$searchField = isset($_REQUEST['searchField']) ? $_REQUEST['searchField'] : false;
+$searchOperator = isset($_REQUEST['searchOper']) ? $_REQUEST['searchOper'] : false;
 $searchString = isset($_REQUEST['searchString']) ? $_REQUEST['searchString'] : false;
 $search = isset($_REQUEST['_search']) ? $_REQUEST['_search'] : false;
 $forceSearch = isset($_REQUEST['_force_search']) ? $_REQUEST['_force_search'] : false;
@@ -171,7 +171,7 @@ 
             foreach ($filters->rules as $key => $rule) {
                 $whereCondition .= getWhereClause($rule->field, $rule->op, $rule->data);
 
-                if ($counter < count($filters->rules) -1) {
+                if ($counter < count($filters->rules) - 1) {
                     $whereCondition .= $filters->groupOp;
                 }
                 $counter++;
@@ -201,7 +201,7 @@ 
         $userId = api_get_user_id();
         $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
         $courseCodeList = array();
-        $userIdList  = array();
+        $userIdList = array();
         $sessionIdList = [];
         $searchByGroups = false;
         if (api_is_drh()) {
@@ -585,7 +585,7 @@ 
 $total_pages = 0;
 if ($count > 0) {
     if (!empty($limit)) {
-        $total_pages = ceil((float)$count/(float)$limit);
+        $total_pages = ceil((float) $count / (float) $limit);
     }
 }
 if ($page > $total_pages) {
@@ -865,10 +865,10 @@ 
     case 'get_work_user_list_others':
         if (isset($_GET['type']) && $_GET['type'] === 'simple') {
             $columns = array(
-                'type', 'firstname', 'lastname',  'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
+                'type', 'firstname', 'lastname', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
             );
         } else {
-            $columns = array('type', 'firstname', 'lastname',  'title', 'sent_date', 'actions');
+            $columns = array('type', 'firstname', 'lastname', 'title', 'sent_date', 'actions');
         }
         $whereCondition .= " AND u.user_id <> ".api_get_user_id();
         $result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $whereCondition);
@@ -902,7 +902,7 @@ 
     case 'get_exercise_results':
         $course = api_get_course_info();
         // Used inside ExerciseLib::get_exam_results_data()
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if ($is_allowedToEdit || api_is_student_boss()) {
             $columns = array(
                 'firstname',
@@ -927,11 +927,11 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if (api_is_allowed_to_edit()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data(
             $start,
@@ -964,12 +964,12 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
 
         if (api_is_allowed_to_edit(null, true) || api_is_drh()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data(
             $start,
@@ -1005,7 +1005,7 @@ 
             );
         }
 
-        $columns =  array(
+        $columns = array(
             'name',
             'date',
             'course_per_session',
@@ -1041,17 +1041,17 @@ 
                 $detailButtons = [];
                 $detailButtons[] = Display::url(
                     Display::return_icon('works.png', get_lang('WorksReport')),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/works_in_session_report.php?session=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/works_in_session_report.php?session='.$session['id']
                 );
                 $detailButtons[] = Display::url(
                     Display::return_icon('2rightarrow.png'),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?session_id=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id']
                 );
 
                 $result[] = array(
                     'name' => Display::url(
                         $session['name'],
-                        api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?session_id=' . $session['id']
+                        api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id']
                     ),
                     'date' => $session_date_string,
                     'course_per_session' => $count_courses_in_session,
@@ -1363,7 +1363,7 @@ 
         $result = $new_result;
         break;
     case 'get_gradebooks':
-        $columns = array('name', 'certificates','skills', 'actions', 'has_certificates');
+        $columns = array('name', 'certificates', 'skills', 'actions', 'has_certificates');
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
         }
@@ -1536,7 +1536,7 @@ 
                     if (!empty($exercises[$cnt - 4]['title'])) {
                         $title = ucwords(strtolower(trim($exercises[$cnt - 4]['title'])));
                     }
-                    $columns[] = 'exer' . $i;
+                    $columns[] = 'exer'.$i;
                     $column_names[] = $title;
                     $i++;
                     break;
@@ -1569,7 +1569,7 @@ 
             $sessionInfo = SessionManager::fetch($listUserSess[$user['user_id']]['id_session']);
             $result[$i]['session'] = $sessionInfo['name'];
             $result[$i]['username'] = $user['username'];
-            $result[$i]['name'] = $user['lastname'] . " " . $user['firstname'];
+            $result[$i]['name'] = $user['lastname']." ".$user['firstname'];
             $j = 1;
             $finalScore = 0;
             foreach ($quizIds as $quizID) {
@@ -1577,7 +1577,7 @@ 
                 if (!empty($arrGrade [$user['user_id']][$quizID]) || $arrGrade [$user['user_id']][$quizID] == 0) {
                     $finalScore += $grade = $arrGrade [$user['user_id']][$quizID];
                 }
-                $result[$i]['exer' . $j] = $grade;
+                $result[$i]['exer'.$j] = $grade;
                 $j++;
             }
 
@@ -1745,9 +1745,9 @@ 
         foreach ($result as $row) {
             // if results tab give not id, set id to $i otherwise id="null" for all <tr> of the jqgrid - ref #4235
             if (!isset($row['id']) || isset($row['id']) && $row['id'] == '') {
-                $response->rows[$i]['id']= $i;
+                $response->rows[$i]['id'] = $i;
             } else {
-                $response->rows[$i]['id']= $row['id'];
+                $response->rows[$i]['id'] = $row['id'];
             }
             $array = array();
             foreach ($columns as $col) {
@@ -1757,7 +1757,7 @@ 
                     $array[] = isset($row[$col]) ? Security::remove_XSS($row[$col]) : '';
                 }
             }
-            $response->rows[$i]['cell']=$array;
+            $response->rows[$i]['cell'] = $array;
             $i++;
         }
     }

main/inc/local.inc.php

Indentation +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
     //    $gidReset = true;
 } // end else
 
- // Now check for anonymous user mode
+    // Now check for anonymous user mode
 if (isset($use_anonymous) && $use_anonymous) {
     //if anonymous mode is set, then try to set the current user as anonymous
     //if he doesn't have a login yet

Spacing +21 added lines, -21 removed lines

@@ -216,7 +216,7 @@ 
 
             // is necessary verify check
             if ($legal_type == 1) {
-                if ((isset($_POST['legal_accept']) && $_POST['legal_accept']=='1')) {
+                if ((isset($_POST['legal_accept']) && $_POST['legal_accept'] == '1')) {
                     $legal_option = true;
                 } else {
                     $legal_option = false;
@@ -504,7 +504,7 @@ 
                  * Process external authentication
                  * on the basis of the given login name
                  */
-                $loginFailed = true;  // Default initialisation. It could
+                $loginFailed = true; // Default initialisation. It could
                 // change after the external authentication
                 $key = $uData['auth_source']; //'ldap','shibboleth'...
 
@@ -549,7 +549,7 @@ 
                      * Process external authentication
                      * on the basis of the given login name
                      */
-                    $loginFailed = true;  // Default initialisation. It could
+                    $loginFailed = true; // Default initialisation. It could
                     // change after the external authentication
                     $key = $uData['auth_source']; //'ldap','shibboleth'...
 
@@ -560,11 +560,11 @@ 
             } else {
                 // change after the external authentication
                 // login failed, Database::num_rows($result) <= 0
-                $loginFailed = true;  // Default initialisation. It could
+                $loginFailed = true; // Default initialisation. It could
             }
 
             // login failed, Database::num_rows($result) <= 0
-            $loginFailed = true;  // Default initialisation. It could
+            $loginFailed = true; // Default initialisation. It could
             // change after the external authentication
 
             /*
@@ -593,7 +593,7 @@ 
                         include_once($thisAuthSource['newUser']);
                     } else {
                         error_log(
-                            'Chamilo Authentication external file' .
+                            'Chamilo Authentication external file'.
                             ' could not be found - this might prevent your system from using'.
                             ' the authentication process in the user creation process',
                             0
@@ -705,7 +705,7 @@ 
             online_logout(null, false);
             $osso->logout(); //redirects and exits
         }
-    } elseif (api_get_setting('openid_authentication')=='true') {
+    } elseif (api_get_setting('openid_authentication') == 'true') {
         if (!empty($_POST['openid_url'])) {
             include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
             openid_begin(trim($_POST['openid_url']), api_get_path(WEB_PATH).'index.php');
@@ -718,7 +718,7 @@ 
             if ($res['status'] == 'success') {
                 $id1 = Database::escape_string($res['openid.identity']);
                 //have another id with or without the final '/'
-                $id2 = (substr($id1, -1, 1)=='/'?substr($id1, 0, -1):$id1.'/');
+                $id2 = (substr($id1, -1, 1) == '/' ? substr($id1, 0, -1) : $id1.'/');
                 //lookup the user in the main database
                 $user_table = Database::get_main_table(TABLE_MAIN_USER);
                 $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
@@ -727,14 +727,14 @@ 
                         OR openid = '$id2' ";
                 $result = Database::query($sql);
                 if ($result !== false) {
-                    if (Database::num_rows($result)>0) {
+                    if (Database::num_rows($result) > 0) {
                         $uData = Database::fetch_array($result);
 
                         if ($uData['auth_source'] == PLATFORM_AUTH_SOURCE) {
                             //the authentification of this user is managed by Chamilo itself
 
                             // check if the account is active (not locked)
-                            if ($uData['active']=='1') {
+                            if ($uData['active'] == '1') {
                                 // check if the expiration date has not been reached
                                 if ($uData['expiration_date'] > date('Y-m-d H:i:s')
                                     || empty($uData['expiration_date'])
@@ -813,7 +813,7 @@ 
     (isset($_SESSION['_cid']) && $cidReq != $_SESSION['_cid']))
 ) {
     $cidReset = true;
-    $gidReset = true;    // As groups depend from courses, group id is reset
+    $gidReset = true; // As groups depend from courses, group id is reset
 }
 
 /* USER INIT */
@@ -957,8 +957,8 @@ 
             $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
             if (!empty($_GET['id_session'])) {
-                $sql = 'SELECT name FROM '.$tbl_session . '
-                        WHERE id="'.intval($_GET['id_session']) . '"';
+                $sql = 'SELECT name FROM '.$tbl_session.'
+                        WHERE id="'.intval($_GET['id_session']).'"';
                 $rs = Database::query($sql);
                 if (Database::num_rows($rs)) {
                     list($_SESSION['session_name']) = Database::fetch_array($rs);
@@ -1045,7 +1045,7 @@ 
         // Moreover, if we want to track a course with another session it can be usefull
         if (!empty($_GET['id_session']) && is_numeric($_GET['id_session'])) {
             $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-            $sql = 'SELECT name FROM '.$tbl_session . ' WHERE id="'.intval($_GET['id_session']). '"';
+            $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_GET['id_session']).'"';
             $rs = Database::query($sql);
             if (Database::num_rows($rs)) {
                 list($_SESSION['session_name']) = Database::fetch_array($rs);
@@ -1169,7 +1169,7 @@ 
                     }
                 }
                 $url = api_get_path(WEB_CODE_PATH).'auth/inscription.php';
-                header("Location:". $url);
+                header("Location:".$url);
                 exit;
             }
         }
@@ -1189,8 +1189,8 @@ 
         if (Database::num_rows($result) > 0) { // this  user have a recorded state for this course
             $cuData = Database::fetch_array($result, 'ASSOC');
 
-            $is_courseAdmin = (bool)($cuData['status'] == 1);
-            $is_courseTutor = (bool)($cuData['is_tutor'] == 1);
+            $is_courseAdmin = (bool) ($cuData['status'] == 1);
+            $is_courseTutor = (bool) ($cuData['is_tutor'] == 1);
             $is_courseMember = true;
         }
 
@@ -1201,7 +1201,7 @@ 
                 // This user has no status related to this course
                 // The user is subscribed in a session? The user is a Session coach a Session admin ?
 
-                $tbl_session  = Database :: get_main_table(TABLE_MAIN_SESSION);
+                $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
                 $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
                 $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
@@ -1506,12 +1506,12 @@ 
     ($logging_in && exist_firstpage_parameter())
 ) {
     $redirectCourseDir = api_get_firstpage_parameter();
-    api_delete_firstpage_parameter();    // delete the cookie
+    api_delete_firstpage_parameter(); // delete the cookie
 
     if (!isset($_SESSION['request_uri'])) {
         if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
             $_SESSION['noredirection'] = false;
-            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
+            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
         }
     }
 } elseif (api_user_is_login() && exist_firstpage_parameter()) {
@@ -1519,7 +1519,7 @@ 
     api_delete_firstpage_parameter(); // delete the cookie
     if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
         $_SESSION['noredirection'] = false;
-        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
+        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
     }
 }
 

main/inc/lib/AnnouncementEmail.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
      *
      * @return array
      */
-    public function sender($key = '',  $userId = '')
+    public function sender($key = '', $userId = '')
     {
         $_user = api_get_user_info($userId);
 

main/inc/lib/custom_pages.class.php

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
      */
     public static function path($name = '')
     {
-        return api_get_path(SYS_PATH) . 'custompages/' . $name;
+        return api_get_path(SYS_PATH).'custompages/'.$name;
     }
 
     /**
@@ -50,12 +50,12 @@ 
             return false;
         }
 
-        $file = self::path($page_name . '.php');
+        $file = self::path($page_name.'.php');
         if (file_exists($file)) {
             include($file);
             exit;
         } else {
-            error_log('CustomPages::displayPage : could not read file ' . $file);
+            error_log('CustomPages::displayPage : could not read file '.$file);
         }
     }
 
@@ -69,14 +69,14 @@ 
     public static function getURLImages($url_id = null)
     {
         if (is_null($url_id)) {
-            $url = 'http://' . $_SERVER['HTTP_HOST'] . '/';
+            $url = 'http://'.$_SERVER['HTTP_HOST'].'/';
             $url_id = UrlManager::get_url_id($url);
         }
-        $url_images_dir = api_get_path(SYS_PATH) . 'custompages/url-images/';
+        $url_images_dir = api_get_path(SYS_PATH).'custompages/url-images/';
         $images = array();
         for ($img_id = 1; $img_id <= 3; $img_id++) {
-            if (file_exists($url_images_dir . $url_id . '_url_image_' . $img_id . '.png')) {
-                $images[] = api_get_path(WEB_PATH) . 'custompages/url-images/' . $url_id . '_url_image_' . $img_id . '.png';
+            if (file_exists($url_images_dir.$url_id.'_url_image_'.$img_id.'.png')) {
+                $images[] = api_get_path(WEB_PATH).'custompages/url-images/'.$url_id.'_url_image_'.$img_id.'.png';
             }
         }
 

main/inc/lib/redirect.class.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
             self::navigate($url);
         }
 
-        $url = self::www() . $url;
+        $url = self::www().$url;
         self::navigate($url);
     }
 
@@ -67,25 +67,25 @@ 
                     case COURSEMANAGER:
                         $redir = api_get_setting('teacher_page_after_login');
                         if (!empty($redir)) {
-                            self::navigate(api_get_path(WEB_PATH) . $redir);
+                            self::navigate(api_get_path(WEB_PATH).$redir);
                         }
                         break;
                     case STUDENT:
                         $redir = api_get_setting('student_page_after_login');
                         if (!empty($redir)) {
-                            self::navigate(api_get_path(WEB_PATH) . $redir);
+                            self::navigate(api_get_path(WEB_PATH).$redir);
                         }
                         break;
                     case DRH:
                         $redir = api_get_setting('drh_page_after_login');
                         if (!empty($redir)) {
-                            self::navigate(api_get_path(WEB_PATH) . $redir);
+                            self::navigate(api_get_path(WEB_PATH).$redir);
                         }
                         break;
                     case SESSIONADMIN:
                         $redir = api_get_setting('sessionadmin_page_after_login');
                         if (!empty($redir)) {
-                            self::navigate(api_get_path(WEB_PATH) . $redir);
+                            self::navigate(api_get_path(WEB_PATH).$redir);
                         }
                         break;
                     default:
@@ -111,7 +111,7 @@ 
             }
             $page_after_login = api_get_setting('page_after_login');
             if (!empty($page_after_login)) {
-                self::navigate(api_get_path(WEB_PATH) . $page_after_login);
+                self::navigate(api_get_path(WEB_PATH).$page_after_login);
             }
         }
     }

main/inc/lib/extra_field_value.lib.php

Indentation +5 added lines, -6 removed lines

@@ -720,11 +720,11 @@ 
         return false;
     }
 
-     /**
-     * @param int $itemId
-     * @param int $fieldId
-     * @return array
-     */
+        /**
+         * @param int $itemId
+         * @param int $fieldId
+         * @return array
+         */
     public function getAllValuesByItemAndField($itemId, $fieldId)
     {
         $fieldId = intval($fieldId);
@@ -847,7 +847,6 @@ 
     /**
      * Deletes all values from an item
      * @param int $itemId (session id, course id, etc)
-
      * @assert (-1,-1) == null
      */
     public function deleteValuesByItem($itemId)

Spacing +9 added lines, -9 removed lines

@@ -216,7 +216,7 @@ 
                             break;
                     }
 
-                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE . "_{$params['item_id']}.png";
+                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
 
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
@@ -226,15 +226,15 @@ 
 
                         //Crop the image to adjust 16:9 ratio
                         $crop = new Image($value['tmp_name']);
-                        $crop->crop($params['extra_' . $field_variable . '_crop_result']);
+                        $crop->crop($params['extra_'.$field_variable.'_crop_result']);
 
                         $imageExtraField = new Image($value['tmp_name']);
                         $imageExtraField->resize(400);
-                        $imageExtraField->send_image($fileDir . $fileName, -1, 'png');
+                        $imageExtraField->send_image($fileDir.$fileName, -1, 'png');
                         $newParams = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName,
+                            'value' => $fileDirStored.$fileName,
                             'comment' => $comment
                         );
 
@@ -260,18 +260,18 @@ 
                     }
 
                     $cleanedName = api_replace_dangerous_char($value['name']);
-                    $fileName = ExtraField::FIELD_TYPE_FILE . "_{$params['item_id']}_$cleanedName";
+                    $fileName = ExtraField::FIELD_TYPE_FILE."_{$params['item_id']}_$cleanedName";
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
                     }
 
                     if ($value['error'] == 0) {
-                        moveUploadedFile($value, $fileDir . $fileName);
+                        moveUploadedFile($value, $fileDir.$fileName);
 
                         $new_params = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName
+                            'value' => $fileDirStored.$fileName
                         );
 
                         if ($this->type !== 'session' && $this->type !== 'course') {
@@ -411,7 +411,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
@@ -473,7 +473,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());

Doc Comments +4 added lines, -4 removed lines

@@ -75,7 +75,7 @@ 
      * This function is used with $extraField->addElements()
      * @param array $params array for the insertion into the *_field_values table
      * @param bool $showQuery
-     * @return mixed false on empty params, void otherwise
+     * @return false|null false on empty params, void otherwise
      * @assert (array()) === false
      */
     public function saveFieldValues($params, $showQuery = false)
@@ -531,7 +531,7 @@ 
      * @param int $item_id Item ID (It could be a session_id, course_id or user_id)
      * @param int $field_id Field ID (the ID from the *_field table)
      * @param bool $transform Whether to transform the result to a human readable strings
-     * @return mixed A structured array with the field_id and field_value, or false on error
+     * @return string A structured array with the field_id and field_value, or false on error
      * @assert (-1,-1) === false
      */
     public function get_values_by_handler_and_field_id($item_id, $field_id, $transform = false)
@@ -624,7 +624,7 @@ 
      * @param int $item_id Item ID from the original table
      * @param string $field_variable The name of the field we are looking for
      * @param bool $transform
-     * @param bool $allVisibility
+     * @param bool $visibility
      *
      * @return mixed Array of results, or false on error or not found
      * @assert (-1,'') === false
@@ -686,7 +686,7 @@ 
      * @param string $field_value Data we are looking for in the given field
      * @param bool $transform Whether to transform the result to a human readable strings
      * @param bool $last Whether to return the last element or simply the first one we get
-     * @return mixed Give the ID if found, or false on failure or not found
+     * @return string|null Give the ID if found, or false on failure or not found
      * @assert (-1,-1) === false
      */
     public function get_item_id_from_field_variable_and_field_value(