chamilo / chamilo-lms

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

Spacing +7 added lines, -7 removed lines

@@ -56,11 +56,11 @@ 
                 '-',
                 'Find'
             ],
-            ['Wikilink','Link','Unlink','Anchor'],
-            ['Image','Video','Flash','Oembed','Youtube','Audio','Asciimath'],
-            ['Table','HorizontalRule','Smiley','SpecialChar','leaflet'],
-            ['Format','Font','FontSize'],
-            ['Bold','Italic','Underline'],
+            ['Wikilink', 'Link', 'Unlink', 'Anchor'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio', 'Asciimath'],
+            ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'leaflet'],
+            ['Format', 'Font', 'FontSize'],
+            ['Bold', 'Italic', 'Underline'],
             [
                 'Subscript',
                 'Superscript',
@@ -94,10 +94,10 @@ 
         return [
             ['Save', 'NewPage', 'Templates', '-', 'PasteText'],
             ['Undo', 'Redo'],
-            ['Wikilink', 'Link', 'Image', 'Video', 'Flash', 'Audio', 'Table',  'Asciimath', 'Asciisvg'],
+            ['Wikilink', 'Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-            ['Styles','Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
+            ['Styles', 'Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
             api_get_setting('enabled_wiris') == 'true' ? ['ckeditor_wiris_formulaEditor', 'ckeditor_wiris_CAS'] : [''],
             ['Toolbarswitch']
         ];

main/inc/lib/upload.xajax.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 include(dirname(__FILE__).'/../global.inc.php');
 $xajax_upload = new Xajax();
-$xajax_upload -> registerFunction ('updateProgress');
+$xajax_upload -> registerFunction('updateProgress');
 $xajax_upload -> processRequests();
 
 /**
@@ -19,11 +19,11 @@ 
 
 	$objResponse = new xajaxResponse();
 	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
+	$percent = intval($ul_info['bytes_uploaded'] * 100 / $ul_info['bytes_total']);
+	if ($waitAfterupload && $ul_info['est_sec'] < 2) {
 		$percent = 100;
-		$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
+		$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+		$objResponse->addAssign($div_id.'_waiter_frame', 'innerHTML', Display::return_icon('progress_bar.gif'));
 		$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
 	}
 	$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');

Indentation +12 added lines, -12 removed lines

@@ -17,17 +17,17 @@
  */
 function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
 
-	$objResponse = new xajaxResponse();
-	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
-		$percent = 100;
-		$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
-		$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
-	}
-	$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-	$objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
+    $objResponse = new xajaxResponse();
+    $ul_info = uploadprogress_get_info($upload_id);
+    $percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
+    if($waitAfterupload && $ul_info['est_sec']<2) {
+        $percent = 100;
+        $objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+        $objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
+        $objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
+    }
+    $objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+    $objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
 
-	return $objResponse;
+    return $objResponse;
 }

main/inc/lib/search/tool_processors/link_processor.class.php

Spacing +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process links before pass it to search listing scripts
@@ -104,11 +104,11 @@ 
 
             $link_id = intval($link_id);
             $sql = "SELECT insert_user_id FROM $item_property_table
-              		WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id
+              		WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
               		LIMIT 1";
 
             $name = get_lang('Links');
-            $url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
+            $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
             $url = sprintf($url, $course_id_alpha);
             // Get the image path
             $thumbnail = Display::returnIconPath('link.png');

main/inc/lib/search/tool_processors/document_processor.class.php

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@ 
             $dk_result = Database::query($sql);
 
             $sql = "SELECT insert_user_id FROM       $item_property_table
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
                     LIMIT 1";
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {

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/document/upload.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
 }
 
 if (empty($document_data)) {
-    $document_id  = $parent_id =  0;
+    $document_id = $parent_id = 0;
     $path = '/';
 } else {
     $document_id = $document_data['id'];
@@ -201,11 +201,11 @@ 
 
 // Link back to the documents overview
 if ($is_certificate_mode) {
-    $actions = '<a href="document.php?id='.$document_id.'&selectcat=' . $selectcat.'&'.api_get_cidreq().'">'.
-        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions = '<a href="document.php?id='.$document_id.'&selectcat='.$selectcat.'&'.api_get_cidreq().'">'.
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 } else {
     $actions = '<a href="document.php?id='.$document_id.'&'.api_get_cidreq().'">'.
-        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 // Link to create a folder

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 '';
         }