chamilo / chamilo-lms

main/gradebook/gradebook_add_cat.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 require_once '../inc/global.inc.php';
 $_in_course = true;
 $course_code = api_get_course_id();
-if (empty($course_code )) {
+if (empty($course_code)) {
     $_in_course = false;
 }
 
@@ -23,7 +23,7 @@ 
 $my_user_id = api_get_user_id();
 $catadd->set_user_id($my_user_id);
 $catadd->set_parent_id($get_select_cat);
-$catcourse = Category :: load ($get_select_cat);
+$catcourse = Category :: load($get_select_cat);
 
 if ($_in_course) {
     $catadd->set_course_code($course_code);
@@ -37,12 +37,12 @@ 
     $catadd,
     'add_cat_form',
     null,
-    api_get_self() . '?selectcat='.$get_select_cat.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$get_select_cat.'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
     $values = $form->exportValues();
-    $select_course=isset($values['select_course']) ? $values['select_course'] : array();
+    $select_course = isset($values['select_course']) ? $values['select_course'] : array();
     $cat = new Category();
     if ($values['hid_parent_id'] == '0') {
         if ($select_course == 'COURSEINDEPENDENT') {
@@ -89,12 +89,12 @@ 
     }
     $cat->set_visible($visible);
     $result = $cat->add();
-    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?addcat=&selectcat=' . $cat->get_parent_id().'&'.api_get_cidreq());
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?addcat=&selectcat='.$cat->get_parent_id().'&'.api_get_cidreq());
     exit;
 }
 
 if (!$_in_course) {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$get_select_cat.'&'.api_get_cidreq(),
         'name' => get_lang('Gradebook')
     );

main/gradebook/gradebook_view_result.php

Spacing +32 added lines, -32 removed lines

@@ -62,7 +62,7 @@ 
         $resultedit[0],
         'edit_result_form',
         null,
-        api_get_self() . '?editres=' . $resultedit[0]->get_id() . '&selecteval=' . $select_eval.'&'.api_get_cidreq()
+        api_get_self().'?editres='.$resultedit[0]->get_id().'&selecteval='.$select_eval.'&'.api_get_cidreq()
     );
 
     if ($edit_res_form->validate()) {
@@ -79,21 +79,21 @@ 
         }
         $result->save();
         unset($result);
-        header('Location: gradebook_view_result.php?selecteval=' . $select_eval . '&editresmessage=&'.api_get_cidreq());
+        header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&editresmessage=&'.api_get_cidreq());
         exit;
     }
 }
 $file_type = null;
 if (isset($_GET['import'])) {
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?selecteval=' . $select_eval.'&'.api_get_cidreq(),
+        'url' => api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?selecteval='.$select_eval.'&'.api_get_cidreq(),
         'name' => get_lang('ViewResult')
     );
     $import_result_form = new DataForm(
         DataForm :: TYPE_IMPORT,
         'import_result_form',
         null,
-        api_get_self() . '?import=&selecteval=' . $select_eval,
+        api_get_self().'?import=&selecteval='.$select_eval,
         '_blank',
         ''
     );
