chamilo / chamilo-lms

main/gradebook/lib/results_data_generator.class.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Get total number of results (rows)
      */
-    public function get_total_results_count ()
+    public function get_total_results_count()
     {
         return count($this->results);
     }
@@ -53,12 +53,12 @@ 
      * 4 ['score']     : student's score
      * 5 ['display']   : custom score display (only if custom scoring enabled)
      */
-    public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false)
+    public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false)
     {
         // do some checks on count, redefine if invalid value
         $number_decimals = api_get_setting('gradebook_number_decimals');
         if (!isset($count)) {
-            $count = count ($this->results) - $start;
+            $count = count($this->results) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -66,11 +66,11 @@ 
         $scoredisplay = ScoreDisplay :: instance();
         // generate actual data array
         $table = array();
-        foreach($this->results as $result) {
+        foreach ($this->results as $result) {
             $user = array();
             $info = api_get_user_info($result->get_user_id());
             $user['id'] = $result->get_user_id();
-            if ($pdf){
+            if ($pdf) {
                 $user['username'] = $info['username'];
             }
             $user['result_id'] = $result->get_id();
@@ -92,7 +92,7 @@ 
                 true
             )
             );
-            if ($pdf && $number_decimals == null){
+            if ($pdf && $number_decimals == null) {
                 $user['scoreletter'] = $result->get_score();
             }
             if ($scoredisplay->is_custom()) {
@@ -132,13 +132,13 @@ 
      * @param bool  Whether we want to ignore the score color
      * @result string The score as we want to show it
      */
-    private function get_score_display ($score, $realscore, $ignore_score_color = false)
+    private function get_score_display($score, $realscore, $ignore_score_color = false)
     {
         if ($score != null) {
             $scoredisplay = ScoreDisplay :: instance();
             $type = SCORE_CUSTOM;
             if ($realscore === true) {
-                $type = SCORE_DIV_PERCENT ;
+                $type = SCORE_DIV_PERCENT;
             }
 
             return $scoredisplay->display_score(
@@ -172,10 +172,10 @@ 
         }
     }
 
-    function sort_by_mask ($item1, $item2)
+    function sort_by_mask($item1, $item2)
     {
-        $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null);
-        $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null);
+        $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null);
+        $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null);
         return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
     }
 }

main/admin/ldap_import_students.php

Spacing +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -18,11 +18,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -48,7 +48,7 @@ 
 
 $annee = $_GET['annee'];
 $composante = $_GET['composante'];
-$etape =  $_GET['etape'];
+$etape = $_GET['etape'];
 $course = $_POST['course'];
 
 
@@ -198,7 +198,7 @@ 
 	echo '</div>';
 }
 */
-elseif(!empty($annee) && empty($course))
+elseif (!empty($annee) && empty($course))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -206,7 +206,7 @@ 
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
 	echo '<select name="course">';
 	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
+	foreach ($courses as $row)
 	{
 		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
 	}
@@ -239,7 +239,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -259,7 +259,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -270,25 +270,25 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['course']))
 	{
-		foreach($UserList as $user_id)
+		foreach ($UserList as $user_id)
 		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
+			CourseManager::add_user_to_course($user_id, $_POST['course']);
 		}
 		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
 	}
@@ -314,8 +314,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

Indentation +101 added lines, -101 removed lines

@@ -56,19 +56,19 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($course))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
-		echo get_lang('LDAPSelectFilterOnUsersOU');
-		//echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
-		///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
-
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
+        echo get_lang('LDAPSelectFilterOnUsersOU');
+        //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
+        ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
+
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 /*
@@ -200,71 +200,71 @@ 
 */
 elseif(!empty($annee) && empty($course))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="course">';
-	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
-	{
-		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="course">';
+    $courses = CourseManager::get_courses_list();
+    foreach($courses as $row)
+    {
+        echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($course) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -272,27 +272,27 @@ 
 }
 elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['course']))
