chamilo / chamilo-lms

main/session/session_user_edit.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 }
 
 
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 $interbreadcrumb[] = array(
     'url' => "resume_session.php?id_session=".$sessionId,
     "name" => get_lang('SessionOverview')
@@ -60,7 +60,7 @@ 
     if ($days > 0) {
         $msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateInZDays'), $firstAccessString, $duration, $days);
     } else {
-        $endDateInSeconds = $firstAccess + $duration * 24*60*60;
+        $endDateInSeconds = $firstAccess + $duration * 24 * 60 * 60;
         $last = api_convert_and_format_date($endDateInSeconds, DATE_FORMAT_SHORT);
         $msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateWasZ'), $firstAccessString, $duration, $last);
     }

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             ],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
-            [   'Styles',
+            ['Styles',
                 'Format',
                 'Font',
                 'FontSize',

main/admin/specific_fields.php

Spacing +14 added lines, -14 removed lines

@@ -15,36 +15,36 @@ 
 api_protect_admin_script();
 
 // Breadcrumb
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
 
 $libpath = api_get_path(LIBRARY_PATH);
 
 include_once $libpath.'specific_fields_manager.lib.php';
 
 // Create an add-field box
-$form = new FormValidator('add_field','post','','',null,false);
-$renderer =& $form->defaultRenderer();
+$form = new FormValidator('add_field', 'post', '', '', null, false);
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
 
 // Create a sortable table with specific fields data
-$column_show = array(1,1,1);
-$column_order = array(3,2,1);
+$column_show = array(1, 1, 1);
+$column_order = array(3, 2, 1);
 $extra_fields = get_specific_field_list();
 $number_of_extra_fields = count($extra_fields);
 
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
 $table->set_header(2, get_lang('Name'));
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
 $table->set_column_filter(3, 'edit_filter');
 
-function edit_filter($id,$url_params,$row) {
+function edit_filter($id, $url_params, $row) {
 	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
 	return $return;
 }
 
@@ -60,7 +60,7 @@ 
 Display::display_header(get_lang('SpecificSearchFields'));
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
-if(!empty($_GET['message'])) {
+if (!empty($_GET['message'])) {
   Display::display_confirmation_message($_GET['message']);
 }
 

Indentation +7 added lines, -7 removed lines

@@ -42,15 +42,15 @@ 
 $table->set_column_filter(3, 'edit_filter');
 
 function edit_filter($id,$url_params,$row) {
-	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
-	return $return;
+    global $charset;
+    $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
+    $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+    return $return;
 }
 
 if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') {
-	delete_specific_field($_REQUEST['field_id']);
-	header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
+    delete_specific_field($_REQUEST['field_id']);
+    header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
     exit;
 }
 
@@ -61,7 +61,7 @@ 
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
 if(!empty($_GET['message'])) {
-  Display::display_confirmation_message($_GET['message']);
+    Display::display_confirmation_message($_GET['message']);
 }
 
 echo '<div class="actions">';

main/admin/specific_fields_add.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $tool_name = get_lang('AddSpecificSearchField');
 
 if (isset($_GET['action']) && $_GET['action'] === 'edit') {
-  $tool_name = get_lang('EditSpecificSearchField');
+    $tool_name = get_lang('EditSpecificSearchField');
 }
 // Create the form
 $form = new FormValidator('specific_fields_add');

Spacing +7 added lines, -7 removed lines

@@ -32,18 +32,18 @@ 
 // Create the form
 $form = new FormValidator('specific_fields_add');
 // Field variable name
-$form->addElement('hidden','field_id', $fieldId);
-$form->addElement('text','field_name',get_lang('FieldName'));
-$form->applyFilter('field_name','html_filter');
-$form->applyFilter('field_name','trim');
+$form->addElement('hidden', 'field_id', $fieldId);
+$form->addElement('text', 'field_name', get_lang('FieldName'));
+$form->applyFilter('field_name', 'html_filter');
+$form->applyFilter('field_name', 'trim');
 $form->addRule('field_name', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('field_name', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('field_name', '', 'maxlength',20);
+$form->addRule('field_name', '', 'maxlength', 20);
 
 // Set default values (only not empty when editing)
 $defaults = array();
 if ($fieldId) {
-    $form_information = get_specific_field_list(array( 'id' => $fieldId ));
+    $form_information = get_specific_field_list(array('id' => $fieldId));
     $defaults['field_name'] = $form_information[0]['name'];
 }
 $form->setDefaults($defaults);
@@ -54,7 +54,7 @@ 
 if ($form->validate()) {
     $field = $form->exportValues();
     $field_name = $field['field_name'];
-    if (is_numeric($field['field_id']) && $field['field_id']<>0 && !empty($field['field_id'])) {
+    if (is_numeric($field['field_id']) && $field['field_id'] <> 0 && !empty($field['field_id'])) {
         edit_specific_field($field['field_id'], $field['field_name']);
         $message = get_lang('FieldEdited');
     } else {

main/inc/lib/course_category.lib.php

Doc Comments +4 added lines, -5 removed lines

@@ -103,7 +103,7 @@ 
      * @param string $canHaveCourses
      * @param int $parent_id
      *
-     * @return bool
+     * @return false|string
      */
     public static function addNode($code, $name, $canHaveCourses, $parent_id)
     {
@@ -297,8 +297,7 @@ 
     /**
      * Counts the number of children categories a category has
      * @param int $categoryId The ID of the category of which we want to count the children
-     * @param int $count The number of subcategories we counted this far
-     * @return mixed The number of subcategories this category has
+     * @return integer The number of subcategories this category has
      */
     public static function courseCategoryChildrenCount($categoryId)
     {
@@ -476,7 +475,7 @@ 
     /**
      * @param int $id
      *
-     * @return bool
+     * @return boolean|null
      */
     public static function addToUrl($id)
     {
@@ -958,7 +957,7 @@ 
      * Get Pagination HTML div
      * @param $pageCurrent
      * @param $pageLength
-     * @param $pageTotal
+     * @param integer $pageTotal
      * @return string
      */
     public static function getCatalogPagination($pageCurrent, $pageLength, $pageTotal)

main/admin/course_category.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     if ($action == 'delete') {
         CourseCategory::deleteNode($categoryId);
         Display::addFlash(Display::return_message(get_lang('Deleted')));
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
         exit();
     } elseif (($action == 'add' || $action == 'edit') && isset($_POST['formSent']) && $_POST['formSent']) {
         if ($action == 'add') {
@@ -54,7 +54,7 @@ 
         }
     } elseif ($action == 'moveUp') {
         CourseCategory::moveNodeUp($categoryId, $_GET['tree_pos'], $category);
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
         Display::addFlash(Display::return_message(get_lang('Updated')));
         exit();
     }
@@ -78,7 +78,7 @@ 
 
     $form_title = ($action == 'add') ? get_lang('AddACategory') : get_lang('EditNode');
     if (!empty($category)) {
-        $form_title .= ' ' . get_lang('Into') . ' ' . Security::remove_XSS($category);
+        $form_title .= ' '.get_lang('Into').' '.Security::remove_XSS($category);
     }
     $url = api_get_self().'?action='.Security::remove_XSS($action).'&category='.Security::remove_XSS($category).'&id='.Security::remove_XSS($categoryId);
     $form = new FormValidator('course_category', 'post', $url);

src/Chamilo/CoreBundle/Component/HTMLPurifier/Filter/AllowIframes.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
         $vimeoMatch = preg_match('#://player.vimeo.com/#i', $matches[1]);
         $googleMapsMatch = preg_match('#src="https://maps.google.com/#i', $matches[1]);
         $slideShare = preg_match('#src="(https?:)?//www.slideshare.net/#', $matches[1]);
-        $platformDomain = preg_match('#src="https?://(.+\.)?' . $hostName[1] . '#i', $matches[1]);
+        $platformDomain = preg_match('#src="https?://(.+\.)?'.$hostName[1].'#i', $matches[1]);
 
         if ($youTubeMatch || $vimeoMatch || $googleMapsMatch || $slideShare || $platformDomain) {
             $extra = ' frameborder="0"';
@@ -70,7 +70,7 @@ 
             } elseif ($vimeoMatch) {
                 $extra .= ' webkitAllowFullScreen mozallowfullscreen allowFullScreen';
             }
-            return '<iframe ' . $matches[1] . $extra . '></iframe>';
+            return '<iframe '.$matches[1].$extra.'></iframe>';
         } else {
             return '';
         }

main/inc/ajax/course.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
                         0, //howMany
                         1, //$orderby = 1
                         'ASC',
-                        -1,  //visibility
+                        -1, //visibility
                         $_GET['q'],
                         null, //$urlId
                         true //AlsoSearchCode
@@ -96,7 +96,7 @@ 
 
                 if (!empty($course['category_code'])) {
                     $parents = CourseCategory::getParentsToString($course['category_code']);
-                    $title = $parents . $course['title'];
+                    $title = $parents.$course['title'];
                 }
 
                 $results['items'][] = array(
@@ -176,7 +176,7 @@ 
                     INNER JOIN $session_course_user r ON u.user_id = r.user_id
                     WHERE session_id = %d AND c_id =  '%s'
                     AND (u.firstname LIKE '%s' OR u.username LIKE '%s' OR u.lastname LIKE '%s')";
-            $needle = '%' . $_GET['q'] . '%';
+            $needle = '%'.$_GET['q'].'%';
             $sql_query = sprintf($sql, $_GET['session_id'], $course['real_id'], $needle, $needle, $needle);
 
             $result = Database::query($sql_query);
@@ -195,11 +195,11 @@ 
     case 'search_exercise_by_course':
         if (api_is_platform_admin()) {
             $course = api_get_course_info_by_id($_GET['course_id']);
-            $session_id = (!empty($_GET['session_id'])) ?  intval($_GET['session_id']) : 0 ;
+            $session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0;
             $exercises = ExerciseLib::get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);
 
             foreach ($exercises as $exercise) {
-                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']) );
+                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']));
             }
             if (!empty($data)) {
                 $data[] = array('id' => 'T', 'text' => 'TODOS');
@@ -224,11 +224,11 @@ 
                 $sql,
                 intval($_GET['course_id']),
                 intval($_GET['session_id']),
-                '%' . Database::escape_string($_GET['q']).'%'
+                '%'.Database::escape_string($_GET['q']).'%'
             );
             $result = Database::query($sql_query);
             while ($survey = Database::fetch_assoc($result)) {
-                $survey['title'] .= ($survey['anonymous'] == 1) ? ' (' . get_lang('Anonymous') . ')' : '';
+                $survey['title'] .= ($survey['anonymous'] == 1) ? ' ('.get_lang('Anonymous').')' : '';
                 $data[] = array(
                     'id' => $survey['id'],
                     'text' => strip_tags(html_entity_decode($survey['title']))

Indentation +5 added lines, -5 removed lines

@@ -267,11 +267,11 @@
                 $coachName = api_get_person_name($userResult['firstname'], $userResult['lastname']);
             }
 
-           $courses[] = array(
-               'id' => $courseId,
-               'name' => $course['title'],
-               'coachName' => $coachName,
-           );
+            $courses[] = array(
+                'id' => $courseId,
+                'name' => $course['title'],
+                'coachName' => $coachName,
+            );
         }
 
         echo json_encode($courses);

src/Chamilo/PageBundle/Entity/User.php

Indentation +10 added lines, -10 removed lines

@@ -1875,11 +1875,11 @@ 
         return $this->locale;
     }
 
-     /**
-     * @param string $timezone
-     *
-     * @return User
-     */
+        /**
+         * @param string $timezone
+         *
+         * @return User
+         */
     public function setTimezone($timezone)
     {
         $this->timezone = $timezone;
@@ -2048,11 +2048,11 @@ 
         return $this->plainPassword;
     }
 
-      /**
-     * Returns the user roles
-     *
-     * @return array The roles
-     */
+        /**
+         * Returns the user roles
+         *
+         * @return array The roles
+         */
     public function getRoles()
     {
         $roles = $this->roles;

Doc Comments +3 added lines, -3 removed lines

@@ -907,7 +907,7 @@ 
     /**
      * Get pictureUri
      *
-     * @return Media
+     * @return string
      */
     public function getPictureUri()
     {
@@ -1284,7 +1284,7 @@ 
     }
 
     /**
-     * @return Media
+     * @return string
      */
     public function getAvatar()
     {
@@ -2051,7 +2051,7 @@ 
       /**
      * Returns the user roles
      *
-     * @return array The roles
+     * @return string[] The roles
      */
     public function getRoles()
     {