chamilo / chamilo-lms

main/course_home/course_home.php

Indentation +7 added lines, -7 removed lines

@@ -213,7 +213,7 @@ 
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
             } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
+                //great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -225,7 +225,7 @@ 
             $lp_data = Database::fetch_array($result,'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
-                	$show_autolaunch_lp_warning = true;
+                    $show_autolaunch_lp_warning = true;
                 } else {
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
@@ -254,7 +254,7 @@ 
         //if (!isset($_SESSION[$forumKey])) {
             //redirecting to the LP
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
-          //  $_SESSION[$forumKey] = true;
+            //  $_SESSION[$forumKey] = true;
             header("Location: $url");
             exit;
         //}
@@ -280,13 +280,13 @@ 
 if (api_get_setting('course.homepage_view') == 'activity' ||
     api_get_setting('course.homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('course.homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('course.homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('course.homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 $content = '<div id="course_tools">'.$content.'</div>';

Spacing +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
 //unset($_SESSION['oLP']);
 //unset($_SESSION['lpobject']);
 
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 /* option show/hide thematic-block */
 $(document).ready(function(){
     $("#thematic-show").click(function(){
@@ -209,7 +209,7 @@ 
             $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
             if (!isset($_SESSION[$session_key])) {
                 //redirecting to the LP
-                $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq() . '&id_session=' . $session_id;
+                $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&id_session='.$session_id;
                 $_SESSION[$session_key] = true;
                 header("Location: $url");
                 exit;
@@ -220,13 +220,13 @@ 
         $course_id = api_get_course_int_id();
         $condition = '';
         if (!empty($session_id)) {
-            $condition =  api_get_session_condition($session_id);
+            $condition = api_get_session_condition($session_id);
             $sql = "SELECT id FROM $lp_table
                     WHERE c_id = $course_id AND autolaunch = 1 $condition
                     LIMIT 1";
             $result = Database::query($sql);
             //If we found nothing in the session we just called the session_id =  0 autolaunch
-            if (Database::num_rows($result) ==  0) {
+            if (Database::num_rows($result) == 0) {
                 $condition = '';
             } else {
             	//great, there is an specific auto launch for this session we leave the $condition
@@ -237,8 +237,8 @@ 
                 WHERE c_id = $course_id AND autolaunch = 1 $condition
                 LIMIT 1";
         $result = Database::query($sql);
-        if (Database::num_rows($result) >  0) {
-            $lp_data = Database::fetch_array($result,'ASSOC');
+        if (Database::num_rows($result) > 0) {
+            $lp_data = Database::fetch_array($result, 'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
                 	$show_autolaunch_lp_warning = true;
@@ -246,7 +246,7 @@ 
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
                         //redirecting to the LP
-                        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq() . '&action=view&lp_id=' . $lp_data['id'];
+                        $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp_data['id'];
 
                         $_SESSION[$session_key] = true;
                         header("Location: $url");

src/Chamilo/FaqBundle/Entity/Question.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      */
     public function getEntityIdentifier()
     {
-        return 'GenjFaqBundle:Question:' . $this->getId();
+        return 'GenjFaqBundle:Question:'.$this->getId();
     }
 
     /**

src/Chamilo/FaqBundle/Entity/Category.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param string $rank
      *
-     * @return Question
+     * @return Category
      */
     public function setRank($rank)
     {
@@ -201,7 +201,7 @@ 
     /**
      * Get questions
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Question[]
      */
     public function getQuestions()
     {

main/course_info/tools.php

Spacing +8 added lines, -8 removed lines

@@ -46,14 +46,14 @@ 
         $interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq(), 'name' => get_lang('CustomizeIcons'));
         $toolName = $tool['name'];
 
-        $currentUrl = api_get_self().'?action=edit_icon&id=' . $id.'&'.api_get_cidreq();
+        $currentUrl = api_get_self().'?action=edit_icon&id='.$id.'&'.api_get_cidreq();
 
         $form = new FormValidator('icon_edit', 'post', $currentUrl);
         $form->addElement('header', get_lang('EditIcon'));
         $form->addHtml('<div class="col-md-7">');
         $form->addElement('text', 'name', get_lang('Name'));
         $form->addElement('text', 'link', get_lang('Links'));
-        $allowed_picture_types = array ('jpg', 'jpeg', 'png');
+        $allowed_picture_types = array('jpg', 'jpeg', 'png');
         $form->addElement('file', 'icon', get_lang('CustomIcon'));
         $form->addRule('icon', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
         $form->addElement(
@@ -118,7 +118,7 @@ 
         $iconsTools .= Display::page_header(get_lang('CustomizeIcons'), null, 'h4');
         $iconsTools .= '<div class="row">';
         foreach ($toolList as $tool) {
-            $toolIconName = 'Tool' . api_underscore_to_camel_case($tool['name']);
+            $toolIconName = 'Tool'.api_underscore_to_camel_case($tool['name']);
             $toolIconName = isset($$toolIconName) ? get_lang($toolIconName) : $tool['name'];
 
             $iconsTools .= '<div class="col-md-2">';
@@ -140,13 +140,13 @@ 
 
             $delete = (!empty($tool['custom_icon'])) ? "<a class=\"btn btn-default\" onclick=\"javascript:
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
-                "')) return false;\" href=\"". api_get_self() . '?action=delete_icon&id=' . $tool['iid'] . '&'.api_get_cidreq()."\">
+                "')) return false;\" href=\"".api_get_self().'?action=delete_icon&id='.$tool['iid'].'&'.api_get_cidreq()."\">
             <em class=\"fa fa-trash-o\"></em></a>" : "";
-            $edit = '<a class="btn btn-default" href="' . api_get_self() . '?action=edit_icon&id=' . $tool['iid'] . '&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
+            $edit = '<a class="btn btn-default" href="'.api_get_self().'?action=edit_icon&id='.$tool['iid'].'&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
 
-            $iconsTools .= '<div class="icon-tools">'. $icon . '</div>';
-            $iconsTools .= '<div class="name-tools">' . $toolIconName . '</div>';
-            $iconsTools .= '<div class="toolbar">' . $edit . $delete . '</div>';
+            $iconsTools .= '<div class="icon-tools">'.$icon.'</div>';
+            $iconsTools .= '<div class="name-tools">'.$toolIconName.'</div>';
+            $iconsTools .= '<div class="toolbar">'.$edit.$delete.'</div>';
             $iconsTools .= '</div>';
             $iconsTools .= '</div>';
         }

main/auth/external_login/facebook.init.php

Spacing +1 added lines, -1 removed lines

@@ -22,5 +22,5 @@
  * See facebook section of the auth.conf.php file
  */
 
-require dirname(__FILE__) . '/../../../app/config/auth.conf.php';
+require dirname(__FILE__).'/../../../app/config/auth.conf.php';
 

main/gradebook/certificate_report.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 api_block_anonymous_users();
 
 $interbreadcrumb[] = array(
-    "url" => api_is_student_boss()?"#":api_get_path(WEB_CODE_PATH) . "mySpace/index.php?".api_get_cidreq(),
+    "url" => api_is_student_boss() ? "#" : api_get_path(WEB_CODE_PATH)."mySpace/index.php?".api_get_cidreq(),
     "name" => get_lang("MySpace")
 );
 
@@ -111,7 +111,7 @@ 
     }
 
     if (!is_null($gradebook)) {
-        $exportAllLink = api_get_path(WEB_CODE_PATH) . "gradebook/gradebook_display_certificate.php?";
+        $exportAllLink = api_get_path(WEB_CODE_PATH)."gradebook/gradebook_display_certificate.php?";
         $exportAllLink .= http_build_query(array(
             "action" => "export_all_certificates",
             "cidReq" => $selectedCourseInfo['code'],
@@ -250,7 +250,7 @@ 
 $searchBySessionCourseDateForm = new FormValidator(
     'certificate_report_form',
     'post',
-    api_get_path(WEB_CODE_PATH) . 'gradebook/certificate_report.php'
+    api_get_path(WEB_CODE_PATH).'gradebook/certificate_report.php'
 );
 $searchBySessionCourseDateForm->addSelect('session', get_lang('Sessions'), $sessions, ['id' => 'session']);
 $searchBySessionCourseDateForm->addSelect('course', get_lang('Courses'), $courses, ['id' => 'course']);
@@ -283,7 +283,7 @@ 
     $searchByStudentForm = new FormValidator(
         'certificate_report_form',
         'post',
-        api_get_path(WEB_CODE_PATH) . 'gradebook/certificate_report.php'
+        api_get_path(WEB_CODE_PATH).'gradebook/certificate_report.php'
     );
     $searchByStudentForm->addSelect('student', get_lang('Students'), $students, ['id' => 'student']);
     $searchByStudentForm->addButtonSearch();

main/mySpace/company_reports.php

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[] = array ('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace'));
 $tool_name = get_lang('Report');
 
 $this_section = SECTION_TRACKING;
@@ -42,13 +42,13 @@ 
 
 //Column config
 $column_model = array(
-    array('name'=>'course',         'index'=>'title',       'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
-    array('name'=>'user',           'index'=>'user',        'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'email',          'index'=>'email',       'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'time',           'index'=>'time',        'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'certificate',    'index'=>'certificate', 'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress_100',   'index'=>'progress_100',       'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress',       'index'=>'progress',    'width'=>'50',  'align'=>'left','sortable'=>'false')
+    array('name'=>'course', 'index'=>'title', 'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
+    array('name'=>'user', 'index'=>'user', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'email', 'index'=>'email', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'time', 'index'=>'time', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'certificate', 'index'=>'certificate', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress_100', 'index'=>'progress_100', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress', 'index'=>'progress', 'width'=>'50', 'align'=>'left', 'sortable'=>'false')
 );
 
 if (!empty($extra_fields)) {
@@ -67,7 +67,7 @@ 
 }
 
 if (api_is_student_boss()) {
-    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left','sortable'=>'false');
+    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left', 'sortable'=>'false');
     $columns[] = get_lang('Group');
 }
 
@@ -78,7 +78,7 @@ 
 
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('user_course_report',  $url, $columns, $column_model, $extra_params, array(), null, true).'
+    '.Display::grid_js('user_course_report', $url, $columns, $column_model, $extra_params, array(), null, true).'
     jQuery("#user_course_report").jqGrid("navGrid","#user_course_report_pager",{
         view:false,
         edit:false,
@@ -102,11 +102,11 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
@@ -119,7 +119,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -130,13 +130,13 @@ 
 }
 $content .= Display::url(
     get_lang("CompanyReportResumed"),
-    api_get_path(WEB_CODE_PATH) . "mySpace/company_reports_resumed.php",
+    api_get_path(WEB_CODE_PATH)."mySpace/company_reports_resumed.php",
     array(
         'class' => 'btn btn-success'
     )
 );
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReport') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReport').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);

main/mySpace/company_reports_resumed.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[] = array('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace'));
 
 $tool_name = get_lang('Report');
 $this_section = SECTION_TRACKING;
@@ -89,15 +89,15 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php"
     );
     $actions .= Display::url(
         Display::return_icon(
@@ -106,7 +106,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -119,7 +119,7 @@ 
 if (!api_is_student_boss()) {
     $content .= Display::url(
         get_lang("CompanyReport"),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php",
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php",
         array(
             'class' => 'btn btn-success'
         )
@@ -127,7 +127,7 @@ 
 }
 
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReportResumed') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReportResumed').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);

src/Chamilo/ContactBundle/Controller/ContactController.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      * @Route("/contact")
      *
      * @param Request $request
-     * @return mixed
+     * @return Response
      */
     public function indexAction(Request $request)
     {