@@ -122,7 +122,7 @@ 
                     if (($importedresult['user_id'] == $allresult->get_user_id())) {
                         if ($importedresult['score'] != $allresult->get_score()) {
                             if (!isset($values['overwrite'])) {
-                                header('Location: '.api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?selecteval=' . $select_eval . '&import_score_error=' . $importedresult['user_id']);
+                                header('Location: '.api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?selecteval='.$select_eval.'&import_score_error='.$importedresult['user_id']);
                                 exit;
                                 break;
                             } else {
@@ -140,7 +140,7 @@ 
                     }
                 }
                 if ($importedresult['user_id'] == null) {
-                    header('Location: gradebook_view_result.php?selecteval=' . $select_eval . '&incorrectdata=');
+                    header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&incorrectdata=');
                     exit;
                 }
                 $userinfo = api_get_user_info($importedresult['user_id']);
@@ -149,13 +149,13 @@ 
                     $userinfo['official_code'] != $importedresult['official_code']
                 ) {
                     if (!isset($values['ignoreerrors'])) {
-                        header('Location: gradebook_view_result.php?selecteval=' . $select_eval . '&import_user_error=' . $importedresult['user_id']);
+                        header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&import_user_error='.$importedresult['user_id']);
                         exit;
                     }
                 }
                 if ($added != '1') {
                     if ($importedresult['score'] > $eval[0]->get_max()) {
-                        header('Location: gradebook_view_result.php?selecteval=' . $select_eval . '&overwritemax=');
+                        header('Location: gradebook_view_result.php?selecteval='.$select_eval.'&overwritemax=');
                         exit;
                     }
                     $result = new Result();
@@ -174,18 +174,18 @@ 
                 }
             }
         } else {
-            header('Location: ' . api_get_self() . '?import=&selecteval=' . $select_eval . '&importnofile=');
+            header('Location: '.api_get_self().'?import=&selecteval='.$select_eval.'&importnofile=');
             exit;
         }
         if ($overwritescore != 0) {
-            header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '&importoverwritescore=' . $overwritescore);
+            header('Location: '.api_get_self().'?selecteval='.$select_eval.'&importoverwritescore='.$overwritescore);
             exit;
         }
         if ($nr_results_added == 0) {
-            header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '&nothingadded=');
+            header('Location: '.api_get_self().'?selecteval='.$select_eval.'&nothingadded=');
             exit;
         }
-        header('Location: ' . api_get_self() . '?selecteval=' . $select_eval . '&importok=');
+        header('Location: '.api_get_self().'?selecteval='.$select_eval.'&importok=');
         exit;
     }
 }
@@ -200,7 +200,7 @@ 
         DataForm :: TYPE_EXPORT,
         'export_result_form',
         null,
-        api_get_self() . '?export=&selecteval=' . $select_eval,
+        api_get_self().'?export=&selecteval='.$select_eval,
         '_blank',
         $locked_status
     );
