chamilo / chamilo-lms

main/course_home/vertical_activity.php

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         $content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
             <table width="100%">';
                 $content .= CourseHome::show_session_data($session_id);
-             $content .=  '</table></div>';
+                $content .=  '</table></div>';
     }
 
     $content .=  '<div class="Authoringview">';

Spacing +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
     // Show message to confirm that a tool it to be hidden from available tools
     // visibility 0,1->2
     if (!empty($_GET['askDelete'])) {
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
             <a href="'.api_get_self().'?delete=yes&id='.$id.'">'.get_lang('Yes').'</a>
         </div>';
@@ -56,14 +56,14 @@ 
 
 // Start of tools for CourseAdmins (teachers/tutors)
 if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
-    $content .=  '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
+    $content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
     <div class="normal-message" id="id_normal_message" style="display:none">';
-        $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
-        $content .=  get_lang('PleaseStandBy');
+        $content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
+        $content .= get_lang('PleaseStandBy');
 
-    $content .=  '</div>
+    $content .= '</div>
         <div class="confirmation-message" id="id_confirmation_message" style="display:none"></div></div>';
-    $content .=  '<div id="activity-3col">';
+    $content .= '<div id="activity-3col">';
 
     if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
         $content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
@@ -91,10 +91,10 @@ 
         $content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
             <table width="100%">';
                 $content .= CourseHome::show_session_data($session_id);
-             $content .=  '</table></div>';
+             $content .= '</table></div>';
     }
 
-    $content .=  '<div class="Authoringview">';
+    $content .= '<div class="Authoringview">';
                 $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
                 $content .= CourseHome::show_tools_category($my_list);
     $content .= '</div>';
@@ -106,19 +106,19 @@ 
         $content .= '<div class="course-student-view-activity-3col">';
         //ordering by get_lang name
         $order_tool_list = array();
-        foreach($my_list as $key=>$new_tool) {
+        foreach ($my_list as $key=>$new_tool) {
             $tool_name = CourseHome::translate_tool_name($new_tool);
-            $order_tool_list [$key]= $tool_name;
+            $order_tool_list [$key] = $tool_name;
         }
         natsort($order_tool_list);
         $my_temp_tool_array = array();
-        foreach($order_tool_list as $key=>$new_tool) {
+        foreach ($order_tool_list as $key=>$new_tool) {
             $my_temp_tool_array[] = $my_list[$key];
         }
         $my_list = $my_temp_tool_array;
 
         $i = 0;
-        foreach($my_list as $new_tool) {
+        foreach ($my_list as $new_tool) {
             if ($i >= 10) {
                 $my_list2[] = $new_tool;
             } else {
@@ -126,8 +126,8 @@ 
             }
             $i++;
         }
-        $content .=CourseHome::show_tools_category($my_list1);
-        $content .=CourseHome::show_tools_category($my_list2);
+        $content .= CourseHome::show_tools_category($my_list1);
+        $content .= CourseHome::show_tools_category($my_list2);
         $content .= '</div>';
     }
 }

main/course_home/2column.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
         $msgDestroy = get_lang('DelLk').'<br />';
         $msgDestroy .= '<a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;';
         $msgDestroy .= '<a href="'.api_get_self().'?destroy=yes&amp;id='.$id.'">'.get_lang('Yes').'</a>';
-        $show_message .= Display :: return_message($msgDestroy, 'confirmation',false);
+        $show_message .= Display :: return_message($msgDestroy, 'confirmation', false);
     }
 
     /*
@@ -63,7 +63,7 @@ 
     // Show message to confirm that a tool it to be hidden from available tools
     // visibility 0,1->2
     if (!empty($_GET['askDelete'])) {
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
             <a href="'.api_get_self().'?delete=yes&id='.intval($_GET['id']).'">'.get_lang('Yes').'</a>
         </div>';
@@ -79,8 +79,8 @@ 
 
 /*	TOOLS VISIBLE FOR EVERYBODY */
 
-$content .=  '<div class="everybodyview">';
-$content .=  '<table width="100%">';
+$content .= '<div class="everybodyview">';
+$content .= '<table width="100%">';
 $content .= CourseHome::show_tool_2column(TOOL_PUBLIC);
 $content .= '</table>';
 $content .= '</div>';
@@ -99,7 +99,7 @@ 
 
     /*	INACTIVE TOOLS - HIDDEN (GREY) LINKS */
 
