chamilo / chamilo-lms

main/admin/event_controller.php

Spacing +6 added lines, -6 removed lines

@@ -67,12 +67,12 @@ 
 
 //Column config
 $column_model   = array(
-                        array('name'=>'subject',        'index'=>'subject',        'width'=>'80',   'align'=>'left'),
+                        array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'),
 //                        array('name'=>'message',        'index'=>'message', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
-                        array('name'=>'event_type_name',        'index'=>'event_type_name',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
+                        array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100')
                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
@@ -82,7 +82,7 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('event_email_template',  $url,$columns,$column_model,$extra_params, array(), $action_links,true).'
+    '.Display::grid_js('event_email_template', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';
 

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     public function deleteAction($id) {
-         $event_email_template = new EventEmailTemplate();
+            $event_email_template = new EventEmailTemplate();
         return $event_email_template->delete($id);
     }
 }
@@ -73,7 +73,7 @@ 
                         array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto

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 +9 added lines, -9 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'] = '';
@@ -156,8 +156,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/ldap_form_add_users_group.php

Indentation +41 added lines, -41 removed lines

@@ -11,58 +11,58 @@
  */
 $nbre=0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
-	if($statut==1)
-	{
-		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
-	}
-	else
-	{
-		echo '<input type="hidden" name="mailling" value="1">';
-	}
+    if($statut==1)
+    {
+        echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
+    }
+    else
+    {
+        echo '<input type="hidden" name="mailling" value="1">';
+    }
 if(!empty($course))
 {
-	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
+    echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
 }
 elseif(!empty($id_session))
 {
-	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
+    echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
-		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
-	  '</tr>'."\n";
+        '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
+        '<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+        ($is_western_name_order
+            ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('Name').'</b></td>'
+            : '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
+        '<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+        '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
-	echo '<tr align="center" id="header'.$ndiv.'">';
-	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
-	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	if ($is_western_name_order)
-	{
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	}
-	else
-	{
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-	}
-	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
-	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
-	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
-	echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
-	echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
-	echo '</td>';
-	echo '</tr>';
+    $nbre=$nbre+1;
+    if($nbre & 1) $ndiv=2; else $ndiv=3;
+    echo '<tr align="center" id="header'.$ndiv.'">';
+    echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
+    echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
+    if ($is_western_name_order)
+    {
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+    }
+    else
+    {
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+    }
+    echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
+    echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
+    echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
+    echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
+    echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
+    echo '</td>';
+    echo '</tr>';
 }
 echo '</table>';
 echo '<br />';

Spacing +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
 /**
  * This form is included by ldap_import_students.php and ldap_import_students_to_session.php
  */
-$nbre=0;
+$nbre = 0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
-	if($statut==1)
+	if ($statut == 1)
 	{
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
 	}
@@ -19,30 +19,30 @@ 
 	{
 		echo '<input type="hidden" name="mailling" value="1">';
 	}
-if(!empty($course))
+if (!empty($course))
 {
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
 }
-elseif(!empty($id_session))
+elseif (!empty($id_session))
 {
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
-echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+echo '<tr align="center" id="header3">'.
+		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'.
+		'<td width="40%"><b>'.get_lang('Email').'</b></td>'.
 		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'.
 			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+			: '<td width="15%"><b>'.get_lang('Name').'</b></td>'.
+			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>').
+		'<td width="15%"><b>'.get_lang('Login').'</b></td>'.
 	  '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
+	$nbre = $nbre + 1;
+	if ($nbre & 1) $ndiv = 2; else $ndiv = 3;
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';

Braces +8 added lines, -7 removed lines

@@ -14,16 +14,14 @@ 
 	if($statut==1)
 	{
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
-	}
-	else
+	} else
 	{
 		echo '<input type="hidden" name="mailling" value="1">';
 	}
 if(!empty($course))
 {
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
-}
-elseif(!empty($id_session))
+} elseif(!empty($id_session))
 {
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
@@ -42,7 +40,11 @@ 
 	  '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
 	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
+	if($nbre & 1) {
+	    $ndiv=2;
+	} else {
+	    $ndiv=3;
+	}
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
@@ -50,8 +52,7 @@ 
 	{
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	}
-	else
+	} else
 	{
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';

main/admin/skill_list.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
 }
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'list';
-$skillId = isset($_GET['id']) ? intval($_GET['id']): 0;
+$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
 
 $entityManager = Database::getManager();
 
@@ -55,7 +55,7 @@ 
             );
         }
 
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
         break;
     case 'disable':
@@ -108,33 +108,33 @@ 
             );
         }
 
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
         break;
     case 'list':
         //no break
     default:
-        $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+        $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 
         $message = Session::has('message') ? Session::read('message') : null;
 
         $toolbar = Display::toolbarButton(
             get_lang('CreateSkill'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_create.php',
+            api_get_path(WEB_CODE_PATH).'admin/skill_create.php',
             'plus',
             'success',
             ['title' => get_lang('CreateSkill')]
         );
         $toolbar .= Display::toolbarButton(
             get_lang('SkillsWheel'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
+            api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
             'bullseye',
             'primary',
             ['title' => get_lang('CreateSkill')]
         );
         $toolbar .= Display::toolbarButton(
             get_lang('BadgesManagement'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
+            api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php',
             'shield',
             'warning',
             ['title' => get_lang('BadgesManagement')]

main/admin/inactive_user_list.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
 Display :: display_header($tool_name, "");
 
 //On sélectionne les user élèves
-$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname " ;
+$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname ";
 $result = Database::query($sql);
 
-while($row = Database::fetch_array($result)) {
+while ($row = Database::fetch_array($result)) {
     $user_id = $row['user_id'];
     //  pour chaque élève, on trouve la dernière connexion
     //$last_connection_date = UserManager:: delete_inactive_student($user_id, 2, true);

Indentation +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
     @author Andre Boivin base code
 	@author Julio Montoya fixing lot of little details
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
-
-*	@package chamilo.admin
+ *	@package chamilo.admin
 *	script pour effacer les user inactif depuis x temps
 */
 $cidReset = true;

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

Doc Comments +3 added lines, -1 removed lines

@@ -11,6 +11,7 @@ 
 
 /**
  * Validates imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $user_classes
  */
 function validate_data($user_classes) {
     global $purification_option_for_usernames;
@@ -66,6 +67,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_classes
  */
 function save_data($users_classes, $deleteUsersNotInList = false) {
 
@@ -115,7 +117,7 @@ 
 /**
  * Reads a CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file) {
     $courses = Import::csvToArray($file);