@@ -211,7 +211,7 @@ 
     if ($export_result_form->validate()) {
         $export = $export_result_form->exportValues();
         $file_type = $export['file_type'];
-        $filename = 'export_results_' . gmdate('Y-m-d_H-i-s');
+        $filename = 'export_results_'.gmdate('Y-m-d_H-i-s');
         $results = Result :: load(null, null, $select_eval);
         $data = array(); //when file type is csv, add a header to the output file
         if ($file_type == 'csv') {
@@ -231,9 +231,9 @@ 
             $datagen = new ResultsDataGenerator($eval[0], $allresults);
 
             // set headers pdf
-            !empty($_user['official_code']) ? $officialcode = $_user['official_code'] . ' - ' : '';
+            !empty($_user['official_code']) ? $officialcode = $_user['official_code'].' - ' : '';
 
-            $h1 = array(get_lang('Teacher'), $officialcode . $_user['firstName'] . ', ' . $_user['lastName']);
+            $h1 = array(get_lang('Teacher'), $officialcode.$_user['firstName'].', '.$_user['lastName']);
             $h2 = array(get_lang('Score'), $eval[0]->get_max());
             $h3 = array(get_lang('Course'), $_course['name']);
             $h4 = array(get_lang('Weight'), $eval[0]->get_weight());
@@ -243,9 +243,9 @@ 
             $header_pdf = array($h1, $h2, $h3, $h4, $h5, $h6);
 
             // set footer pdf
-            $f1 = '<hr />' . get_lang('Drh');
-            $f2 = '<hr />' . get_lang('Teacher');
-            $f3 = '<hr />' . get_lang('Date');
+            $f1 = '<hr />'.get_lang('Drh');
+            $f2 = '<hr />'.get_lang('Teacher');
+            $f3 = '<hr />'.get_lang('Date');
             $footer_pdf = array($f1, $f2, $f3);
 
             // set title pdf
@@ -254,9 +254,9 @@ 
             // set headers data table
             $head_ape_name = '';
             if (api_is_western_name_order()) {
-                $head_ape_name = get_lang('FirstName') . ', ' . get_lang('LastName');
+                $head_ape_name = get_lang('FirstName').', '.get_lang('LastName');
             } else {
-                $head_ape_name = get_lang('LastName') . ', ' . get_lang('FirstName');
+                $head_ape_name = get_lang('LastName').', '.get_lang('FirstName');
             }
 
             $head_table = array(
@@ -291,15 +291,15 @@ 
                 $result[] = $user_info['username'];
 
                 if (api_is_western_name_order()) {
-                    $result[] = $user_info['firstname'] . ', ' . $user_info['lastname'];
+                    $result[] = $user_info['firstname'].', '.$user_info['lastname'];
                 } else {
-                    $result[] = $user_info['lastname'] . ', ' . $user_info['firstname'];
+                    $result[] = $user_info['lastname'].', '.$user_info['firstname'];
                 }
                 if ($number_decimals == null) {
                     if (empty($data['scoreletter']) && !is_numeric($data['score'])) {
                         $result[] = get_lang('DidNotTakeTheExam');
                     } else {
-                        $result[] = api_strtoupper(get_lang('Literal' . $data['scoreletter']));
+                        $result[] = api_strtoupper(get_lang('Literal'.$data['scoreletter']));
                     }
                 } else {
                     if (empty($data['score']) && !is_numeric($data['score'])) {
@@ -350,7 +350,7 @@ 
 if (isset($_GET['resultdelete'])) {
     $result = Result :: load($_GET['resultdelete']);
     $result[0]->delete();
-    header('Location: gradebook_view_result.php?deleteresult=&selecteval=' . $select_eval);
+    header('Location: gradebook_view_result.php?deleteresult=&selecteval='.$select_eval);
     exit;
 }
 
@@ -367,7 +367,7 @@ 
                     $result[0]->delete();
                     $number_of_deleted_results++;
                 }
-                header('Location: gradebook_view_result.php?massdelete=&selecteval=' . $select_eval);
+                header('Location: gradebook_view_result.php?massdelete=&selecteval='.$select_eval);
                 exit;
                 break;
         }
@@ -408,14 +408,14 @@ 
 
 $htmlHeadXtra[] = '<script>
 function confirmationuser() {
-    if (confirm("' . get_lang('DeleteUser') . '?"))
+    if (confirm("' . get_lang('DeleteUser').'?"))
     	{return true;}
     else
     	{return false;}
 }
 
 function confirmationall () {
-    if (confirm("' . get_lang('DeleteAll') . '?"))
+    if (confirm("' . get_lang('DeleteAll').'?"))
     	{return true;}
     else
     	{return false;}
@@ -423,13 +423,13 @@ 
 </script>';
 if (isset($_GET['deleteall'])) {
     $eval[0]->delete_results();
-    header('Location: '.api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?allresdeleted=&selecteval=' . $select_eval.'&'.api_get_cidreq());
+    header('Location: '.api_get_path(WEB_CODE_PATH).'gradebook/gradebook_view_result.php?allresdeleted=&selecteval='.$select_eval.'&'.api_get_cidreq());
     exit;
 }
 if (!isset($_GET['export']) && (!isset($_GET['import']))) {
     if (!isset($_GET['selectcat'])) {
         $interbreadcrumb[] = array(
-            'url' => $_SESSION['gradebook_dest'] . '?selectcat=' . $currentcat[0]->get_id().'&'.api_get_cidreq(),
+            'url' => $_SESSION['gradebook_dest'].'?selectcat='.$currentcat[0]->get_id().'&'.api_get_cidreq(),
             'name' => get_lang('Details')
         );
     }
@@ -484,7 +484,7 @@ 
     Display :: display_warning_message(get_lang('OverWriteMax'), false);
 }
 if (isset($_GET['importoverwritescore'])) {
-    Display :: display_confirmation_message(get_lang('ImportOverWriteScore') . ' ' . $_GET['importoverwritescore']);
+    Display :: display_confirmation_message(get_lang('ImportOverWriteScore').' '.$_GET['importoverwritescore']);
 }
 if (isset($_GET['import_user_error'])) {
     $userinfo = api_get_user_info($_GET['import_user_error']);
@@ -497,7 +497,7 @@ 
 }
 if (isset($_GET['import_score_error'])) {
     $userinfo = api_get_user_info($_GET['import_score_error']);
-    Display :: display_warning_message(get_lang('ScoreDoesNotMatch') . ' ' . api_get_person_name($userinfo['firstname'], $userinfo['lastname']));
+    Display :: display_warning_message(get_lang('ScoreDoesNotMatch').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']));
 }
 if ($file_type == null) {
     //show the result header

main/gradebook/lib/fe/exportgradebook.php

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
  * @param	string	View to print as a title for the table
  * @param	string	Course name to print as title for the table
  */
-function print_table($data_array,$header_names,$view,$coursename)
+function print_table($data_array, $header_names, $view, $coursename)
 {
 	$printdata = '<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -160,7 +160,7 @@ 
 
 	$count_pages = ceil(count($data_table) / $items_per_page);
     $content_table = '';
-    for ($x = 0; $x<$count_pages; $x++) {
+    for ($x = 0; $x < $count_pages; $x++) {
         $content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
         // header table
         $content_table .= '<tr>';
@@ -169,7 +169,7 @@ 
 
             foreach ($headers_table as $head_table) {
                 if (!empty($head_table[0])) {
-                    $width = (!empty($head_table[1])?$head_table[1].'%':'');
+                    $width = (!empty($head_table[1]) ? $head_table[1].'%' : '');
                     $content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
                     $i++;
                 }
@@ -178,16 +178,16 @@ 
         $content_table .= '</tr>';
         // body table
         if (is_array($data_table) && count($data_table) > 0) {
-            $offset = $x*$items_per_page;
-            $data_table = array_slice ($data_table, $offset, count($data_table));
+            $offset = $x * $items_per_page;
+            $data_table = array_slice($data_table, $offset, count($data_table));
             $i = 1;
-            $item = $offset+1;
+            $item = $offset + 1;
             foreach ($data_table as $data) {
                 $content_table .= '<tr>';
-                $content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+                $content_table .= '<td>'.($item < 10 ? '0'.$item : $item).'</td>';
                 foreach ($data as  $key => $content) {
                     if (isset($content)) {
-                        $key == 1 ? $align='align="left"':$align='align="center"';
+                        $key == 1 ? $align = 'align="left"' : $align = 'align="center"';
                         $content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
                     }
                 }
@@ -240,10 +240,10 @@ 
                             <h1>'.$title_pdf.'</h1></td></tr>';
         foreach ($headers_pdf as $header_pdf) {
             if (!empty($header_pdf[0]) && !empty($header_pdf[1])) {
-                $header.= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
+                $header .= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
             }
         }
-        $header.='</table><br />';
+        $header .= '</table><br />';
     }
 
     // preparing footer pdf
@@ -267,7 +267,7 @@ 
     }
     $items_per_page = 30;
     $count_pages = ceil(count($data_table) / $items_per_page);
-    for ($x = 0; $x<$count_pages; $x++) {
+    for ($x = 0; $x < $count_pages; $x++) {
         $content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
         // header table
         $content_table .= '<tr>';
@@ -275,7 +275,7 @@ 
         if (is_array($headers_table)) {
             foreach ($headers_table as $head_table) {
                 if (!empty($head_table[0])) {
-                    $width = (!empty($head_table[1])?$head_table[1].'%':'');
+                    $width = (!empty($head_table[1]) ? $head_table[1].'%' : '');
                     $content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
                     $i++;
                 }
@@ -285,16 +285,16 @@ 
         // body table
 
         if (is_array($data_table) && count($data_table) > 0) {
-            $offset = $x*$items_per_page;
-            $data_table = array_slice ($data_table, $offset, count($data_table));
+            $offset = $x * $items_per_page;
+            $data_table = array_slice($data_table, $offset, count($data_table));
             $i = 1;
-            $item = $offset+1;
+            $item = $offset + 1;
             foreach ($data_table as $data) {
                 $content_table .= '<tr>';
-                $content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+                $content_table .= '<td>'.($item < 10 ? '0'.$item : $item).'</td>';
                 foreach ($data as  $key => $content) {
                     if (isset($content)) {
-                        $key == 1 ? $align='align="left"':$align='align="center"';
+                        $key == 1 ? $align = 'align="left"' : $align = 'align="center"';
                         $content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
                     }
                 }
@@ -312,7 +312,7 @@ 
     $pdf = new PDF();
     $pdf->set_custom_footer($footer);
     $pdf->set_custom_header($headers_in_pdf);
-    $pdf->content_to_pdf($header.$content_table, $css, $title_pdf );
+    $pdf->content_to_pdf($header.$content_table, $css, $title_pdf);
     exit;
 
 }
@@ -327,8 +327,8 @@ 
 function export_pdf($pdf, $newarray, $header_names, $format)
 {
 	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-	$pdf->ezSetCmMargins(0,0,0,0);
-	$pdf->ezSetY(($format=='portrait')?'820':'570');
+	$pdf->ezSetCmMargins(0, 0, 0, 0);
+	$pdf->ezSetY(($format == 'portrait') ? '820' : '570');
 	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
     if ($format == 'portrait') {
         $pdf->line(40, 790, 540, 790);
@@ -337,7 +337,7 @@ 
         $pdf->line(40, 540, 790, 540);
         $pdf->line(40, 40, 790, 40);
     }
-    $pdf->ezSetY(($format=='portrait')?'750':'520');
+    $pdf->ezSetY(($format == 'portrait') ? '750' : '520');
     $pdf->ezTable($newarray, $header_names, '', array(
         'showHeadings' => 1,
         'shaded' => 1,

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

main/session/resume_session.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 $tool_name = get_lang('SessionOverview');
 
 //$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 $orig_param = '&origin=resume_session';
 
@@ -183,7 +183,7 @@ 
 
 		$coachs = array();
 		if (Database::num_rows($rs) > 0) {
-			while($info_coach = Database::fetch_array($rs)) {
+			while ($info_coach = Database::fetch_array($rs)) {
                 $coachs[] = api_get_person_name(
                         $info_coach['firstname'],
                         $info_coach['lastname']
@@ -194,7 +194,7 @@ 
 		}
 
 		if (count($coachs) > 0) {
-			$coach = implode('<br />',$coachs);
+			$coach = implode('<br />', $coachs);
 		} else {
 			$coach = get_lang('None');
 		}
@@ -217,7 +217,7 @@ 
         $downIcon = 'down.png';
         $downUrl = api_get_self().'?id_session='.$sessionId.'&course_id='.$course->getId().'&action=move_down';
 
-        if ($count +1 == count($courses)) {
+        if ($count + 1 == count($courses)) {
             $downIcon = 'down_na.png';
             $downUrl = '#';
         }
@@ -244,7 +244,7 @@ 
 			<td>'.$coach.'</td>
 			<td>'.$numberOfUsers.'</td>
 			<td>
-                <a href="'. $courseUrl . '">'.
+                <a href="'. $courseUrl.'">'.
                 Display::return_icon('course_home.gif', get_lang('Course')).'</a>
                 '.$orderButtons.'
                 <a href="session_course_user_list.php?id_session='.$sessionId.'&course_code='.$course->getCode().'">'.
@@ -309,7 +309,7 @@ 
             array('onclick' => "javascript:if(!confirm('".get_lang('ConfirmYourChoice')."')) return false;")
         );
 
-        $addUserToUrlLink= '';
+        $addUserToUrlLink = '';
         if ($multiple_url_is_on) {
             if ($user['access_url_id'] != $url_id) {
                 $userLink .= ' '.Display::return_icon(

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',

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

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

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
     public function createHtmlStyle()
     {
         $style = '';
-        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '' ) {
+        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '') {
             $cssFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
             if (!is_file($cssFile)) {
                 $cssFile = api_get_path(WEB_CSS_PATH).'editor.css';
@@ -147,14 +147,14 @@ 
         return [[
             'title' => get_lang('EmptyTemplate'),
             'description' => null,
-            'image' => api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/empty.gif',
+            'image' => api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/empty.gif',
             'html' => '
                 <!DOCYTPE html>
                 <html>
                     <head>
-                        <meta charset="' . api_get_system_encoding() . '" />
+                        <meta charset="' . api_get_system_encoding().'" />
                     </head>
-                    <body  dir="' . api_get_text_direction() . '">
+                    <body  dir="' . api_get_text_direction().'">
                         <p>
                             <br/>
                         </p>
@@ -177,7 +177,7 @@ 
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
         $replace = array(
             '',
-            api_get_path(REL_CODE_PATH) . 'img/',
+            api_get_path(REL_CODE_PATH).'img/',
             api_get_path(REL_PATH),
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
@@ -188,7 +188,7 @@ 
         foreach ($systemTemplates as $template) {
             $image = $template->getImage();
             $image = !empty($image) ? $image : 'empty.gif';
-            $image = api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $image;
+            $image = api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$image;
 
             /*$image = $this->urlGenerator->generate(
                 'get_document_template_action',
@@ -240,12 +240,12 @@ 
             $templateItem['image'] = api_get_path(WEB_APP_PATH)
                 . 'home/default_platform_document/template_thumb/noimage.gif';
             $templateItem['html'] = file_get_contents(api_get_path(SYS_COURSE_PATH)
-                . $courseDirectory . '/document' . $templateData['path']);
+                . $courseDirectory.'/document'.$templateData['path']);
 
             $image = $template->getImage();
             if (!empty($image)) {
                 $templateItem['image'] = api_get_path(WEB_COURSE_PATH)
-                    . $courseDirectory . '/upload/template_thumbnails/' . $template->getImage();
+                    . $courseDirectory.'/upload/template_thumbnails/'.$template->getImage();
             }
 
             $templateList[] = $templateItem;

main/permissions/permissions_functions.inc.php

Spacing +143 added lines, -143 removed lines

@@ -26,34 +26,34 @@ 
     $course_id = api_get_course_int_id();
     
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
+	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+	$result = Database::query($sql);
 
 	// looping through the post values to find the permission (containing the string permission* )
 	foreach ($_POST as $key => $value)
 	{
-		if (strstr($key,"permission*"))
+		if (strstr($key, "permission*"))
 		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
+			list($brol, $tool, $action) = explode("*", $key);
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+			$result = Database::query($sql);
 		}
 	}
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function store_one_permission($content, $action, $id, $tool,$permission) {
+function store_one_permission($content, $action, $id, $tool, $permission) {
 	global $rights_full;
     $course_id = api_get_course_int_id();
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@ 
 
 	// Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionGranted');
 		}
 	}
-	if ($action=='revoke')
+	if ($action == 'revoke')
 	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionRevoked');
 		}
 	}
 	return $result_message;
@@ -125,44 +125,44 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
+	$currentpermissions = array();
 	// Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
 	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
 	}
 	elseif ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
 	}
 	elseif ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
 	}
 	elseif ($content == 'platform_role')
 	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
 	}
 	elseif ($content == 'task')
 	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
 	}
 
 	// finding all the permissions. We store this in a multidimensional array
 	// where the first dimension is the tool.
-	$sql="
-		SELECT * FROM " . $table . "
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
+	$sql = "
+		SELECT * FROM " . $table."
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
+	while ($row = Database::fetch_array($result))
 		$currentpermissions[$row['tool']][] = $row['action'];
 
 	return $currentpermissions;
@@ -179,7 +179,7 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
+	if (api_get_setting('permissions') == 'limited')
 	{
 		foreach ($current_permissions as $tool=>$tool_rights)
 		{
@@ -187,15 +187,15 @@ 
 			// if it is visibility or move we have to grant the edit right
 			foreach ($tool_rights as $key=>$value)
 			{
-				if ($value=='View')
+				if ($value == 'View')
 				{
 					unset($current_permissions[$tool][$key]);
 				}
-				if ($value=='Visibility' OR $value=='Move')
+				if ($value == 'Visibility' OR $value == 'Move')
 				{
-					if (!in_array('Edit',$current_permissions[$tool]))
+					if (!in_array('Edit', $current_permissions[$tool]))
 					{
-						$current_permissions[$tool][]='Edit';
+						$current_permissions[$tool][] = 'Edit';
 					}
 					unset($current_permissions[$tool][$key]);
 				}
@@ -207,7 +207,7 @@ 
 		}
 		return $current_permissions;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
 		return $current_permissions;
 	}
@@ -222,12 +222,12 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+	$checked = "";
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 	{
-		$checked="checked";
+		$checked = "checked";
 	}
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
@@ -243,28 +243,28 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 	if ($course_admin) {
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
+		if (in_array($permission, $inherited_permissions[$tool])) {
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
 				if ($editable) {
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+					foreach ($_GET as $key=>$value) {
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -275,20 +275,20 @@ 
 			} else {
 				if ($editable)
 				{
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value)
 					{
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 
 	if ($course_admin)
@@ -324,32 +324,32 @@ 
 	}
 	else
 	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		}
 		else
 		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 			{
 				if ($editable)
 				{
 					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key => $value)
+					foreach ($_GET as $key => $value)
 					{
 						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url = $url . '?' . $urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -362,17 +362,17 @@ 
 					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,30 +397,30 @@ 
 	global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
 
 	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if (in_array($row['role_id'], $current_course_roles))
 		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
+			$checked = 'checked';
+			$image = 'checkbox_on2.gif';
+			$action = 'revoke';
 		}
 		else
 		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
+			$checked = '';
+			$image = 'wrong.gif';
+			$action = 'grant';
 		}
-		if ($setting_visualisation=='checkbox')
+		if ($setting_visualisation == 'checkbox')
 		{
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
 		}
-		if ($setting_visualisation=='image')
+		if ($setting_visualisation == 'image')
 		{
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
 		}
@@ -440,24 +440,24 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles($content,$id, $scope='course') {
-    $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+function get_roles($content, $id, $scope = 'course') {
+    $course_id = api_get_course_int_id();    
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	if ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
+	$table_role = Database::get_course_table(TABLE_ROLE);
 
-	$current_roles=array();
+	$current_roles = array();
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result)) {
+		$current_roles[] = $row['role_id'];
 	}
 	return $current_roles;
 }
@@ -468,26 +468,26 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_all_roles($content='course') {
+function get_all_roles($content = 'course') {
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
+	if ($content == 'course')
 	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
+		$table_role = Database::get_course_table(TABLE_ROLE);
 	}
-	if ($content=='platform')
+	if ($content == 'platform')
 	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
+		$table_role = Database::get_main_table(TABLE_ROLE);
 		$course_id_condition = '';
 	}
 
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$current_roles = array();
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
-		$roles[]=$row;
+		$roles[] = $row;
 	}
 
 	return $roles;
@@ -504,10 +504,10 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles_permissions($content,$id, $scope='course') {
+function get_roles_permissions($content, $id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
 	}
 
@@ -536,21 +536,21 @@ 
 	$sql = "
 		SELECT *
 		FROM
-			" . $table . " role_group_user,
-			" . $table_role . " role,
-			" . $table_role_permissions . " role_permissions
+			" . $table." role_group_user,
+			" . $table_role." role,
+			" . $table_role_permissions." role_permissions
 		WHERE
 		    role_group_user.c_id = $course_id AND
 		    $role_condition
-			role_group_user.scope = '" . $scope . "' AND
-			role_group_user." . $id_field . " = '" . $id . "' AND
+			role_group_user.scope = '".$scope."' AND
+			role_group_user." . $id_field." = '".$id."' AND
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
 	$result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+	while ($row = Database::fetch_array($result)) {
+		$current_role_permissions[$row['tool']][] = $row['action'];
     }
 	return $current_role_permissions;
 }
@@ -564,33 +564,33 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 */
 
-function assign_role($content, $action, $id, $role_id, $scope='course') {
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	} elseif ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	} else {
 		return  get_lang('Error');
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleGranted');
+			$result_message = get_lang('RoleGranted');
 		}
 	}
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
+	if ($action == 'revoke') {
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleRevoked');
+			$result_message = get_lang('RoleRevoked');
 		}
 	}
 	return $result_message;
@@ -607,7 +607,7 @@ 
 	{
 		foreach ($permissions as $permissionkey=>$permissionvalue)
 		{
-			$array1[$tool][]=$permissionvalue;
+			$array1[$tool][] = $permissionvalue;
 		}
 	}
 	return $array1;