chamilo / chamilo-lms

main/webservices/user_import/service.php

Indentation +39 added lines, -39 removed lines

@@ -14,45 +14,45 @@
  */
 function import_users_from_file($filepath, $security_key) {
 
-	global $_configuration;
-
-   	$errors_returned = array(
-	   	0 => 'success',
-	   	1 => 'file import does not exist',
-	   	2 => 'no users to import',
-	   	3 => 'wrong datas in file',
-	   	4 => 'security error'
-   	);
-
-   	// Check whether this script is launch by server and security key is ok.
-   	if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
-   		return $errors_returned[4];
-   	}
-
-   	// Libraries
-   	require_once 'import.lib.php';
-
-	// Check is users file exists.
-	if (!is_file($filepath)) {
-		return $errors_returned[1];
-	}
-
-	// Get list of users
-	$users = parse_csv_data($filepath);
-	if (count($users) == 0) {
-		return $errors_returned[2];
-	}
-
-	// Check the datas for each user
-	$errors = validate_data($users);
-	if (count($errors) > 0) {
-		return $errors_returned[3];
-	}
-
-	// Apply modifications in database
-	save_data($users);
-
-   	return $errors_returned[0]; // Import successfull
+    global $_configuration;
+
+        $errors_returned = array(
+            0 => 'success',
+            1 => 'file import does not exist',
+            2 => 'no users to import',
+            3 => 'wrong datas in file',
+            4 => 'security error'
+        );
+
+        // Check whether this script is launch by server and security key is ok.
+        if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
+            return $errors_returned[4];
+        }
+
+        // Libraries
+        require_once 'import.lib.php';
+
+    // Check is users file exists.
+    if (!is_file($filepath)) {
+        return $errors_returned[1];
+    }
+
+    // Get list of users
+    $users = parse_csv_data($filepath);
+    if (count($users) == 0) {
+        return $errors_returned[2];
+    }
+
+    // Check the datas for each user
+    $errors = validate_data($users);
+    if (count($errors) > 0) {
+        return $errors_returned[3];
+    }
+
+    // Apply modifications in database
+    save_data($users);
+
+        return $errors_returned[0]; // Import successfull
 }
 
 $server = new soap_server();

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  * @param  string Security key (as found in configuration file)
  * @return string Error message
  */
-function import_users_from_file($filepath, $security_key) {
+function import_users_from_file($filepath, $security_key)
+{
 
 	global $_configuration;
 

main/admin/add_sessions_to_promotion.php

Indentation +12 added lines, -12 removed lines

@@ -197,7 +197,7 @@ 
       <option value = "%">--</option>
       <?php
         echo Display :: get_alphabet_options();
-      ?>
+        ?>
      </select>
 </td>
 <td align="center">&nbsp;</td>
@@ -207,31 +207,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('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
       </div>
     <?php
-      }
-     ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
         <em class="fa fa-arrow-left"></em>
     </button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
         <em class="fa fa-arrow-right"></em>
     </button>
@@ -240,8 +240,8 @@ 
         <em class="fa fa-arrow-left"></em>
     </button>
     <?php
-  }
-  ?>
+    }
+    ?>
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
 require_once __DIR__.'/../inc/global.inc.php';
 
 $xajax = new xajax();
-$xajax->registerFunction ('search_sessions');
+$xajax->registerFunction('search_sessions');
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -19,13 +19,13 @@ 
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
 
 // Setting the name of the tool
 $tool_name = get_lang('SubscribeSessionsToPromotions');
 $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']);
 }
 
@@ -74,7 +74,7 @@ 
     $form_sent = $_POST['form_sent'];
     $session_in_promotion_posted = $_POST['session_in_promotion_name'];
     if (!is_array($session_in_promotion_posted)) {
-        $session_in_promotion_posted=array($session_in_promotion_posted);
+        $session_in_promotion_posted = array($session_in_promotion_posted);
     }
     if ($form_sent == 1) {
         // Added a parameter to send emails when registering a user
@@ -119,15 +119,15 @@ 
 }
 
 echo '<div class="actions">';
-echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="promotions.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 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') {
+if ($add_type == 'multiple') {
     $extraField = new \ExtraField('session');
     $extra_field_list = $extraField->get_all_extra_field_by_type(ExtraField::FIELD_TYPE_SELECT);
     $new_field_list = array();
@@ -139,7 +139,7 @@ 
             echo '&nbsp;<select name="'.$varname.'">';
             echo '<option value="0">--'.get_lang('Select').'--</option>';
             foreach ($new_field['data'] as $option) {
-                $checked='';
+                $checked = '';
                 if (isset($_POST[$varname])) {
                     if ($_POST[$varname] == $option[1]) {
                         $checked = 'selected="true"';
@@ -170,7 +170,7 @@ 
   <td align="center"><b><?php echo get_lang('SessionsInPromotion') ?> :</b></td>
 </tr>
 
-<?php if ($add_type=='multiple') { ?>
+<?php if ($add_type == 'multiple') { ?>
 <tr>
 <td align="center">
 <?php echo get_lang('FirstLetterSessions'); ?> :
@@ -188,7 +188,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>
@@ -196,7 +196,7 @@ 
       } else {
       ?>
       <div id="ajax_list_multiple">
-        <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
+        <?php echo Display::select('session_not_in_promotion_name', $session_not_in_promotion, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_not_in_promotion', 'size'=>'15px'), false); ?>
       </div>
     <?php
       }
@@ -231,7 +231,7 @@ 
         'session_in_promotion_name[]',
         $session_in_promotion,
         '',
-        array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_in_promotion','size'=>'15px'),
+        array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_in_promotion', 'size'=>'15px'),
         false
     );
     unset($sessionUsersList);
@@ -341,7 +341,7 @@ 
             }
         }
         $return .= '</select>';
-        $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_multiple', 'innerHTML', api_utf8_encode($return));
     }
 
     return $xajax_response;

Braces +5 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 // Setting the name of the tool
 $tool_name = get_lang('SubscribeSessionsToPromotions');
 $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']);
 }
 
@@ -123,7 +123,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>';
 
 

main/admin/promotions.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 <script>
 $(function() {
 <?php
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>

main/admin/user_import.php

Braces +8 added lines, -2 removed lines

@@ -505,8 +505,14 @@
     <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
     <blockquote>
 <pre>
-<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) echo implode(';', $list).';'; ?></span>Courses;ClassId;
-<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) {
+    echo implode(';', $list).';';
+}
+?></span>Courses;ClassId;
+<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
 </pre>
 </blockquote>
 <p><?php echo get_lang('XMLMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -364,7 +364,7 @@
 $user_id_error = array();
 $error_message = '';
 
-if (isset($_POST['formSent']) && $_POST['formSent'] AND
+if (isset($_POST['formSent']) && $_POST['formSent'] and
     $_FILES['import_file']['size'] !== 0
 ) {
     $file_type = $_POST['file_type'];

main/admin/add_users_to_usergroup.php

Braces +8 added lines, -2 removed lines

@@ -345,7 +345,10 @@ 
 $searchForm->display();
 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;">
+<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
 echo '<legend>'.$tool_name.': '.$data['name'].'</legend>';
 
@@ -420,7 +423,10 @@ 
     ?>
     <br />
       <label class="control-label">
-          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
+          <input type="checkbox" <?php if ($user_with_any_group) {
+    echo 'checked="checked"';
+}
+?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
           <?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
       </label>
     </div>

Spacing +19 added lines, -19 removed lines

@@ -18,8 +18,8 @@ 
 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'));
 
 // Database Table Definitions
 
@@ -90,7 +90,7 @@ 
 
 </script>';
 
-$form_sent  = 0;
+$form_sent = 0;
 
 $extra_field_list = UserManager::get_extra_fields();
 $new_field_list = array();
@@ -144,7 +144,7 @@ 
         foreach ($users as $user) {
             $data[] = array($user['username'], $groupInfo['name']);
         }
-        $filename = 'export_user_class_' . api_get_local_time();
+        $filename = 'export_user_class_'.api_get_local_time();
         Export::arrayToCsv($data, $filename);
         exit;
     }
@@ -157,7 +157,7 @@ 
         foreach ($new_field_list as $new_field) {
             $varname = 'field_'.$new_field['variable'];
             if (UserManager::is_extra_field_available($new_field['variable'])) {
-                if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
+                if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                     $use_extra_fields = true;
                     $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                         $new_field['variable'],
@@ -171,10 +171,10 @@ 
 
 if ($use_extra_fields) {
     $final_result = array();
-    if (count($extra_field_result)>1) {
-        for ($i=0; $i<count($extra_field_result)-1; $i++) {
-            if (is_array($extra_field_result[$i+1])) {
-                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
+    if (count($extra_field_result) > 1) {
+        for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+            if (is_array($extra_field_result[$i + 1])) {
+                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]);
             }
         }
     } else {
@@ -193,7 +193,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) {
@@ -341,12 +341,12 @@ 
 $searchForm->display();
 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;">
+<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
 echo '<legend>'.$tool_name.': '.$data['name'].'</legend>';
 
 if (is_array($extra_field_list)) {
-    if (is_array($new_field_list) && count($new_field_list)>0) {
+    if (is_array($new_field_list) && count($new_field_list) > 0) {
         echo '<h3>'.get_lang('FilterByUser').'</h3>';
         foreach ($new_field_list as $new_field) {
             echo $new_field['name'];
@@ -354,7 +354,7 @@ 
             echo '&nbsp;<select name="'.$varname.'">';
             echo '<option value="0">--'.get_lang('Select').'--</option>';
             foreach ($new_field['data'] as $option) {
-                $checked='';
+                $checked = '';
                 if (isset($_POST[$varname])) {
                     if ($_POST[$varname] == $option[1]) {
                         $checked = 'selected="true"';
@@ -380,15 +380,15 @@ 
         <?php if ($data['group_type'] == UserGroup::SOCIAL_CLASS) { ?>
         <select name="relation" id="relation">
             <option value=""><?php echo get_lang('SelectARelationType')?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Admin') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Reader') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('PendingInvitation') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Moderator') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Drh') ?></option>
         </select>
         <?php } ?>
@@ -419,7 +419,7 @@ 
     ?>
     <br />
       <label class="control-label">
-          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
+          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"'; ?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
           <?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
       </label>
     </div>

main/inc/ajax/exercise.ajax.php

Indentation +1 added lines, -1 removed lines

@@ -488,7 +488,7 @@
                     $remind_list
                 );
 
-                 // Destruction of the Question object
+                    // Destruction of the Question object
                 unset($objQuestionTmp);
                 if ($debug) {
                     error_log(" -- end question -- ");

main/inc/ajax/model.ajax.php

Indentation +2 added lines, -2 removed lines

@@ -731,7 +731,7 @@ 
         }
 
         break;
-	case 'get_user_skill_ranking':
+    case 'get_user_skill_ranking':
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@ 
 
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
-                 $item['has_certificates'] = '1';
+                    $item['has_certificates'] = '1';
             } else {
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
                 $item['has_certificates'] = '0';

Spacing +40 added lines, -40 removed lines

@@ -11,8 +11,8 @@ 
 $action = $_GET['a'];
 $page = intval($_REQUEST['page']); //page
 $limit = intval($_REQUEST['rows']); //quantity of rows
-$sidx = $_REQUEST['sidx'];         //index (field) to filter
-$sord = $_REQUEST['sord'];         //asc or desc
+$sidx = $_REQUEST['sidx']; //index (field) to filter
+$sord = $_REQUEST['sord']; //asc or desc
 
 if (strpos(strtolower($sidx), 'asc') !== false) {
     $sidx = str_replace(array('asc', ','), '', $sidx);
@@ -24,7 +24,7 @@ 
     $sord = 'desc';
 }
 
-if (!in_array($sord, array('asc','desc'))) {
+if (!in_array($sord, array('asc', 'desc'))) {
     $sord = 'desc';
 }
 
@@ -64,19 +64,19 @@ 
 function getWhereClause($col, $oper, $val)
 {
     $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -100,10 +100,10 @@ 
 
 // If there is no search request sent by jqgrid, $where should be empty
 $whereCondition = '';
-$operation = isset($_REQUEST['oper'])  ? $_REQUEST['oper']  : false;
-$exportFormat = isset($_REQUEST['export_format'])  ? $_REQUEST['export_format']  : 'csv';
-$searchField = isset($_REQUEST['searchField'])  ? $_REQUEST['searchField']  : false;
-$searchOperator = isset($_REQUEST['searchOper'])   ? $_REQUEST['searchOper']   : false;
+$operation = isset($_REQUEST['oper']) ? $_REQUEST['oper'] : false;
+$exportFormat = isset($_REQUEST['export_format']) ? $_REQUEST['export_format'] : 'csv';
+$searchField = isset($_REQUEST['searchField']) ? $_REQUEST['searchField'] : false;
+$searchOperator = isset($_REQUEST['searchOper']) ? $_REQUEST['searchOper'] : false;
 $searchString = isset($_REQUEST['searchString']) ? $_REQUEST['searchString'] : false;
 $search = isset($_REQUEST['_search']) ? $_REQUEST['_search'] : false;
 $forceSearch = isset($_REQUEST['_force_search']) ? $_REQUEST['_force_search'] : false;
@@ -171,7 +171,7 @@ 
             foreach ($filters->rules as $key => $rule) {
                 $whereCondition .= getWhereClause($rule->field, $rule->op, $rule->data);
 
-                if ($counter < count($filters->rules) -1) {
+                if ($counter < count($filters->rules) - 1) {
                     $whereCondition .= $filters->groupOp;
                 }
                 $counter++;
@@ -202,7 +202,7 @@ 
         $userId = api_get_user_id();
         $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
         $courseCodeList = array();
-        $userIdList  = array();
+        $userIdList = array();
         $sessionIdList = [];
         $searchByGroups = false;
         if (api_is_drh()) {
@@ -650,7 +650,7 @@ 
 $total_pages = 0;
 if ($count > 0) {
     if (!empty($limit)) {
-        $total_pages = ceil((float)$count/(float)$limit);
+        $total_pages = ceil((float) $count / (float) $limit);
     }
 }
 if ($page > $total_pages) {
@@ -809,7 +809,7 @@ 
     
         //get sessions
         $arrSessions = array();
-        if(count($sessionIdList) > 0) {
+        if (count($sessionIdList) > 0) {
             $arrSessions = CourseManager::get_user_list_from_course_code(
                 null,
                 null,
@@ -955,10 +955,10 @@ 
     case 'get_work_user_list_others':
         if (isset($_GET['type']) && $_GET['type'] === 'simple') {
             $columns = array(
-                'type', 'firstname', 'lastname',  'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
+                'type', 'firstname', 'lastname', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
             );
         } else {
-            $columns = array('type', 'firstname', 'lastname',  'title', 'sent_date', 'actions');
+            $columns = array('type', 'firstname', 'lastname', 'title', 'sent_date', 'actions');
         }
         $whereCondition .= " AND u.user_id <> ".api_get_user_id();
         $result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $whereCondition);
@@ -992,7 +992,7 @@ 
     case 'get_exercise_results':
         $course = api_get_course_info();
         // Used inside ExerciseLib::get_exam_results_data()
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if ($is_allowedToEdit || api_is_student_boss()) {
             $columns = array(
                 'firstname',
@@ -1024,11 +1024,11 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if (api_is_allowed_to_edit()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data(
             $start,
@@ -1061,12 +1061,12 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
 
         if (api_is_allowed_to_edit(null, true) || api_is_drh()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data(
             $start,
@@ -1138,17 +1138,17 @@ 
                 $detailButtons = [];
                 $detailButtons[] = Display::url(
                     Display::return_icon('works.png', get_lang('WorksReport')),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/works_in_session_report.php?session=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/works_in_session_report.php?session='.$session['id']
                 );
                 $detailButtons[] = Display::url(
                     Display::return_icon('2rightarrow.png'),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?session_id=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id']
                 );
 
                 $result[] = array(
                     'name' => Display::url(
                         $session['name'],
-                        api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?session_id=' . $session['id']
+                        api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id']
                     ),
                     'date' => $session_date_string,
                     'course_per_session' => $count_courses_in_session,
@@ -1460,7 +1460,7 @@ 
         $result = $new_result;
         break;
     case 'get_gradebooks':
-        $columns = array('name', 'certificates','skills', 'actions', 'has_certificates');
+        $columns = array('name', 'certificates', 'skills', 'actions', 'has_certificates');
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
         }
@@ -1629,7 +1629,7 @@ 
                     if (!empty($exercises[$cnt - 4]['title'])) {
                         $title = ucwords(strtolower(trim($exercises[$cnt - 4]['title'])));
                     }
-                    $columns[] = 'exer' . $i;
+                    $columns[] = 'exer'.$i;
                     $column_names[] = $title;
                     $i++;
                     break;
@@ -1662,7 +1662,7 @@ 
             $sessionInfo = SessionManager::fetch($listUserSess[$user['user_id']]['id_session']);
             $result[$i]['session'] = $sessionInfo['name'];
             $result[$i]['username'] = $user['username'];
-            $result[$i]['name'] = $user['lastname'] . " " . $user['firstname'];
+            $result[$i]['name'] = $user['lastname']." ".$user['firstname'];
             $j = 1;
             $finalScore = 0;
             foreach ($quizIds as $quizID) {
@@ -1670,7 +1670,7 @@ 
                 if (!empty($arrGrade [$user['user_id']][$quizID]) || $arrGrade [$user['user_id']][$quizID] == 0) {
                     $finalScore += $grade = $arrGrade [$user['user_id']][$quizID];
                 }
-                $result[$i]['exer' . $j] = $grade;
+                $result[$i]['exer'.$j] = $grade;
                 $j++;
             }
 
@@ -1838,9 +1838,9 @@ 
         foreach ($result as $row) {
             // if results tab give not id, set id to $i otherwise id="null" for all <tr> of the jqgrid - ref #4235
             if (!isset($row['id']) || isset($row['id']) && $row['id'] == '') {
-                $response->rows[$i]['id']= $i;
+                $response->rows[$i]['id'] = $i;
             } else {
-                $response->rows[$i]['id']= $row['id'];
+                $response->rows[$i]['id'] = $row['id'];
             }
             $array = array();
             foreach ($columns as $col) {
@@ -1850,7 +1850,7 @@ 
                     $array[] = isset($row[$col]) ? Security::remove_XSS($row[$col]) : '';
                 }
             }
-            $response->rows[$i]['cell']=$array;
+            $response->rows[$i]['cell'] = $array;
             $i++;
         }
     }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -742,7 +742,7 @@ 
         $result = CourseManager::get_user_list_from_course_code(
             null,
             null,
-            "LIMIT $start, $limit",
+            "limit $start, $limit",
             null, //" $sidx $sord",
             null,
             null,
@@ -813,7 +813,7 @@ 
             $arrSessions = CourseManager::get_user_list_from_course_code(
                 null,
                 null,
-                "LIMIT $start, $limit",
+                "limit $start, $limit",
                 " $sidx $sord",
                 null,
                 null,
@@ -831,7 +831,7 @@ 
         $arrCourses = CourseManager::get_user_list_from_course_code(
             null,
             null,
-            "LIMIT $start, $limit",
+            "limit $start, $limit",
             " $sidx $sord",
             null,
             null,

main/inc/local.inc.php

Indentation +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
     //    $gidReset = true;
 } // end else
 
- // Now check for anonymous user mode
+    // Now check for anonymous user mode
 if (isset($use_anonymous) && $use_anonymous) {
     //if anonymous mode is set, then try to set the current user as anonymous
     //if he doesn't have a login yet

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
         $cidReq = $c;
     }
     if (empty($cidReset)) {
-        if (!isset($_SESSION['_cid']) OR (isset($_SESSION['_cid']) && $cidReq != $_SESSION['_cid'])) {
+        if (!isset($_SESSION['_cid']) or (isset($_SESSION['_cid']) && $cidReq != $_SESSION['_cid'])) {
             $cidReset = $cidReq;
         }
     }
@@ -916,7 +916,7 @@ 
                 if (Database::num_rows($result) > 0) {
                     $i_course_access_id = Database::result($result, 0, 0);
                     // We update the course tracking table
-                    $sql = "UPDATE $course_tracking_table  
+                    $sql = "update $course_tracking_table  
                             SET logout_course_date = '$time', counter = counter+1
                             WHERE 
                                 course_access_id = ".intval($i_course_access_id)." AND 
@@ -1496,7 +1496,7 @@ 
 if (isset($_cid)) {
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
     $time = api_get_utc_datetime();
-    $sql = "UPDATE $tbl_course SET last_visit = '$time' WHERE code='$_cid'";
+    $sql = "update $tbl_course SET last_visit = '$time' WHERE code='$_cid'";
     Database::query($sql);
 }
 

Braces +12 added lines, -6 removed lines

@@ -523,7 +523,8 @@ 
                 // see configuration.php to define these
                 include_once($extAuthSource[$key]['login']);
                 /* >>>>>>>> External authentication modules <<<<<<<<< */
-            } else { // no standard Chamilo login - try external authentification
+            } else {
+// no standard Chamilo login - try external authentification
                 //huh... nothing to do... we shouldn't get here
                 error_log(
                     'Chamilo Authentication file defined in'.
@@ -868,7 +869,8 @@ 
     }
     Session::write('is_platformAdmin', $is_platformAdmin);
     Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
-} else { // continue with the previous values
+} else {
+// continue with the previous values
     $_user = $_SESSION['_user'];
     $is_platformAdmin = isset($_SESSION['is_platformAdmin']) ? $_SESSION['is_platformAdmin'] : false;
     $is_allowedCreateCourse = isset($_SESSION['is_allowedCreateCourse']) ? $_SESSION['is_allowedCreateCourse'] : false;
@@ -1033,7 +1035,8 @@ 
         }
     }
 
-    if (empty($_SESSION['_course']) or empty($_SESSION['_cid'])) { //no previous values...
+    if (empty($_SESSION['_course']) or empty($_SESSION['_cid'])) {
+//no previous values...
         $_cid = -1; // Set default values
         $_course = -1;
     } else {
@@ -1061,7 +1064,8 @@ 
             $sql = "SELECT * FROM $group_table
                     WHERE c_id = ".$_course['real_id']." AND id = '$gidReq'";
             $result = Database::query($sql);
-            if (Database::num_rows($result) > 0) { // This group has recorded status related to this course
+            if (Database::num_rows($result) > 0) {
+// This group has recorded status related to this course
                 $gpData = Database::fetch_array($result);
                 $_gid = $gpData ['id'];
                 Session::write('_gid', $_gid);
@@ -1185,7 +1189,8 @@ 
         $result = Database::query($sql);
 
         $cuData = null;
-        if (Database::num_rows($result) > 0) { // this  user have a recorded state for this course
+        if (Database::num_rows($result) > 0) {
+// this  user have a recorded state for this course
             $cuData = Database::fetch_array($result, 'ASSOC');
 
             $is_courseAdmin = (bool) ($cuData['status'] == 1);
@@ -1342,7 +1347,8 @@ 
                 }
             }
         }
-    } else { // keys missing => not anymore in the course - user relation
+    } else {
+// keys missing => not anymore in the course - user relation
         // course
         $is_courseMember = false;
         $is_courseAdmin = false;

main/inc/lib/extra_field_value.lib.php

Indentation +5 added lines, -6 removed lines

@@ -720,11 +720,11 @@ 
         return false;
     }
 
-     /**
-     * @param int $itemId
-     * @param int $fieldId
-     * @return array
-     */
+        /**
+         * @param int $itemId
+         * @param int $fieldId
+         * @return array
+         */
     public function getAllValuesByItemAndField($itemId, $fieldId)
     {
         $fieldId = intval($fieldId);
@@ -847,7 +847,6 @@ 
     /**
      * Deletes all values from an item
      * @param int $itemId (session id, course id, etc)
-
      * @assert (-1,-1) == null
      */
     public function deleteValuesByItem($itemId)

Doc Comments +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
      * This function is used with $extraField->addElements()
      * @param array $params array for the insertion into the *_field_values table
      * @param bool $showQuery
-     * @return mixed false on empty params, void otherwise
+     * @return false|null false on empty params, void otherwise
      * @assert (array()) === false
      */
     public function saveFieldValues($params, $showQuery = false)
@@ -529,7 +529,7 @@ 
      * @param int $item_id Item ID (It could be a session_id, course_id or user_id)
      * @param int $field_id Field ID (the ID from the *_field table)
      * @param bool $transform Whether to transform the result to a human readable strings
-     * @return mixed A structured array with the field_id and field_value, or false on error
+     * @return string A structured array with the field_id and field_value, or false on error
      * @assert (-1,-1) === false
      */
     public function get_values_by_handler_and_field_id($item_id, $field_id, $transform = false)