-	{
-		foreach($UserList as $user_id)
-		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
-		}
-		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
-	}
-	/*
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['course']))
+    {
+        foreach($UserList as $user_id)
+        {
+            CourseManager::add_user_to_course($user_id,$_POST['course']);
+        }
+        header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -311,13 +311,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/access_url_add_usergroup_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
                   <?php
                     echo Display::get_alphabet_options($firstLetterUserGroup);
                     echo Display::get_numeric_options(0, 9, $firstLetterUserGroup);
-                  ?>
+                    ?>
             </select>
         </td>
         <td width="20%">&nbsp;</td>

Spacing +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
 
 $tool_name = get_lang('AddUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display::display_header($tool_name);
 
@@ -46,8 +46,8 @@ 
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ;
-    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array();
+    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $firstLetterUserGroup = $_POST['first_letter_user_group'];
 
     if ($form_sent == 1) {

Braces +8 added lines, -2 removed lines

@@ -99,7 +99,10 @@ 
         <td width="40%" align="center">
         <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($dbUserGroups as $item) { ?>
-			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?>
+			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $item['name']; ?>
             </option>
         <?php } ?>
     </select>
@@ -110,7 +113,10 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

main/admin/course_request_rejected.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,

main/admin/course_intro_pdf_import.php

Spacing +5 added lines, -5 removed lines

@@ -90,26 +90,26 @@
 {
     $baseDir = api_get_path(SYS_ARCHIVE_PATH);
     $uploadPath = 'pdfimport/';
-    $errors = array ();
+    $errors = array();
     if (!is_dir($baseDir.$uploadPath)) {
         @mkdir($baseDir.$uploadPath);
     }
-    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024*1024*1024)) {
+    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024 * 1024 * 1024)) {
         error_log('Could not unzip uploaded file in '.__FILE__.', line '.__LINE__);
         return $errors;
     }
     $list = scandir($baseDir.$uploadPath);
     $i = 0;
     foreach ($list as $file) {
-        if (substr($file,0,1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
+        if (substr($file, 0, 1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
             continue;
         }
-        $parts = preg_split('/_/',$file);
+        $parts = preg_split('/_/', $file);
         $course = api_get_course_info($parts[0]);
         if (count($course) > 0) {
             // Build file info because handle_uploaded_document() needs it (name, type, size, tmp_name)
             $fileSize = filesize($baseDir.$uploadPath.$file);
-            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2],0,-4));
+            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2], 0, -4));
             if ($docId > 0) {
                 if (!is_file($baseDir.$uploadPath.$file)) {
                     error_log($baseDir.$uploadPath.$file.' does not exists in '.__FILE__);

main/admin/add_courses_to_usergroup.php

Indentation +11 added lines, -11 removed lines

@@ -229,31 +229,31 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+        if (!($add_type=='multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
         <?php
-      } else {
-      ?>
+        } else {
+        ?>
       <div id="ajax_list_multiple">
         <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
       </div>
     <?php
-      }
-     ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
         <em class="fa fa-arrow-left"></em>
     </button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
         <em class="fa fa-arrow-right"></em>
     </button>
@@ -262,8 +262,8 @@ 
         <em class="fa fa-arrow-left"></em>
     </button>
     <?php
-  }
-  ?>
+    }
+    ?>
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">

Braces +4 added lines, -1 removed lines

@@ -144,7 +144,10 @@
 echo '</div>';
 ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) {
+    echo '&add=true' ;
+}
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
 
 if ($add_type=='multiple') {

Spacing +11 added lines, -11 removed lines

@@ -19,14 +19,14 @@ 
 api_protect_admin_script(true);
 
 // Setting breadcrumbs.
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
 
 // Setting the name of the tool.
 $tool_name = get_lang('SubscribeClassToCourses');
 
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -97,7 +97,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 $searchForm->addElement('hidden', 'id', $id);
 foreach ($filters as $param) {
     $searchForm->addElement($param['type'], $param['name'], $param['label']);
@@ -141,7 +141,7 @@ 
 
 //checking for extra field with filter on
 
-function search($needle,$type)
+function search($needle, $type)
 {
     global $elements_in;
     $xajax_response = new xajaxResponse();
@@ -180,7 +180,7 @@ 
 }
 
 echo '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="usergroups.php">'.Display::return_icon('back.png', get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
 echo Display::url(get_lang('AdvancedSearch'), '#', array('class' => 'advanced_options', 'id' => 'advanced_search'));
 echo '</div>';
 
@@ -190,7 +190,7 @@ 
 
 ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 
 <?php echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
 echo Display::input('hidden', 'id', $id);
@@ -209,7 +209,7 @@ 
   <td align="center"><b><?php echo get_lang('CoursesInGroup') ?> :</b></td>
 </tr>
 
-<?php if ($add_type=='multiple') { ?>
+<?php if ($add_type == 'multiple') { ?>
 <tr>
 <td align="center">
 <?php echo get_lang('FirstLetterCourseTitle'); ?> :
@@ -227,7 +227,7 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+      if (!($add_type == 'multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
@@ -235,7 +235,7 @@ 
       } else {
       ?>
       <div id="ajax_list_multiple">
-        <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
+        <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_not_in', 'size'=>'15px'), false); ?>
       </div>
     <?php
       }
@@ -266,7 +266,7 @@ 
   </td>
   <td align="center">
 <?php
-    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'),false );
+    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_in', 'size'=>'15px'), false);
     unset($sessionUsersList);
 ?>
  </td>

main/admin/user_export.php

Spacing +15 added lines, -15 removed lines

@@ -22,16 +22,16 @@ 
 
 set_time_limit(0);
 
-$courses = array ();
+$courses = array();
 $courses[''] = '--';
 $sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code";
 
 global $_configuration;
 
 if (api_is_multiple_url_enabled()) {
-	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+	$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
+	if ($access_url_id != -1) {
 	$sql = "SELECT code,visual_code,title
 		FROM $course_table as c
 		INNER JOIN $tbl_course_rel_access_url as course_rel_url
@@ -46,11 +46,11 @@ 
 }
 $form = new FormValidator('export_users');
 $form->addElement('header', $tool_name);
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML','xml');
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML', 'xml');
 $form->addElement('radio', 'file_type', null, 'CSV', 'csv');
 $form->addElement('radio', 'file_type', null, 'XLS', 'xls');
 
-$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'),'1');
+$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'), '1');
 $form->addElement('select', 'course_code', get_lang('OnlyUsersFromCourse'), $courses);
 $form->addButtonExport(get_lang('Export'));
 $form->setDefaults(array('file_type' => 'csv'));
@@ -68,7 +68,7 @@ 
 				u.firstname 	AS FirstName,
 				u.email 		AS Email,
 				u.username	AS UserName,
-				".(($_configuration['password_encryption']!='none')?" ":"u.password AS Password, ")."
+				".(($_configuration['password_encryption'] != 'none') ? " " : "u.password AS Password, ")."
 				u.auth_source	AS AuthSource,
 				u.status		AS Status,
 				u.official_code	AS OfficialCode,
@@ -83,10 +83,10 @@ 
 		$filename = 'export_users_'.$course_code.'_'.api_get_local_time();
 	} else {
 		if (api_is_multiple_url_enabled()) {
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 			$access_url_id = api_get_current_access_url_id();
 			if ($access_url_id != -1) {
-			$sql.= " FROM $user_table u
+			$sql .= " FROM $user_table u
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
 				ON (u.user_id= user_rel_url.user_id)
 				WHERE access_url_id = $access_url_id
@@ -98,8 +98,8 @@ 
 		$filename = 'export_users_'.api_get_local_time();
 	}
 	$data = array();
-	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
-	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
+	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false);
+	if ($export['addcsvheader'] == '1' AND $export['file_type'] == 'csv') {
 		if ($_configuration['password_encryption'] != 'none') {
 			$data[] = array(
 				'UserId',
@@ -127,19 +127,19 @@ 
 			);
 		}
 
-		foreach($extra_fields as $extra) {
-			$data[0][]=$extra[1];
+		foreach ($extra_fields as $extra) {
+			$data[0][] = $extra[1];
 		}
 	}
 
 	$res = Database::query($sql);
-	while($user = Database::fetch_array($res,'ASSOC')) {
+	while ($user = Database::fetch_array($res, 'ASSOC')) {
 		$student_data = UserManager:: get_extra_user_data(
 			$user['UserId'],
 			true,
 			false
 		);
-		foreach($student_data as $key=>$value) {
+		foreach ($student_data as $key=>$value) {
 			$key = substr($key, 6);
 			if (is_array($value)) {
 				$user[$key] = $value[$key];
@@ -147,7 +147,7 @@ 
 				$user[$key] = $value;
 			}
 		}
-		$data[] = $user	;
+		$data[] = $user;
 	}
 
 	switch ($file_type) {

Indentation +93 added lines, -93 removed lines

@@ -29,20 +29,20 @@ 
 global $_configuration;
 
 if (api_is_multiple_url_enabled()) {
-	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
-	$sql = "SELECT code,visual_code,title
+    $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1){
+    $sql = "SELECT code,visual_code,title
 		FROM $course_table as c
 		INNER JOIN $tbl_course_rel_access_url as course_rel_url
 		ON (c.id = course_rel_url.c_id)
 		WHERE access_url_id = $access_url_id
 		ORDER BY visual_code";
-	}
+    }
 }
 $result = Database::query($sql);
 while ($course = Database::fetch_object($result)) {
-	$courses[$course->code] = $course->visual_code.' - '.$course->title;
+    $courses[$course->code] = $course->visual_code.' - '.$course->title;
 }
 $form = new FormValidator('export_users');
 $form->addElement('header', $tool_name);
@@ -56,13 +56,13 @@ 
 $form->setDefaults(array('file_type' => 'csv'));
 
 if ($form->validate()) {
-	$export = $form->exportValues();
-	$file_type = $export['file_type'];
-	$course_code = Database::escape_string($export['course_code']);
-	$courseInfo = api_get_course_info($course_code);
-	$courseId = $courseInfo['real_id'];
+    $export = $form->exportValues();
+    $file_type = $export['file_type'];
+    $course_code = Database::escape_string($export['course_code']);
+    $courseInfo = api_get_course_info($course_code);
+    $courseId = $courseInfo['real_id'];
 
-	$sql = "SELECT
+    $sql = "SELECT
 				u.user_id 	AS UserId,
 				u.lastname 	AS LastName,
 				u.firstname 	AS FirstName,
@@ -73,96 +73,96 @@ 
 				u.status		AS Status,
 				u.official_code	AS OfficialCode,
 				u.phone		AS Phone";
-	if (strlen($course_code) > 0) {
-		$sql .= " FROM $user_table u, $course_user_table cu
+    if (strlen($course_code) > 0) {
+        $sql .= " FROM $user_table u, $course_user_table cu
 					WHERE
 						u.user_id = cu.user_id AND
 						cu.c_id = $courseId AND
 						cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
 					ORDER BY lastname,firstname";
-		$filename = 'export_users_'.$course_code.'_'.api_get_local_time();
-	} else {
-		if (api_is_multiple_url_enabled()) {
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1) {
-			$sql.= " FROM $user_table u
+        $filename = 'export_users_'.$course_code.'_'.api_get_local_time();
+    } else {
+        if (api_is_multiple_url_enabled()) {
+            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1) {
+            $sql.= " FROM $user_table u
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
 				ON (u.user_id= user_rel_url.user_id)
 				WHERE access_url_id = $access_url_id
 				ORDER BY lastname,firstname";
-			}
-		} else {
-			$sql .= " FROM $user_table u ORDER BY lastname,firstname";
-		}
-		$filename = 'export_users_'.api_get_local_time();
-	}
-	$data = array();
-	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
-	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
-		if ($_configuration['password_encryption'] != 'none') {
-			$data[] = array(
-				'UserId',
-				'LastName',
-				'FirstName',
-				'Email',
-				'UserName',
-				'AuthSource',
-				'Status',
-				'OfficialCode',
-				'PhoneNumber',
-			);
-		} else {
-			$data[] = array(
-				'UserId',
-				'LastName',
-				'FirstName',
-				'Email',
-				'UserName',
-				'Password',
-				'AuthSource',
-				'Status',
-				'OfficialCode',
-				'PhoneNumber',
-			);
-		}
-
-		foreach($extra_fields as $extra) {
-			$data[0][]=$extra[1];
-		}
-	}
-
-	$res = Database::query($sql);
-	while($user = Database::fetch_array($res,'ASSOC')) {
-		$student_data = UserManager:: get_extra_user_data(
-			$user['UserId'],
-			true,
-			false
-		);
-		foreach($student_data as $key=>$value) {
-			$key = substr($key, 6);
-			if (is_array($value)) {
-				$user[$key] = $value[$key];
-			} else {
-				$user[$key] = $value;
-			}
-		}
-		$data[] = $user	;
-	}
-
-	switch ($file_type) {
-		case 'xml':
-			Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
-			exit;
-			break;
-		case 'csv':
-			Export::arrayToCsv($data, $filename);
-			exit;
-		case 'xls':
-			Export::arrayToXls($data, $filename);
-			exit;
-			break;
-	}
+            }
+        } else {
+            $sql .= " FROM $user_table u ORDER BY lastname,firstname";
+        }
+        $filename = 'export_users_'.api_get_local_time();
+    }
+    $data = array();
+    $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
+    if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
+        if ($_configuration['password_encryption'] != 'none') {
+            $data[] = array(
+                'UserId',
+                'LastName',
+                'FirstName',
+                'Email',
+                'UserName',
+                'AuthSource',
+                'Status',
+                'OfficialCode',
+                'PhoneNumber',
+            );
+        } else {
+            $data[] = array(
+                'UserId',
+                'LastName',
+                'FirstName',
+                'Email',
+                'UserName',
+                'Password',
+                'AuthSource',
+                'Status',
+                'OfficialCode',
+                'PhoneNumber',
+            );
+        }
+
+        foreach($extra_fields as $extra) {
+            $data[0][]=$extra[1];
+        }
+    }
+
+    $res = Database::query($sql);
+    while($user = Database::fetch_array($res,'ASSOC')) {
+        $student_data = UserManager:: get_extra_user_data(
+            $user['UserId'],
+            true,
+            false
+        );
+        foreach($student_data as $key=>$value) {
+            $key = substr($key, 6);
+            if (is_array($value)) {
+                $user[$key] = $value[$key];
+            } else {
+                $user[$key] = $value;
+            }
+        }
+        $data[] = $user	;
+    }
+
+    switch ($file_type) {
+        case 'xml':
+            Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
+            exit;
+            break;
+        case 'csv':
+            Export::arrayToCsv($data, $filename);
+            exit;
+        case 'xls':
+            Export::arrayToXls($data, $filename);
+            exit;
+            break;
+    }
 }
 
 Display :: display_header($tool_name);

main/admin/course_export.php

Indentation +21 added lines, -21 removed lines

@@ -46,7 +46,7 @@ 
         $courses = $course_list;
     }
 
-	if (!empty($courses)) {
+    if (!empty($courses)) {
 
         $archiveFile = 'export_courses_list_'.api_get_local_time();
 
@@ -98,13 +98,13 @@ 
                 Export::arrayToXls($listToExport, $archiveFile);
                 break;
         }
-	} else {
+    } else {
         Display::addFlash(
             Display::return_message(
                 get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty')
             )
         );
-	}
+    }
 }
 
 
@@ -114,29 +114,29 @@ 
 $form->addHeader($tool_name);
 $form->addHidden('formSent', 1);
 $form->addElement(
-	'radio',
-	'select_type',
-	get_lang('Option'),
-	get_lang('ExportAllCoursesList'),
-	 '1',
-	 ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
+    'radio',
+    'select_type',
+    get_lang('Option'),
+    get_lang('ExportAllCoursesList'),
+        '1',
+        ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
 );
 
 $form->addElement(
-	'radio',
-	'select_type',
-	'',
-	get_lang('ExportSelectedCoursesFromCoursesList'),
-	'2',
-	['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
+    'radio',
+    'select_type',
+    '',
+    get_lang('ExportSelectedCoursesFromCoursesList'),
+    '2',
+    ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
 );
 
 if (!empty($course_list)) {
-	$form->addHtml('<div id="div-course-list" style="display:none">');
-	$coursesInList = [];
-	foreach ($course_list as $course) {
-		$coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
-	}
+    $form->addHtml('<div id="div-course-list" style="display:none">');
+    $coursesInList = [];
+    foreach ($course_list as $course) {
+        $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
+    }
 
     $form->addSelect(
         'course_code',
@@ -145,7 +145,7 @@ 
         ['multiple' => 'multiple']
     );
 
-	$form->addHtml('</div>');
+    $form->addHtml('</div>');
 }
 
 $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 api_protect_admin_script();
 
 $tool_name = get_lang('ExportCourses');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 set_time_limit(0);
 
@@ -64,17 +64,17 @@ 
         $dataToExport = [];
 
         foreach ($courses as $course) {
-            $dataToExport['code'] = str_replace(';',',',$course['code']);
-            $dataToExport['title'] = str_replace(';',',',$course['title']);
-            $dataToExport['category_code'] = str_replace(';',',',$course['category_code']);
+            $dataToExport['code'] = str_replace(';', ',', $course['code']);
+            $dataToExport['title'] = str_replace(';', ',', $course['title']);
+            $dataToExport['category_code'] = str_replace(';', ',', $course['category_code']);
             $categoryInfo = CourseCategory::getCategory($course['category_code']);
             if ($categoryInfo) {
-                $dataToExport['category_name'] = str_replace(';',',',$categoryInfo['name']);
+                $dataToExport['category_name'] = str_replace(';', ',', $categoryInfo['name']);
             } else {
                 $dataToExport['category_name'] = '';
             }
-            $dataToExport['tutor_name'] = str_replace(';',',',$course['tutor_name']);
-            $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
+            $dataToExport['tutor_name'] = str_replace(';', ',', $course['tutor_name']);
+            $dataToExport['course_language'] = str_replace(';', ',', $course['course_language']);
 
             $dataToExport['students'] = '';
             $dataToExport['teachers'] = '';
@@ -84,9 +84,9 @@ 
             if (is_array($usersInCourse) && !empty($usersInCourse)) {
                 foreach ($usersInCourse as $user) {
                     if ($user['status_rel'] == COURSEMANAGER) {
-                        $dataToExport['teachers'] .= $user['username'] . '|';
+                        $dataToExport['teachers'] .= $user['username'].'|';
                     } else {
-                        $dataToExport['students'] .= $user['username'] . '|';
+                        $dataToExport['students'] .= $user['username'].'|';
                     }
                 }
             }
@@ -158,8 +158,8 @@ 
 	$form->addHtml('</div>');
 }
 
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
-$form->addElement('radio', 'file_type', '' , 'XLS' , 'xls', null);
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV', 'csv', null);
+$form->addElement('radio', 'file_type', '', 'XLS', 'xls', null);
 $form->addElement('radio', 'file_type', null, 'XML', 'xml', null, array('id' => 'file_type_xml'));
 
 $form->setDefaults(['select_type' => '1', 'file_type' => 'csv']);

main/admin/usergroup_user_import.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 
         foreach ($mandatory_fields as $field) {
             if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
-                $user_class['error'] = get_lang($field . 'Mandatory');
+                $user_class['error'] = get_lang($field.'Mandatory');
                 $errors[] = $user_class;
             }
         }
@@ -37,7 +37,7 @@ 
                 // 2.1.1 Check whether code exists in DB
                 $exists = $usergroup->usergroup_exists($user_class['ClassName']);
                 if (!$exists) {
-                    $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
+                    $user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName'];
                     $errors[] = $user_class;
                 } else {
                     $classcodes[$user_class['CourseCode']] = 1;
@@ -49,14 +49,14 @@ 
         if (!UserManager::is_username_empty($user_class['UserName'])) {
             // 3.1. Check whether username is too long.
             if (UserManager::is_username_too_long($user_class['UserName'])) {
-                $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
+                $user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
                 $errors[] = $user_class;
             }
 
             $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
             // 3.2. Check whether username exists.
             if (UserManager::is_username_available($username)) {
-                $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
+                $user_class['error'] = get_lang('UnknownUser').': '.$username;
                 $errors[] = $user_class;
             }
         }
@@ -105,8 +105,8 @@ 
             $class_name = $user_data['class_name'];
             $user_list_name = $user_data['user_list_name'];
             $usergroup->subscribe_users_to_usergroup($class_id, $user_list, $deleteUsersNotInList);
-            $message .= Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
-            $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
+            $message .= Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
+            $message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
         }
     }
     return $message;
@@ -128,7 +128,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
-$tool_name = get_lang('AddUsersToAClass') . ' CSV';
+$tool_name = get_lang('AddUsersToAClass').' CSV';
 
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
@@ -164,7 +164,7 @@ 
 if (count($errors) != 0) {
     $error_message = "\n";
     foreach ($errors as $index => $error_class_user) {
-        $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
+        $error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>';
         $error_message .= "<br />";
     }
     $error_message .= "\n";
@@ -172,7 +172,7 @@ 
 }
 $form->display();
 ?>
-<p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
+<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
 <pre>
 <b>UserName</b>;<b>ClassName</b>
 jdoe;class01