-    $content .=	"<tr><td colspan=\"4\"><hr style='color:\"#4171B5\"' noshade=\"noshade\" size=\"1\" /></td></tr>\n".
+    $content .= "<tr><td colspan=\"4\"><hr style='color:\"#4171B5\"' noshade=\"noshade\" size=\"1\" /></td></tr>\n".
             "<tr>\n".
             "<td colspan=\"4\">\n".
             "<div style=\"margin-bottom: 10px;\"><font color=\"#808080\">\n".get_lang('InLnk')."</font></div>".
@@ -108,14 +108,14 @@ 
 
     $content .= CourseHome::show_tool_2column(TOOL_PUBLIC_BUT_HIDDEN);
 
-    $content .=	"</table>";
-    $content .=	"</div> ";
+    $content .= "</table>";
+    $content .= "</div> ";
 }
 
 /*	Tools for platform admin only */
 
 if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) {
-    $content .='<div class="platformadminview">
+    $content .= '<div class="platformadminview">
     <span class="viewcaption">'.get_lang('PlatformAdminOnly').'</span>
     <table width="100%">
         '.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).'

main/course_home/course_home.php

Indentation +10 added lines, -10 removed lines

@@ -228,7 +228,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
             }
         }
 
@@ -240,7 +240,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])) {
@@ -265,10 +265,10 @@ 
 
 /*	Introduction section (editable by course admins) */
 $content = Display::return_introduction_section(TOOL_COURSE_HOMEPAGE, array(
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
-		'CreateDocumentDir'    => 'document/',
-		'BaseHref'             => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
-	)
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+        'CreateDocumentDir'    => 'document/',
+        'BaseHref'             => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
+    )
 );
 
 /*	SWITCH TO A DIFFERENT HOMEPAGE VIEW
@@ -285,13 +285,13 @@ 
 if (api_get_setting('homepage_view') == 'activity' ||
     api_get_setting('homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 

Spacing +5 added lines, -5 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(){
@@ -219,13 +219,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
@@ -236,8 +236,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;

main/course_home/activity.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
     // Show message to confirm that a tool it to be hidden from available tools
     // visibility 0,1->2
     if (!empty($_GET['askDelete'])) {
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
             <a href="'.api_get_self().'?delete=yes&id='.$id.'">'.get_lang('Yes').'</a>
         </div>';
@@ -49,11 +49,11 @@ 
 
 // Start of tools for CourseAdmins (teachers/tutors)
 if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
-    $content .=  '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
+    $content .= '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
 		<div class="normal-message" id="id_normal_message" style="display:none">';
-    $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
-    $content .=  get_lang('PleaseStandBy');
-    $content .=  '</div>
+    $content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
+    $content .= get_lang('PleaseStandBy');
+    $content .= '</div>
 		<div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
 	</div>';
 
@@ -73,18 +73,18 @@ 
 
     $my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
     $items = CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Authoring'),  $items, 'course-tools-author');
+    $content .= return_block(get_lang('Authoring'), $items, 'course-tools-author');
 
     $my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
     $list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
 
-    $my_list = array_merge($my_list,$list2);
-    $items =  CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Interaction'),  $items, 'course-tools-interaction');
+    $my_list = array_merge($my_list, $list2);
+    $items = CourseHome::show_tools_category($my_list);
+    $content .= return_block(get_lang('Interaction'), $items, 'course-tools-interaction');
 
     $my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
     $items = CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Administration'),  $items , 'course-tools-administration');
+    $content .= return_block(get_lang('Administration'), $items, 'course-tools-administration');
 
 } elseif (api_is_coach()) {
     $content .= $pluginExtra;
@@ -94,10 +94,10 @@ 
 			<span class="viewcaption">'.get_lang('SessionData').'</span>
 			<table class="course_activity_home">';
         $content .= CourseHome::show_session_data($session_id);
-        $content .=  '</table></div></div>';
+        $content .= '</table></div></div>';
     }
 
-    $content .=  '<div class="row">';
+    $content .= '<div class="row">';
     $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
     $content .= CourseHome::show_tools_category($my_list);
     $content .= '</div>';
@@ -179,7 +179,7 @@ 
 {
     $html = '<div class="row">
                 <div class="col-xs-12 col-md-12">
-                    <div class="title-tools">' . $title . '</div>
+                    <div class="title-tools">' . $title.'</div>
                 </div>
             </div>
             <div class="row '.$class.'">'.$content.'</div>';

main/glossary/index.php

Indentation +4 added lines, -4 removed lines

@@ -34,9 +34,9 @@ 
 Event::event_access_tool(TOOL_GLOSSARY);
 
 function sorter($item1, $item2) {
-	if ($item1[2] == $item2[2])
-		return 0;
-	return $item1[2] < $item2[2] ? -1 : 1;
+    if ($item1[2] == $item2[2])
+        return 0;
+    return $item1[2] < $item2[2] ? -1 : 1;
 }
 
 // Displaying the header
@@ -80,7 +80,7 @@ 
         $list[] = array ($line[0], $line[1]);
     }
     $filename = 'glossary_course_'.api_get_course_id();
-	Export::arrayToCsv($list, $filename);
+    Export::arrayToCsv($list, $filename);
 }
 if (isset($_GET['action']) && $_GET['action'] == 'export_to_pdf') {
     GlossaryManager::export_to_pdf();

Spacing +21 added lines, -21 removed lines

@@ -9,7 +9,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-$current_course_tool  = TOOL_GLOSSARY;
+$current_course_tool = TOOL_GLOSSARY;
 
 // The section (tabs).
 $this_section = SECTION_COURSES;
@@ -44,24 +44,24 @@ 
 
 $tool = 'GlossaryManagement';
 
-$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Glossary'));
+$interbreadcrumb[] = array("url"=>"index.php", "name"=> get_lang('Glossary'));
 
 if (!empty($action)) {
 
 }
 switch ($action) {
     case 'addglossary':
-        $tool_name =  get_lang('Add');
+        $tool_name = get_lang('Add');
         break;
     case 'edit_glossary':
-        $tool_name =  get_lang('Edit');
+        $tool_name = get_lang('Edit');
         break;
     case 'import':
-        $tool_name =  get_lang('ImportGlossary');
+        $tool_name = get_lang('ImportGlossary');
         break;
     case 'changeview':
     default:
-        $tool_name =  get_lang('List');
+        $tool_name = get_lang('List');
         break;
 }
 
@@ -75,9 +75,9 @@ 
 
     usort($data, "sorter");
     $list = array();
-    $list[] = array('term','definition');
-    foreach($data as $line) {
-        $list[] = array ($line[0], $line[1]);
+    $list[] = array('term', 'definition');
+    foreach ($data as $line) {
+        $list[] = array($line[0], $line[1]);
     }
     $filename = 'glossary_course_'.api_get_course_id();
 	Export::arrayToCsv($list, $filename);
@@ -91,11 +91,11 @@ 
 // Tool introduction
 Display::display_introduction_section(TOOL_GLOSSARY);
 
-if (isset($_GET['action']) && $_GET['action'] == 'changeview' && in_array($_GET['view'], array('list','table'))) {
+if (isset($_GET['action']) && $_GET['action'] == 'changeview' && in_array($_GET['view'], array('list', 'table'))) {
     $_SESSION['glossary_view'] = $_GET['view'];
 } else {
     if (!isset($_SESSION['glossary_view'])) {
-        $_SESSION['glossary_view'] = 'table';//Default option
+        $_SESSION['glossary_view'] = 'table'; //Default option
     }
 }
 
@@ -143,12 +143,12 @@ 
                 // Setting the form elements
                 $form->addElement('header', '', get_lang('TermEdit'));
                 $form->addElement('hidden', 'glossary_id');
-                $form->addElement('text', 'glossary_title', get_lang('TermName'),array('size'=>'80'));
+                $form->addElement('text', 'glossary_title', get_lang('TermName'), array('size'=>'80'));
                 //$form->applyFilter('glossary_title', 'html_filter');
                 $form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'), null, array('ToolbarSet' => 'Glossary', 'Height' => '300'));
-                $element = $form->addElement('text', 'insert_date', get_lang('CreationDate'),array('size'=>'100'));
+                $element = $form->addElement('text', 'insert_date', get_lang('CreationDate'), array('size'=>'100'));
                 $element->freeze();
-                $element = $form->addElement('text', 'update_date', get_lang('UpdateDate'),array('size'=>'100'));
+                $element = $form->addElement('text', 'update_date', get_lang('UpdateDate'), array('size'=>'100'));
                 $element->freeze();
                 $form->addButtonUpdate(get_lang('TermUpdateButton'), 'SubmitGlossary');
 
@@ -156,16 +156,16 @@ 
                 $glossary_data = GlossaryManager::get_glossary_information($_GET['glossary_id']);
 
                 // Date treatment for timezones
-                if (!empty($glossary_data['insert_date'])  && $glossary_data['insert_date'] != '0000-00-00 00:00:00:') {
+                if (!empty($glossary_data['insert_date']) && $glossary_data['insert_date'] != '0000-00-00 00:00:00:') {
                     $glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date']);
                 } else {
-                    $glossary_data['insert_date']  = '';
+                    $glossary_data['insert_date'] = '';
                 }
 
-                if (!empty($glossary_data['update_date'])  && $glossary_data['update_date'] != '0000-00-00 00:00:00:') {
+                if (!empty($glossary_data['update_date']) && $glossary_data['update_date'] != '0000-00-00 00:00:00:') {
                     $glossary_data['update_date'] = api_get_local_time($glossary_data['update_date']);
                 } else {
-                    $glossary_data['update_date']  = '';
+                    $glossary_data['update_date'] = '';
                 }
 
                 $form->setDefaults($glossary_data);
@@ -225,7 +225,7 @@ 
                 if (isset($_POST['replace']) && $_POST['replace']) {
                     foreach (GlossaryManager::get_glossary_terms() as $term) {
                         if (!GlossaryManager::delete_glossary($term['id'], false)) {
-                            Display::display_error_message(get_lang ("CannotDeleteGlossary") . ':' . $term['id']);
+                            Display::display_error_message(get_lang("CannotDeleteGlossary").':'.$term['id']);
                         }
                     }
                 }
@@ -248,10 +248,10 @@ 
                         $bad++;
                 }
 
-                Display::display_confirmation_message(get_lang ("TermsImported") . ':' . $good);
+                Display::display_confirmation_message(get_lang("TermsImported").':'.$good);
 
                 if ($bad) {
-                    Display::display_error_message (get_lang ("TermsNotImported") . ':' . $bad);
+                    Display::display_error_message(get_lang("TermsNotImported").':'.$bad);
                 }
 
                 GlossaryManager::display_glossary();

Braces +8 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
 Event::event_access_tool(TOOL_GLOSSARY);
 
 function sorter($item1, $item2) {
-	if ($item1[2] == $item2[2])
-		return 0;
+	if ($item1[2] == $item2[2]) {
+			return 0;
+	}
 	return $item1[2] < $item2[2] ? -1 : 1;
 }
 
@@ -242,10 +243,11 @@ 
                         false
                     );
 
-                    if ($result)
-                        $good++;
-                    else
-                        $bad++;
+                    if ($result) {
+                                            $good++;
+                    } else {
+                                            $bad++;
+                    }
                 }
 
                 Display::display_confirmation_message(get_lang ("TermsImported") . ':' . $good);

main/glossary/glossary_ajax_request.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 if (isset($_POST['glossary_id']) &&
     $_POST['glossary_id'] == strval(intval($_POST['glossary_id']))
 ) {
-    $glossary_id= Security::remove_XSS($_POST['glossary_id']);
+    $glossary_id = Security::remove_XSS($_POST['glossary_id']);
     $glossary_description_by_id = GlossaryManager::get_glossary_term_by_glossary_id(
         $glossary_id
     );
@@ -31,7 +31,7 @@ 
         $glossary_description_by_id
     );
     echo api_xml_http_response_encode($glossary_description_by_id);
-} elseif (isset($_POST['glossary_data']) && $_POST['glossary_data']=='true') {
+} elseif (isset($_POST['glossary_data']) && $_POST['glossary_data'] == 'true') {
     //get_glossary_terms
     $glossary_data = GlossaryManager::get_glossary_terms();
     $glossary_all_data = array();
@@ -42,7 +42,7 @@ 
         $glossary_all_data = implode('[|.|_|.|-|.|]', $glossary_all_data);
         echo api_xml_http_response_encode($glossary_all_data);
     }
-} elseif(isset($_POST['glossary_name'])) {
+} elseif (isset($_POST['glossary_name'])) {
     $my_glossary_name = Security::remove_XSS($_POST['glossary_name']);
     $my_glossary_name = api_convert_encoding($my_glossary_name, $charset, 'UTF-8');
     $my_glossary_name = trim($my_glossary_name);

main/inc/global.inc.php

Spacing +3 added lines, -3 removed lines

@@ -155,9 +155,9 @@ 
     $request_url_root = '';
     if (empty($_SERVER['HTTP_HOST'])) {
         if (empty($_SERVER['SERVER_NAME'])) {
-            $request_url_root = $protocol . 'localhost/';
+            $request_url_root = $protocol.'localhost/';
         } else {
-            $request_url_root = $protocol . $_SERVER['SERVER_NAME'] . '/';
+            $request_url_root = $protocol.$_SERVER['SERVER_NAME'].'/';
         }
     } else {
         $request_url_root = $protocol.$_SERVER['HTTP_HOST'].'/';
@@ -446,7 +446,7 @@ 
     }
 
     if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false) {
-        $language_interface =  api_get_language_from_type($language_priority1);
+        $language_interface = api_get_language_from_type($language_priority1);
     } else {
         if (isset($_course['language'])) {
             $language_interface = $_course['language'];

main/inc/global_error_message.inc.php

Indentation +89 added lines, -89 removed lines

@@ -56,40 +56,40 @@ 
         $theme = 'chamilo';
     }
 
-	$css_path = 'app/Resources/public/css/';
-	$css_web_assets = 'web/assets/';
-	$css_web_path = 'web/css/';
+    $css_path = 'app/Resources/public/css/';
+    $css_web_assets = 'web/assets/';
+    $css_web_path = 'web/css/';
     $themePath = $css_path.'themes/'.$theme.'/default.css';
     $css_web_fontawesome = $css_web_assets.'fontawesome/css/font-awesome.css';
-	$bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
-	$css_base_file = $css_web_path.'base.css';
+    $bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
+    $css_base_file = $css_web_path.'base.css';
 
     $css_list = array($bootstrap_file, $css_base_file, $themePath);
 
     $web_img = 'main/img';
-	$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
-	$root_rel = htmlentities($_SERVER['PHP_SELF']);
-	if (!empty($root_rel)) {
-		$pos = strrpos($root_rel, '/');
-		$root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
-		if (strpos($root_rel, '/main/') !== false) {
-			$pos = 0;
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
-				$pos = $test_pos + 1;
-			}
-			$root_rel = substr($root_rel, 0, $pos);
-		} elseif (strpos($root_rel, '/courses/') !== false) {
-			$pos = 0;
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
-				$pos = $test_pos + 1;
-			}
-			$root_rel = substr($root_rel, 0, $pos);
-		}
-	}
-
-	$installation_guide_url = $root_rel.'documentation/installation_guide.html';
-
-	$css_def = '';
+    $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
+    $root_rel = htmlentities($_SERVER['PHP_SELF']);
+    if (!empty($root_rel)) {
+        $pos = strrpos($root_rel, '/');
+        $root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
+        if (strpos($root_rel, '/main/') !== false) {
+            $pos = 0;
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
+                $pos = $test_pos + 1;
+            }
+            $root_rel = substr($root_rel, 0, $pos);
+        } elseif (strpos($root_rel, '/courses/') !== false) {
+            $pos = 0;
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
+                $pos = $test_pos + 1;
+            }
+            $root_rel = substr($root_rel, 0, $pos);
+        }
+    }
+
+    $installation_guide_url = $root_rel.'documentation/installation_guide.html';
+
+    $css_def = '';
     foreach ($css_list as $css_item) {
         $css_base_chamilo_file = $root_sys.$css_item;
         if (file_exists($css_base_chamilo_file)) {
@@ -97,33 +97,33 @@ 
         }
     }
 
-	$global_error_message = array();
-
-	switch ($global_error_code) {
-		case 1:
-			$global_error_message['section'] = $SectionSystemRequirementsProblem;
-			$global_error_message['title'] = $IncorrectPhpVersionTitle;
-			$php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
-			$php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
-			$IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
-			$IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
-			$pos = strpos($IncorrectPhpVersionDescription, '%s3');
-			if ($pos !== false) {
-				$length = strlen($IncorrectPhpVersionDescription);
-				$read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
-				$IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
-				$IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
-			}
-			$global_error_message['description'] = $IncorrectPhpVersionDescription;
-			break;
-		case 2:
-			$global_error_message['section'] = $SectionInstallation;
-			$global_error_message['title'] = $InstallationTitle;
-			if (($pos = strpos($InstallationDescription, '%s')) === false) {
-				$InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
-			}
-			$read_installation_guide = substr($InstallationDescription, $pos + 2);
-			$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
+    $global_error_message = array();
+
+    switch ($global_error_code) {
+        case 1:
+            $global_error_message['section'] = $SectionSystemRequirementsProblem;
+            $global_error_message['title'] = $IncorrectPhpVersionTitle;
+            $php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
+            $php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
+            $IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
+            $IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
+            $pos = strpos($IncorrectPhpVersionDescription, '%s3');
+            if ($pos !== false) {
+                $length = strlen($IncorrectPhpVersionDescription);
+                $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
+                $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
+                $IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
+            }
+            $global_error_message['description'] = $IncorrectPhpVersionDescription;
+            break;
+        case 2:
+            $global_error_message['section'] = $SectionInstallation;
+            $global_error_message['title'] = $InstallationTitle;
+            if (($pos = strpos($InstallationDescription, '%s')) === false) {
+                $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
+            }
+            $read_installation_guide = substr($InstallationDescription, $pos + 2);
+            $InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
 			<div class="row"><div class="col-md-12">
 
                     <div class="office">
@@ -135,38 +135,38 @@ 
                           </p>
                     </div>
             </form>';
-			$global_error_message['description'] = $InstallationDescription;
-			break;
-		case 3:
-		case 4:
-		case 5:
-			$global_error_message['section'] = $SectionDatabaseUnavailable;
-			$global_error_message['title'] = $DatabaseUnavailableTitle;
-			$global_error_message['description'] = $DatabaseUnavailableDescription;
-			break;
-		case 6:
-			$global_error_message['section'] = $SectionProtection;
-			$global_error_message['title'] = $AlreadyInstalledTitle;
-			$global_error_message['description'] = $AlreadyInstalledDescription;
-			break;
-		default:
-			$global_error_message['section'] = $SectionTechnicalIssues;
-			$global_error_message['title'] = $TechnicalIssuesTitle;
-			$global_error_message['description'] = $TechnicalIssuesDescription;
-			break;
-	}
-
-	$show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
-	$global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
-	$global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
-	$global_error_message['organisation'] = $Organisation;
-	$global_error_message['powered_by'] = $PoweredBy;
-	$global_error_message['encoding'] = 'UTF-8';
-	$global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
+            $global_error_message['description'] = $InstallationDescription;
+            break;
+        case 3:
+        case 4:
+        case 5:
+            $global_error_message['section'] = $SectionDatabaseUnavailable;
+            $global_error_message['title'] = $DatabaseUnavailableTitle;
+            $global_error_message['description'] = $DatabaseUnavailableDescription;
+            break;
+        case 6:
+            $global_error_message['section'] = $SectionProtection;
+            $global_error_message['title'] = $AlreadyInstalledTitle;
+            $global_error_message['description'] = $AlreadyInstalledDescription;
+            break;
+        default:
+            $global_error_message['section'] = $SectionTechnicalIssues;
+            $global_error_message['title'] = $TechnicalIssuesTitle;
+            $global_error_message['description'] = $TechnicalIssuesDescription;
+            break;
+    }
+
+    $show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
+    $global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
+    $global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
+    $global_error_message['organisation'] = $Organisation;
+    $global_error_message['powered_by'] = $PoweredBy;
+    $global_error_message['encoding'] = 'UTF-8';
+    $global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
 
     $installChamiloImage = base64_encode(file_get_contents("$root_sys/main/img/install-chamilo.gif"));
 
-	$global_error_message_page =
+    $global_error_message_page =
 <<<EOM
 <!DOCTYPE html>
 <html>
@@ -236,9 +236,9 @@ 
 		</body>
 </html>
 EOM;
-	foreach ($global_error_message as $key => $value) {
-		$global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
-	}
-	header('Content-Type: text/html; charset='.$global_error_message['encoding']);
-	die($global_error_message_page);
+    foreach ($global_error_message as $key => $value) {
+        $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
+    }
+    header('Content-Type: text/html; charset='.$global_error_message['encoding']);
+    die($global_error_message_page);
 }

main/inc/introductionSection.inc.php

Spacing +29 added lines, -29 removed lines

@@ -53,7 +53,7 @@ 
     $form = new FormValidator('introduction_text');
 }
 
-$renderer =& $form->defaultRenderer();
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
 
 $config = array(
@@ -208,11 +208,11 @@ 
     if ($displayMode == '1') {
         // Show only the current course progress step
         // $information_title = get_lang('InfoAboutLastDoneAdvance');
-        $last_done_advance =  $thematic->get_last_done_thematic_advance();
+        $last_done_advance = $thematic->get_last_done_thematic_advance();
         $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
         $subTitle1 = get_lang('CurrentTopic');
         $class1 = ' current';
-    } else if($displayMode == '2') {
+    } else if ($displayMode == '2') {
         // Show only the two next course progress steps
         // $information_title = get_lang('InfoAboutNextAdvanceNotDone');
         $last_done_advance = $thematic->get_next_thematic_advance_not_done();
@@ -220,10 +220,10 @@ 
         $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
         $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
         $subTitle1 = $subTitle2 = get_lang('NextTopic');
-    } else if($displayMode == '3') {
+    } else if ($displayMode == '3') {
         // Show the current and next course progress steps
         // $information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone');
-        $last_done_advance =  $thematic->get_last_done_thematic_advance();
+        $last_done_advance = $thematic->get_last_done_thematic_advance();
         $next_advance_not_done = $thematic->get_next_thematic_advance_not_done();
         $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
         $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
@@ -234,8 +234,8 @@ 
 
     if (!empty($thematic_advance_info)) {
         $thematic_advance = get_lang('CourseThematicAdvance');
-        $thematicScore = $thematic->get_total_average_of_thematic_advances() . '%';
-        $thematicUrl = api_get_path(WEB_CODE_PATH) .
+        $thematicScore = $thematic->get_total_average_of_thematic_advances().'%';
+        $thematicUrl = api_get_path(WEB_CODE_PATH).
             'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
         $thematic_info = $thematic->get_thematic_list(
             $thematic_advance_info['thematic_id']
@@ -250,13 +250,13 @@ 
         );
         $userInfo = $_SESSION['_user'];
         $courseInfo = api_get_course_info();
-        $titleThematic = $thematic_advance .' : '. $courseInfo['name'] . ' <b>( '. $thematicScore .' )</b>';
+        $titleThematic = $thematic_advance.' : '.$courseInfo['name'].' <b>( '.$thematicScore.' )</b>';
 
 
 
-        $infoUser = '<div class="thematic-avatar"><img src="' . $userInfo['avatar'] . '" class="img-circle img-responsive"></div>';
+        $infoUser = '<div class="thematic-avatar"><img src="'.$userInfo['avatar'].'" class="img-circle img-responsive"></div>';
         $infoUser .= '<div class="progress">
-                        <div class="progress-bar progress-bar-danger" role="progressbar" style="width: ' . $thematicScore . ';">
+                        <div class="progress-bar progress-bar-danger" role="progressbar" style="width: ' . $thematicScore.';">
                         '.$thematicScore.'
                         </div>
                     </div>';
@@ -265,11 +265,11 @@ 
         $thematicItemOne = '
         <div class="col-md-6 items-progress">
             <div class="thematic-cont '.$class1.'">
-            <div class="topics">' . $subTitle1 . '</div>
-            <h4 class="title-topics">' . Display::returnFontAwesomeIcon('book') . $thematic_info['title'] . '</h4>
-            <p class="date">' .  Display::returnFontAwesomeIcon('calendar-o') . $thematic_advance_info['start_date'] . '</p>
-            <div class="views">' . Display::returnFontAwesomeIcon('file-text-o')  . strip_tags($thematic_advance_info['content']). '</div>
-            <p class="time">'. Display::returnFontAwesomeIcon('clock-o') . get_lang('DurationInHours') . ' : ' . $thematic_advance_info['duration'] . ' - <a href="' . $thematicUrl . '">' . get_lang('SeeDetail') . '</a></p>
+            <div class="topics">' . $subTitle1.'</div>
+            <h4 class="title-topics">' . Display::returnFontAwesomeIcon('book').$thematic_info['title'].'</h4>
+            <p class="date">' .  Display::returnFontAwesomeIcon('calendar-o').$thematic_advance_info['start_date'].'</p>
+            <div class="views">' . Display::returnFontAwesomeIcon('file-text-o').strip_tags($thematic_advance_info['content']).'</div>
+            <p class="time">'. Display::returnFontAwesomeIcon('clock-o').get_lang('DurationInHours').' : '.$thematic_advance_info['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
             </div>
         </div>';
 
@@ -282,21 +282,21 @@ 
                 <div class="col-md-6 items-progress">
                     <div class="thematic-cont">
                     <div class="topics">'.$subTitle2.'</div>
-                    <h4 class="title-topics">'. Display::returnFontAwesomeIcon('book')  . $thematic_info2['title'].'</h4>
-                    <p class="date">' . Display::returnFontAwesomeIcon('calendar-o') .$thematic_advance_info2['start_date'].'</p>
-                    <div class="views">' . Display::returnFontAwesomeIcon('file-text-o')  . strip_tags($thematic_advance_info2['content']).'</div>
-                    <p class="time">'. Display::returnFontAwesomeIcon('clock-o') .get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
+                    <h4 class="title-topics">'. Display::returnFontAwesomeIcon('book').$thematic_info2['title'].'</h4>
+                    <p class="date">' . Display::returnFontAwesomeIcon('calendar-o').$thematic_advance_info2['start_date'].'</p>
+                    <div class="views">' . Display::returnFontAwesomeIcon('file-text-o').strip_tags($thematic_advance_info2['content']).'</div>
+                    <p class="time">'. Display::returnFontAwesomeIcon('clock-o').get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
                     </div>
                 </div>';
         }
 
 
         $thematicPanel = '<div class="row">';
-        $thematicPanel .= '<div class="col-md-2">' . $infoUser . '</div>';
-        $thematicPanel .= '<div class="col-md-10"><div class="row">' . $thematicItemOne . $thematicItemTwo . '</div></div>';
+        $thematicPanel .= '<div class="col-md-2">'.$infoUser.'</div>';
+        $thematicPanel .= '<div class="col-md-10"><div class="row">'.$thematicItemOne.$thematicItemTwo.'</div></div>';
         $thematicPanel .= '</div>';
         $thematicPanel .= '<div class="separate">
-                        <a href="' . $thematicUrl . '" class="btn btn-default btn-block">' . get_lang('ShowFullCourseAdvance') . '</a>
+                        <a href="' . $thematicUrl.'" class="btn btn-default btn-block">'.get_lang('ShowFullCourseAdvance').'</a>
                     </div>';
         $thematicProgress = Display::panelCollapse($titleThematic, $thematicPanel, 'thematic', null, 'accordion-thematic', 'collapse-thematic', false);
     }
@@ -313,7 +313,7 @@ 
     $editIconButton = Display::url(
         '<em class="fa fa-wrench"></em> ',
         api_get_path(WEB_CODE_PATH).'course_info/tools.php?'.api_get_cidreq(),
-        ['class' => 'btn btn-default', 'title' => get_lang('CustomizeIcons') ]
+        ['class' => 'btn btn-default', 'title' => get_lang('CustomizeIcons')]
     );
 }
 
@@ -324,12 +324,12 @@ 
         // Displays "Add intro" commands
         $toolbar = '<div class="btn-group pull-right" role="group">';
         if (!empty($courseId)) {
-            $textIntro  = '<a class="btn btn-default" title="' . get_lang('AddIntro') . '" href="'.api_get_self().'?' . api_get_cidreq().'&intro_cmdAdd=1">';
+            $textIntro  = '<a class="btn btn-default" title="'.get_lang('AddIntro').'" href="'.api_get_self().'?'.api_get_cidreq().'&intro_cmdAdd=1">';
             $textIntro .= '<em class="fa fa-file-text"></em> ';
             $textIntro .= "</a>";
-            $toolbar .= $textIntro . $editIconButton;
+            $toolbar .= $textIntro.$editIconButton;
         } else {
-            $toolbar .= '<a class="btn btn-default" href="' . api_get_self() . '?intro_cmdAdd=1">"' . get_lang('AddIntro') . '</a>';
+            $toolbar .= '<a class="btn btn-default" href="'.api_get_self().'?intro_cmdAdd=1">"'.get_lang('AddIntro').'</a>';
             $toolbar .= $editIconButton;
         }
         $toolbar .= '</div>';
@@ -342,7 +342,7 @@ 
                 '<a  class="btn btn-default" href="'.api_get_self().'?'.api_get_cidreq().'&intro_cmdEdit=1" title="'.get_lang('Modify').'">
                 <em class="fa fa-pencil"></em></a>';
             $toolbar .= $editIconButton;
-            $toolbar .="<a class=\"btn btn-default\" href=\"".api_get_self()."?".api_get_cidreq()."&intro_cmdDel=1\" onclick=\"javascript:
+            $toolbar .= "<a class=\"btn btn-default\" href=\"".api_get_self()."?".api_get_cidreq()."&intro_cmdDel=1\" onclick=\"javascript:
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
                 "')) return false;\"><em class=\"fa fa-trash-o\"></em></a>";
 
@@ -356,7 +356,7 @@ 
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
                 "')) return false;\"><em class=\"fa fa-trash-o\"></em></a>";
         }
-        $toolbar .=  "</div>";
+        $toolbar .= "</div>";
         // Fix for chrome XSS filter for videos in iframes - BT#7930
         $browser = api_get_navigator();
         if (strpos($introduction_section, '<iframe') !== false && $browser['name'] == 'Chrome') {
@@ -375,7 +375,7 @@ 
     } else {
         if (api_is_allowed_to_edit()) {
             $introduction_section .= '<div class="help-course">';
-            $introduction_section .= get_lang('AddCustomCourseIntro') . ' ' . $textIntro;
+            $introduction_section .= get_lang('AddCustomCourseIntro').' '.$textIntro;
             $introduction_section .= '</div>';
         }
     }