chamilo / chamilo-lms

main/admin/specific_fields_add.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $tool_name = get_lang('AddSpecificSearchField');
 
 if (isset($_GET['action']) && $_GET['action'] === 'edit') {
-  $tool_name = get_lang('EditSpecificSearchField');
+    $tool_name = get_lang('EditSpecificSearchField');
 }
 // Create the form
 $form = new FormValidator('specific_fields_add');

src/Chamilo/CoreBundle/Controller/Admin/PluginsController.php

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      * @Security("has_role('ROLE_ADMIN')")
      * @Route("/plugins")
      *
-     * @return array
+     * @return Response
      */
     public function pluginsAction()
     {
@@ -42,7 +42,7 @@ 
      * @Security("has_role('ROLE_ADMIN')")
      * @Route("/plugins/add")
      *
-     * @return array
+     * @return null|Response
      */
     public function pluginsAddAction()
     {

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
             if (is_file($file)) {
                 $pluginInfo = require $file;
-                var_dump($pluginInfo);exit;
+                var_dump($pluginInfo); exit;
                 $allPluginsList[] = $pluginInfo;
             }
         }

src/Chamilo/CoreBundle/Controller/Admin/SettingsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      * @Security("has_role('ROLE_ADMIN')")
      * @Route("/settings", name="admin_settings")
      *
-     * @return array
+     * @return Response
      */
     public function indexAction()
     {

src/Chamilo/CoreBundle/Controller/UserPortalController.php

Spacing +1 added lines, -1 removed lines

@@ -228,7 +228,7 @@
                     get_lang('PickACourseAsATemplateForThisNewCourse'),
                 ],
                 null,
-                ['url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_course']
+                ['url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course']
             );
         }
 

plugin/vchamilo/cli/clilib.php

Doc Comments +2 added lines, -2 removed lines

@@ -191,7 +191,7 @@ 
  * @param string $prompt text prompt, should include possible options
  * @param string $default default value when enter pressed
  * @param array $options list of allowed options, empty means any text
- * @param bool $casesensitive true if options are case sensitive
+ * @param bool $casesensitiveoptions true if options are case sensitive
  * @return string entered text
  */
 function cli_input($prompt, $default='', array $options=null, $casesensitiveoptions=false) {
@@ -288,7 +288,7 @@ 
 /**
  * Print or return section separator string
  * @param bool $return false means print, true return as string
- * @return mixed void or string
+ * @return string|null void or string
  */
 function cli_separator($return=false) {
     $separator = str_repeat('-', 79)."\n";

Spacing +10 added lines, -10 removed lines

@@ -6,12 +6,12 @@ 
 * @param string $location
 *
 */
-function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null){
+function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null) {
     global $_configuration;
 
     $vnodes = array();
 
-    if (empty($nodelistlocation)){
+    if (empty($nodelistlocation)) {
         $nodelistlocation = $_configuratioh['root_sys'].'/plugin/vchamilo/nodelist.csv';
     }
 
@@ -70,7 +70,7 @@ 
     // Jump any empty or comment line
     $text = fgets($fp, 1024);
     $i = 0;
-    while(vchamilo_is_empty_line_or_format($text, $i == 0)){
+    while (vchamilo_is_empty_line_or_format($text, $i == 0)) {
         $text = fgets($fp, 1024);
         $i++;
     }
@@ -80,7 +80,7 @@ 
     // Check for valid field names
     foreach ($headers as $h) {
         $header[] = trim($h);
-        $patternized = implode('|', $patterns) . "\\d+";
+        $patternized = implode('|', $patterns)."\\d+";
         $metapattern = implode('|', $metas);
         if (!(isset($required[$h]) ||
                 isset($optionalDefaults[$h]) ||
@@ -109,7 +109,7 @@ 
     $linenum = 2; // Since header is line 1.
 
     // Take some from admin profile, other fixed by hardcoded defaults.
-    while (!feof ($fp)) {
+    while (!feof($fp)) {
 
         // Make a new base record.
         $vnode = new StdClass();
@@ -196,7 +196,7 @@ 
  * @param bool $casesensitive true if options are case sensitive
  * @return string entered text
  */
-function cli_input($prompt, $default='', array $options=null, $casesensitiveoptions=false) {
+function cli_input($prompt, $default = '', array $options = null, $casesensitiveoptions = false) {
     echo $prompt;
     echo "\n: ";
     $input = fread(STDIN, 2048);
@@ -222,8 +222,8 @@ 
  * @param array $shortmapping array describing mapping of short to long style options ex:('h'=>'help', 'v'=>'verbose')
  * @return array array of arrays, options, unrecognised as optionlongname=>value
  */
-function cli_get_params(array $longoptions, array $shortmapping=null) {
-    $shortmapping = (array)$shortmapping;
+function cli_get_params(array $longoptions, array $shortmapping = null) {
+    $shortmapping = (array) $shortmapping;
     $options      = array();
     $unrecognized = array();
 
@@ -292,7 +292,7 @@ 
  * @param bool $return false means print, true return as string
  * @return mixed void or string
  */
-function cli_separator($return=false) {
+function cli_separator($return = false) {
     $separator = str_repeat('-', 79)."\n";
     if ($return) {
         return $separator;
@@ -307,7 +307,7 @@ 
  * @param bool $return false means print, true return as string
  * @return mixed void or string
  */
-function cli_heading($string, $return=false) {
+function cli_heading($string, $return = false) {
     $string = "== $string ==\n";
     if ($return) {
         return $string;

Braces +30 added lines, -14 removed lines

@@ -6,12 +6,13 @@ 
 * @param string $location
 *
 */
-function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null){
+function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null)
+{
     global $_configuration;
 
     $vnodes = array();
 
-    if (empty($nodelistlocation)){
+    if (empty($nodelistlocation)) {
         $nodelistlocation = $_configuratioh['root_sys'].'/plugin/vchamilo/nodelist.csv';
     }
 
@@ -70,7 +71,7 @@ 
     // Jump any empty or comment line
     $text = fgets($fp, 1024);
     $i = 0;
-    while(vchamilo_is_empty_line_or_format($text, $i == 0)){
+    while(vchamilo_is_empty_line_or_format($text, $i == 0)) {
         $text = fgets($fp, 1024);
         $i++;
     }
@@ -101,7 +102,8 @@ 
 
     // Check for required fields.
     foreach ($required as $key => $value) {
-        if ($value) { // Required field missing.
+        if ($value) {
+// Required field missing.
             cli_error("fieldrequired $key");
             return;
         }
@@ -135,7 +137,9 @@ 
             $key = $headers[$f];
             if (preg_match('/\|/', $key)) {
                 list($plugin, $variable) = explode('|', str_replace('plugin_', '', $key));
-                if (empty($variable)) die("Key error in CSV : $key ");
+                if (empty($variable)) {
+                    die("Key error in CSV : $key ");
+                }
                 if (!isset($vnode->$plugin)) {
                     $vnode->$plugin = new StdClass();
                 }
@@ -165,15 +169,21 @@ 
 * Check a CSV input line format for empty or commented lines
 * Ensures compatbility to UTF-8 BOM or unBOM formats
 */
-function vchamilo_is_empty_line_or_format(&$text, $resetfirst = false) {
+function vchamilo_is_empty_line_or_format(&$text, $resetfirst = false)
+{
     global $CFG;
 
     static $textlib;
     static $first = true;
 
     // We may have a risk the BOM is present on first line
-    if ($resetfirst) $first = true;
-    if (!isset($textlib)) $textlib = new textlib(); // Singleton
+    if ($resetfirst) {
+        $first = true;
+    }
+    if (!isset($textlib)) {
+        $textlib = new textlib();
+    }
+    // Singleton
     $text = $textlib->trim_utf8_bom($text);
     $first = false;
 
@@ -196,7 +206,8 @@ 
  * @param bool $casesensitive true if options are case sensitive
  * @return string entered text
  */
-function cli_input($prompt, $default='', array $options=null, $casesensitiveoptions=false) {
+function cli_input($prompt, $default='', array $options=null, $casesensitiveoptions=false)
+{
     echo $prompt;
     echo "\n: ";
     $input = fread(STDIN, 2048);
@@ -222,7 +233,8 @@ 
  * @param array $shortmapping array describing mapping of short to long style options ex:('h'=>'help', 'v'=>'verbose')
  * @return array array of arrays, options, unrecognised as optionlongname=>value
  */
-function cli_get_params(array $longoptions, array $shortmapping=null) {
+function cli_get_params(array $longoptions, array $shortmapping=null)
+{
     $shortmapping = (array)$shortmapping;
     $options      = array();
     $unrecognized = array();
@@ -292,7 +304,8 @@ 
  * @param bool $return false means print, true return as string
  * @return mixed void or string
  */
-function cli_separator($return=false) {
+function cli_separator($return=false)
+{
     $separator = str_repeat('-', 79)."\n";
     if ($return) {
         return $separator;
@@ -307,7 +320,8 @@ 
  * @param bool $return false means print, true return as string
  * @return mixed void or string
  */
-function cli_heading($string, $return=false) {
+function cli_heading($string, $return=false)
+{
     $string = "== $string ==\n";
     if ($return) {
         return $string;
@@ -321,7 +335,8 @@ 
  * @param $text
  * @return void
  */
-function cli_problem($text) {
+function cli_problem($text)
+{
     fwrite(STDERR, $text."\n");
 }
 
@@ -332,7 +347,8 @@ 
  * @param int $errorcode
  * @return void (does not return)
  */
-function cli_error($text, $errorcode = 1) {
+function cli_error($text, $errorcode = 1)
+{
     fwrite(STDERR, $text);
     fwrite(STDERR, "\n");
     die($errorcode);

plugin/vchamilo/cli/bulkcreatenodes.php

Spacing +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
 echo "Chamilo Bulk Nodes Creation v.1.0\n";
 echo "=================================\n";
 require_once('../../../main/inc/global.inc.php');
-require_once('clilib.php');       // cli only functions
+require_once('clilib.php'); // cli only functions
 // Ensure errors are well explained
 ini_set('debug_display', 1);
 ini_set('debug_level', E_ALL);
@@ -68,26 +68,26 @@ 
 
 if (!empty($options['config'])) {
     echo "Loading config : ".$options['config'];
-    if (!file_exists($options['config'])){
+    if (!file_exists($options['config'])) {
         cli_error('Config file mentioned but not found');
     }
 
     $content = file($options['config']);
-    foreach($content as $l) {
+    foreach ($content as $l) {
         if (preg_match('/^\s+$/', $l)) continue; // Empty lines.
         if (preg_match('/^[#\/!;]/', $l)) continue; // Comments (any form).
         if (preg_match('/^(.*?)=(.*)$/', $l, $matches)) {
-            if (in_array($matches[1], $expectedoptions)){
+            if (in_array($matches[1], $expectedoptions)) {
                 $options[trim($matches[1])] = trim($matches[2]);
             }
         }
     }
 }
 
-require_once($_configuration['root_sys'].'local/classes/database.class.php');       // cli only functions
-require_once($_configuration['root_sys'].'local/classes/textlib.class.php');       // cli only functions
-require_once($_configuration['root_sys'].'local/classes/mootochamlib.php');       // moodle like API
-require_once($_configuration['root_sys'] . '/plugin/vchamilo/lib/vchamilo_plugin.class.php');
+require_once($_configuration['root_sys'].'local/classes/database.class.php'); // cli only functions
+require_once($_configuration['root_sys'].'local/classes/textlib.class.php'); // cli only functions
+require_once($_configuration['root_sys'].'local/classes/mootochamlib.php'); // moodle like API
+require_once($_configuration['root_sys'].'/plugin/vchamilo/lib/vchamilo_plugin.class.php');
 
 global $DB;
 if ($options['verbose']) echo "building database manager\n";
@@ -117,7 +117,7 @@ 
 // Get main admin for further replacement.
 $admin = $DB->get_record('user', array('username' => 'admin'));
 
-foreach($nodes as $data) {
+foreach ($nodes as $data) {
 
     ctrace('Making node '.$data->root_web);
 
@@ -163,7 +163,7 @@ 
                 $settingrec->access_url = 1;
                 $settingrec->selected_value = $value;
                 ctrace("Setting up {$settingrec->variable}|{$settingrec->subkey} to $value\n");
-                if ($oldrec = $NDB->get_record('settings_current', array('variable' => $settingrec->variable, 'subkey' => $settingrec->subkey, 'type' => $settingrec->type))){
+                if ($oldrec = $NDB->get_record('settings_current', array('variable' => $settingrec->variable, 'subkey' => $settingrec->subkey, 'type' => $settingrec->type))) {
                     $settingrec->id = $oldrec->id;
                     $NDB->update_record('settings_current', $settingrec, 'id');
                 } else {
@@ -208,9 +208,9 @@ 
     
     if ($interactive) {
         $input = readline("Continue (y/n|r) ?\n");
-        if ($input == 'r' || $input == 'R'){
+        if ($input == 'r' || $input == 'R') {
             // do nothing, just continue
-        } elseif ($input == 'n' || $input == 'N'){
+        } elseif ($input == 'n' || $input == 'N') {
             echo "finishing\n";
             exit;
         }

Braces +22 added lines, -10 removed lines

@@ -68,16 +68,22 @@ 
 
 if (!empty($options['config'])) {
     echo "Loading config : ".$options['config'];
-    if (!file_exists($options['config'])){
+    if (!file_exists($options['config'])) {
         cli_error('Config file mentioned but not found');
     }
 
     $content = file($options['config']);
     foreach($content as $l) {
-        if (preg_match('/^\s+$/', $l)) continue; // Empty lines.
-        if (preg_match('/^[#\/!;]/', $l)) continue; // Comments (any form).
+        if (preg_match('/^\s+$/', $l)) {
+            continue;
+        }
+        // Empty lines.
+        if (preg_match('/^[#\/!;]/', $l)) {
+            continue;
+        }
+        // Comments (any form).
         if (preg_match('/^(.*?)=(.*)$/', $l, $matches)) {
-            if (in_array($matches[1], $expectedoptions)){
+            if (in_array($matches[1], $expectedoptions)) {
                 $options[trim($matches[1])] = trim($matches[2]);
             }
         }
@@ -90,16 +96,22 @@ 
 require_once($_configuration['root_sys'] . '/plugin/vchamilo/lib/vchamilo_plugin.class.php');
 
 global $DB;
-if ($options['verbose']) echo "building database manager\n";
+if ($options['verbose']) {
+    echo "building database manager\n";
+}
 $DB = new DatabaseManager();
-if ($options['verbose']) echo "building plugin vchamilo\n";
+if ($options['verbose']) {
+    echo "building plugin vchamilo\n";
+}
 $plugin = VChamiloPlugin::create();
 
 if (empty($options['nodes'])) {
     cli_error('Missing node definition. Halt.');
 }
 
-if ($options['verbose']) echo "parsing nodelist\n";
+if ($options['verbose']) {
+    echo "parsing nodelist\n";
+}
 $nodes = vchamilo_parse_csv_nodelist($options['nodes'], $plugin);
 
 if ($options['lint']) {
@@ -163,7 +175,7 @@ 
                 $settingrec->access_url = 1;
                 $settingrec->selected_value = $value;
                 ctrace("Setting up {$settingrec->variable}|{$settingrec->subkey} to $value\n");
-                if ($oldrec = $NDB->get_record('settings_current', array('variable' => $settingrec->variable, 'subkey' => $settingrec->subkey, 'type' => $settingrec->type))){
+                if ($oldrec = $NDB->get_record('settings_current', array('variable' => $settingrec->variable, 'subkey' => $settingrec->subkey, 'type' => $settingrec->type))) {
                     $settingrec->id = $oldrec->id;
                     $NDB->update_record('settings_current', $settingrec, 'id');
                 } else {
@@ -208,9 +220,9 @@ 
 
     if ($interactive) {
         $input = readline("Continue (y/n|r) ?\n");
-        if ($input == 'r' || $input == 'R'){
+        if ($input == 'r' || $input == 'R') {
             // do nothing, just continue
-        } elseif ($input == 'n' || $input == 'N'){
+        } elseif ($input == 'n' || $input == 'N') {
             echo "finishing\n";
             exit;
         }

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

@@ -195,7 +195,7 @@
                 }
 
                 if ($oldrec = $NDB->get_record('settings_current', $params)) {
-                    ctrace("Updating {$settingrec->variable}|{$settingrec->subkey} to $configsetting->value\n");
+                    ctrace("updating {$settingrec->variable}|{$settingrec->subkey} to $configsetting->value\n");
                     $settingrec->id = $oldrec->id;
                     $NDB->update_record('settings_current', $settingrec, 'id');
                 }

main/auth/ldap/authldap.php

Indentation +20 added lines, -21 removed lines

@@ -46,10 +46,9 @@ 
     - Universite Jean Monet (J Dubois / Michel Courbon)
     - Michel Panckoucke for reporting and fixing a bug
     - Patrick Cool: fixing security hole
-
-    *    @author Roan Embrechts
-    *    @version 3.0
-    *    @package chamilo.auth.ldap
+ *    @author Roan Embrechts
+ *    @version 3.0
+ *    @package chamilo.auth.ldap
  * Note:
  * If you are using a firewall, you might need to check port 389 is open in
  * order for Chamilo to communicate with the LDAP server.
@@ -211,8 +210,8 @@ 
     $language = api_get_setting('platformLanguage');
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
-                     $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                        $email, $uname, $password, $official_code,
+                        $language,'', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -271,7 +270,7 @@ 
         // Open anonymous LDAP connection
         $result=false;
         $ldap_bind_res = ldap_handle_bind($ds,$result);
-	// Executing the search with the $filter parametr
+    // Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
         $sr=ldap_search($ds,$ldap_basedn,$filter);
         $info = ldap_get_entries($ds, $sr);
@@ -564,35 +563,35 @@ 
         foreach ($UserList as $enreg_user) {
             $enreg_user = (int) $enreg_user;
             Database::query("INSERT IGNORE ".
-              " INTO $tbl_session_rel_course_rel_user ".
-              "(session_id,c_id,user_id) VALUES ".
-              "('$id_session','$enreg_course','$enreg_user')");
+                " INTO $tbl_session_rel_course_rel_user ".
+                "(session_id,c_id,user_id) VALUES ".
+                "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'";
+                " FROM $tbl_session_rel_course_rel_user " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'");
+                " SET nbr_users=$nbr_users " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+                " (session_id, user_id, registered_at) " .
+                " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
-           " WHERE session_id='$id_session' ".
-           " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
+            " WHERE session_id='$id_session' ".
+            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
     Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
-           " WHERE id='$id_session'");
+            " WHERE id='$id_session'");
 }
 
 function syncro_users() {

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

@@ -575,7 +575,7 @@ 
                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
-        Database::query("UPDATE $tbl_session_rel_course  ".
+        Database::query("update $tbl_session_rel_course  ".
                " SET nbr_users=$nbr_users " .
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'");
@@ -592,7 +592,7 @@ 
            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
-    Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
+    Database::query("update $tbl_session SET nbr_users=$nbr_users ".
            " WHERE id='$id_session'");
 }
 

Braces +49 added lines, -25 removed lines

@@ -71,23 +71,32 @@ 
  *    @author Roan Embrechts (based on code from Universit� Jean Monet)
  */
 
-function ldap_login($login, $password) {
+function ldap_login($login, $password)
+{
     //error_log('Entering ldap_login('.$login.','.$password.')',0);
     $res = ldap_authentication_check($login, $password);
 
     // res=-1 -> the user does not exist in the ldap database
     // res=1 -> invalid password (user does exist)
 
-    if ($res==1) { //WRONG PASSWORD
+    if ($res==1) {
+//WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
-        if (isset($log)) unset($log); if (isset($uid)) unset($uid);
+        if (isset($log)) {
+            unset($log);
+        }
+        if (isset($uid)) {
+            unset($uid);
+        }
         $loginLdapSucces = false;
     }
-    if ($res==-1) { //WRONG USERNAME
+    if ($res==-1) {
+//WRONG USERNAME
         //$errorMessage =  "LDAP User or password incorrect, try again.<br />";
         $login_ldap_success = false;
     }
-    if ($res==0) { //LOGIN & PASSWORD OK - SUCCES
+    if ($res==0) {
+//LOGIN & PASSWORD OK - SUCCES
         //$errorMessage = "Successful login w/ LDAP.<br>";
         $login_ldap_success = true;
     }
@@ -103,7 +112,8 @@ 
  *    @author Stefan De Wannemacker
  *    @author Roan Embrechts
  */
-function ldap_find_user_info ($login) {
+function ldap_find_user_info ($login)
+{
     //error_log('Entering ldap_find_user_info('.$login.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     // basic sequence with LDAP is connect, bind, search,
@@ -154,7 +164,8 @@ 
 *    "firstname", "name", "email", "isEmployee"
 *    @author Roan Embrechts
 */
-function ldap_put_user_info_locally($login, $info_array) {
+function ldap_put_user_info_locally($login, $info_array)
+{
     //error_log('Entering ldap_put_user_info_locally('.$login.',info_array)',0);
     global $ldap_pass_placeholder;
     global $submitRegistration, $submit, $uname, $email,
@@ -242,7 +253,8 @@ 
  * @param string password given by user
  * @return int 0 if authentication succeeded, 1 if password was incorrect, -1 if it didn't belong to LDAP
  */
-function ldap_authentication_check ($uname, $passwd) {
+function ldap_authentication_check ($uname, $passwd)
+{
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2,$ldap_rdn,$ldap_pass;
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
@@ -293,7 +305,8 @@ 
     // return in case of wrong password connection error
     if (@ldap_bind( $ds, $dn , $passwd) === false) {
         return (1); // invalid password
-    } else {// connection successfull
+    } else {
+// connection successfull
         return (0);
     }
 } // end of check
@@ -302,7 +315,8 @@ 
  * @param    resource    resource LDAP connexion resource, passed by reference.
  * @return    void
  */
-function ldap_set_version(&$resource) {
+function ldap_set_version(&$resource)
+{
     //error_log('Entering ldap_set_version(&$resource)',0);
     global $ldap_version;
     if ($ldap_version>2) {
@@ -318,7 +332,8 @@ 
  * @param boolean $ldap_bind
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
-function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
+function ldap_handle_bind(&$ldap_handler,&$ldap_bind)
+{
     //error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
     global $ldap_rdn,$ldap_pass, $extldap_config;
     $ldap_rdn = $extldap_config['admin_dn'];
@@ -347,7 +362,8 @@ 
  * @see SortableTable#get_total_number_of_items()
  * @author    Mustapha Alouani
  */
-function ldap_get_users() {
+function ldap_get_users()
+{
 
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
 
@@ -361,7 +377,7 @@ 
     if ($keyword_username != "") {
         $ldap_query[] = str_replace('%username%', $keyword_username, $ldap_search_dn);
     } else {
-        if ($keyword_lastname!=""){
+        if ($keyword_lastname!="") {
             $ldap_query[]="(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
         }
         if ($keyword_firstname!="") {
@@ -372,9 +388,9 @@ 
         $ldap_query[]="(employeeType=".$keyword_type.")";
     }
 
-    if (count($ldap_query)>1){
+    if (count($ldap_query)>1) {
         $str_query ="(& ";
-        foreach ($ldap_query as $query){
+        foreach ($ldap_query as $query) {
             $str_query.=" $query";
         }
         $str_query.=" )";
@@ -394,8 +410,9 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query)!=0)
-            Display :: display_error_message(get_lang('LDAPConnectionError'));
+        if (count($ldap_query)!=0) {
+                    Display :: display_error_message(get_lang('LDAPConnectionError'));
+        }
         return array();
     }
 }
@@ -405,7 +422,8 @@ 
  * @see SortableTable#get_total_number_of_items()
  * @author    Mustapha Alouani
  */
-function ldap_get_number_of_users() {
+function ldap_get_number_of_users()
+{
     $info = ldap_get_users();
     if (count($info)>0) {
         return $info['count'];
@@ -419,7 +437,8 @@ 
  * @see SortableTable#get_table_data($from)
  * @author    Mustapha Alouani
  */
-function ldap_get_user_data($from, $number_of_items, $column, $direction) {
+function ldap_get_user_data($from, $number_of_items, $column, $direction)
+{
 
     global $extldap_user_correspondance;
 
@@ -463,9 +482,10 @@ 
  * @return string Some HTML-code with modify-buttons
  * @author    Mustapha Alouani
  */
-function modify_filter($user_id,$url_params, $row) {
+function modify_filter($user_id,$url_params, $row)
+{
     $query_string="id[]=".$row[0];
-    if (!empty($_GET['id_session'])){
+    if (!empty($_GET['id_session'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
     }
     //$url_params_id="id=".$row[0];
@@ -478,13 +498,15 @@ 
  * @param    string    username (and uid inside LDAP)
  * @author    Mustapha Alouani
  */
-function ldap_add_user($login) {
+function ldap_add_user($login)
+{
     if ($ldap_user = extldap_authenticate($login, 'nopass', true)) {
         return extldap_add_user_by_array($ldap_user);
     }
 }
 
-function ldap_add_user_by_array($data, $update_if_exists = true) {
+function ldap_add_user_by_array($data, $update_if_exists = true)
+{
 
     $lastname = api_convert_encoding($data['sn'][0], api_get_system_encoding(), 'UTF-8');
     $firstname = api_convert_encoding($data['cn'][0], api_get_system_encoding(), 'UTF-8');
@@ -533,7 +555,8 @@ 
  * @param    string    Course code
  * @return    void
  */
-function ldap_add_user_to_session($UserList, $id_session) {
+function ldap_add_user_to_session($UserList, $id_session)
+{
 
     // Database Table Definitions
     $tbl_session                        = Database::get_main_table(TABLE_MAIN_SESSION);
@@ -588,7 +611,8 @@ 
            " WHERE id='$id_session'");
 }
 
-function syncro_users() {
+function syncro_users()
+{
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     echo "Connecting ...";
     $ldap_connect = ldap_connect( $ldap_host, $ldap_port);

Spacing +92 added lines, -92 removed lines

@@ -78,16 +78,16 @@ 
     // res=-1 -> the user does not exist in the ldap database
     // res=1 -> invalid password (user does exist)
 
-    if ($res==1) { //WRONG PASSWORD
+    if ($res == 1) { //WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
         if (isset($log)) unset($log); if (isset($uid)) unset($uid);
         $loginLdapSucces = false;
     }
-    if ($res==-1) { //WRONG USERNAME
+    if ($res == -1) { //WRONG USERNAME
         //$errorMessage =  "LDAP User or password incorrect, try again.<br />";
         $login_ldap_success = false;
     }
-    if ($res==0) { //LOGIN & PASSWORD OK - SUCCES
+    if ($res == 0) { //LOGIN & PASSWORD OK - SUCCES
         //$errorMessage = "Successful login w/ LDAP.<br>";
         $login_ldap_success = true;
     }
@@ -103,30 +103,30 @@ 
  *    @author Stefan De Wannemacker
  *    @author Roan Embrechts
  */
-function ldap_find_user_info ($login) {
+function ldap_find_user_info($login) {
     //error_log('Entering ldap_find_user_info('.$login.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     // basic sequence with LDAP is connect, bind, search,
     // interpret search result, close connection
 
     //echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
             // Search surname entry
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
-            if(!empty($ldap_search_dn)) {
-                $sr=ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
+            if (!empty($ldap_search_dn)) {
+                $sr = ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
             } else {
-                $sr=ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
+                $sr = ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
             }
             //echo " Search result is ".$sr;
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
@@ -173,25 +173,25 @@ 
     $password1  = $ldap_pass_placeholder;
     $official_code = '';
 
-    define ("STUDENT",5);
-    define ("COURSEMANAGER",1);
+    define("STUDENT", 5);
+    define("COURSEMANAGER", 1);
 
     $tutor_field = api_get_setting('ldap_filled_tutor_field');
     $tutor_value = api_get_setting('ldap_filled_tutor_field_value');
-    if(empty($tutor_field)) {
+    if (empty($tutor_field)) {
         $status = STUDENT;
     } else {
-        if(empty($tutor_value)) {
+        if (empty($tutor_value)) {
             //in this case, we are assuming that the admin didn't give a criteria
             // so that if the field is not empty, it is a tutor
-            if(!empty($info_array[$tutor_field])) {
+            if (!empty($info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
             }
         } else {
             //the tutor_value is filled, so we need to check the contents of the LDAP field
-            if (is_array($info_array[$tutor_field]) && in_array($tutor_value,$info_array[$tutor_field])) {
+            if (is_array($info_array[$tutor_field]) && in_array($tutor_value, $info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
@@ -208,7 +208,7 @@ 
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
                      $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                     $language, '', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -242,56 +242,56 @@ 
  * @param string password given by user
  * @return int 0 if authentication succeeded, 1 if password was incorrect, -1 if it didn't belong to LDAP
  */
-function ldap_authentication_check ($uname, $passwd) {
+function ldap_authentication_check($uname, $passwd) {
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
-    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2,$ldap_rdn,$ldap_pass;
+    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2, $ldap_rdn, $ldap_pass;
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
     // Establish anonymous connection with LDAP server
     // Etablissement de la connexion anonyme avec le serveur LDAP
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
 
     $test_bind = false;
-    $test_bind_res = ldap_handle_bind($ds,$test_bind);
+    $test_bind_res = ldap_handle_bind($ds, $test_bind);
     //if problem, use the replica
-    if ($test_bind_res===false) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+    if ($test_bind_res === false) {
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     } // else: error_log('Connected to server '.$ldap_host);
-    if ($ds!==false) {
+    if ($ds !== false) {
         //Creation of filter containing values input by the user
         // Here it might be necessary to use $filter="(samaccountName=$uname)"; - see http://support.chamilo.org/issues/4675
-        $filter="(uid=$uname)";
+        $filter = "(uid=$uname)";
         // Open anonymous LDAP connection
-        $result=false;
-        $ldap_bind_res = ldap_handle_bind($ds,$result);
+        $result = false;
+        $ldap_bind_res = ldap_handle_bind($ds, $result);
 	// Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
-        $sr=ldap_search($ds,$ldap_basedn,$filter);
+        $sr = ldap_search($ds, $ldap_basedn, $filter);
         $info = ldap_get_entries($ds, $sr);
-        $dn=($info[0]["dn"]);
+        $dn = ($info[0]["dn"]);
         // debug !!    echo"<br> dn = $dn<br> pass = $passwd<br>";
         // closing 1st connection
         ldap_close($ds);
     }
 
     // test the Distinguish Name from the 1st connection
-    if ($dn=="") {
-        return (-1);        // doesn't belong to the addressbook
+    if ($dn == "") {
+        return (-1); // doesn't belong to the addressbook
     }
     //bug ldap.. if password empty, return 1!
-    if ($passwd=="") {
+    if ($passwd == "") {
         return(1);
     }
     // Opening 2nd LDAP connection : Connection user for password check
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
     if (!$test_bind) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     }
     // return in case of wrong password connection error
-    if (@ldap_bind( $ds, $dn , $passwd) === false) {
+    if (@ldap_bind($ds, $dn, $passwd) === false) {
         return (1); // invalid password
     } else {// connection successfull
         return (0);
@@ -305,7 +305,7 @@ 
 function ldap_set_version(&$resource) {
     //error_log('Entering ldap_set_version(&$resource)',0);
     global $ldap_version;
-    if ($ldap_version>2) {
+    if ($ldap_version > 2) {
         ldap_set_option($resource, LDAP_OPT_PROTOCOL_VERSION, 3);
         //ok - don't do anything
         //failure - should switch back to version 2 by default
@@ -318,14 +318,14 @@ 
  * @param boolean $ldap_bind
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
-function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
+function ldap_handle_bind(&$ldap_handler, &$ldap_bind) {
     //error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
-    global $ldap_rdn,$ldap_pass, $extldap_config;
+    global $ldap_rdn, $ldap_pass, $extldap_config;
     $ldap_rdn = $extldap_config['admin_dn'];
     $ldap_pass = $extldap_config['admin_password'];
     if (!empty($ldap_rdn) and !empty($ldap_pass)) {
         //error_log('Trying authenticated login :'.$ldap_rdn.'/'.$ldap_pass,0);
-        $ldap_bind = ldap_bind($ldap_handler,$ldap_rdn,$ldap_pass);
+        $ldap_bind = ldap_bind($ldap_handler, $ldap_rdn, $ldap_pass);
         if (!$ldap_bind) {
             //error_log('Authenticated login failed',0);
             //try in anonymous mode, you never know...
@@ -351,40 +351,40 @@ 
 
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
 
-    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])): '';
+    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])) : '';
     $keyword_lastname = isset($_GET['keyword_lastname']) ? trim(Database::escape_string($_GET['keyword_lastname'])) : '';
     $keyword_username = isset($_GET['keyword_username']) ? trim(Database::escape_string($_GET['keyword_username'])) : '';
     $keyword_type = isset($_GET['keyword_type']) ? Database::escape_string($_GET['keyword_type']) : '';
 
-    $ldap_query=array();
+    $ldap_query = array();
 
     if ($keyword_username != "") {
         $ldap_query[] = str_replace('%username%', $keyword_username, $ldap_search_dn);
     } else {
-        if ($keyword_lastname!=""){
-            $ldap_query[]="(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
+        if ($keyword_lastname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
         }
-        if ($keyword_firstname!="") {
-            $ldap_query[]="(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
+        if ($keyword_firstname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
         }
     }
-    if ($keyword_type !="" && $keyword_type !="all") {
-        $ldap_query[]="(employeeType=".$keyword_type.")";
+    if ($keyword_type != "" && $keyword_type != "all") {
+        $ldap_query[] = "(employeeType=".$keyword_type.")";
     }
 
-    if (count($ldap_query)>1){
-        $str_query ="(& ";
-        foreach ($ldap_query as $query){
-            $str_query.=" $query";
+    if (count($ldap_query) > 1) {
+        $str_query = "(& ";
+        foreach ($ldap_query as $query) {
+            $str_query .= " $query";
         }
-        $str_query.=" )";
+        $str_query .= " )";
     } else {
-        $str_query= count($ldap_query) > 0 ? "(".$ldap_query[0].")" : null;
+        $str_query = count($ldap_query) > 0 ? "(".$ldap_query[0].")" : null;
     }
 
     $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
-    if ($ds && count($ldap_query)>0) {
+    if ($ds && count($ldap_query) > 0) {
         $r = false;
         $res = ldap_handle_bind($ds, $r);
         //$sr = ldap_search($ds, "ou=test-ou,$ldap_basedn", $str_query);
@@ -394,7 +394,7 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query)!=0)
+        if (count($ldap_query) != 0)
             Display :: display_error_message(get_lang('LDAPConnectionError'));
         return array();
     }
@@ -407,7 +407,7 @@ 
  */
 function ldap_get_number_of_users() {
     $info = ldap_get_users();
-    if (count($info)>0) {
+    if (count($info) > 0) {
         return $info['count'];
     } else {
         return 0;
@@ -427,9 +427,9 @@ 
     $is_western_name_order = api_is_western_name_order();
     if (isset($_GET['submit'])) {
         $info = ldap_get_users();
-        if ($info['count']>0) {
-            for ($key = 0; $key < $info["count"]; $key ++) {
-                $user=array();
+        if ($info['count'] > 0) {
+            for ($key = 0; $key < $info["count"]; $key++) {
+                $user = array();
                 // Get uid from dn
                 //YW: this might be a variation between LDAP 2 and LDAP 3, but in LDAP 3, the uid is in
                 //the corresponding index of the array
@@ -463,9 +463,9 @@ 
  * @return string Some HTML-code with modify-buttons
  * @author    Mustapha Alouani
  */
-function modify_filter($user_id,$url_params, $row) {
-    $query_string="id[]=".$row[0];
-    if (!empty($_GET['id_session'])){
+function modify_filter($user_id, $url_params, $row) {
+    $query_string = "id[]=".$row[0];
+    if (!empty($_GET['id_session'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
     }
     //$url_params_id="id=".$row[0];
@@ -490,7 +490,7 @@ 
     $firstname = api_convert_encoding($data['cn'][0], api_get_system_encoding(), 'UTF-8');
     $email = $data['mail'][0];
     // Get uid from dn
-    $dn_array=ldap_explode_dn($data['dn'],1);
+    $dn_array = ldap_explode_dn($data['dn'], 1);
     $username = $dn_array[0]; // uid is first key
     $outab[] = $data['edupersonprimaryaffiliation'][0]; // Here, "student"
     //$val = ldap_get_values_len($ds, $entry, "userPassword");
@@ -498,29 +498,29 @@ 
     //$password = $val[0];
     // TODO the password, if encrypted at the source, will be encrypted twice, which makes it useless. Try to fix that.
     $password = $data['userPassword'][0];
-    $structure=$data['edupersonprimaryorgunitdn'][0];
-    $array_structure=explode(",", $structure);
-    $array_val=explode("=", $array_structure[0]);
-    $etape=$array_val[1];
-    $array_val=explode("=", $array_structure[1]);
-    $annee=$array_val[1];
+    $structure = $data['edupersonprimaryorgunitdn'][0];
+    $array_structure = explode(",", $structure);
+    $array_val = explode("=", $array_structure[0]);
+    $etape = $array_val[1];
+    $array_val = explode("=", $array_structure[1]);
+    $annee = $array_val[1];
     // To ease management, we add the step-year (etape-annee) code
-    $official_code=$etape."-".$annee;
-    $auth_source='ldap';
+    $official_code = $etape."-".$annee;
+    $auth_source = 'ldap';
     // No expiration date for students (recover from LDAP's shadow expiry)
-    $expiration_date='';
-    $active=1;
-    if(empty($status)){$status = 5;}
-    if(empty($phone)){$phone = '';}
-    if(empty($picture_uri)){$picture_uri = '';}
+    $expiration_date = '';
+    $active = 1;
+    if (empty($status)) {$status = 5; }
+    if (empty($phone)) {$phone = ''; }
+    if (empty($picture_uri)) {$picture_uri = ''; }
     // Adding user
     $user_id = 0;
     if (UserManager::is_username_available($username)) {
-        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+        $user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active);
     } else {
         if ($update_if_exists) {
             $user = api_get_user_info($username);
-            $user_id=$user['user_id'];
+            $user_id = $user['user_id'];
             UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
         }
     }
@@ -537,21 +537,21 @@ 
 
     // Database Table Definitions
     $tbl_session                        = Database::get_main_table(TABLE_MAIN_SESSION);
-    $tbl_session_rel_class                = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+    $tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
     $tbl_session_rel_course                = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
     $tbl_session_rel_course_rel_user    = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
     $tbl_course                            = Database::get_main_table(TABLE_MAIN_COURSE);
     $tbl_user                            = Database::get_main_table(TABLE_MAIN_USER);
     $tbl_session_rel_user                = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-    $tbl_class                            = Database::get_main_table(TABLE_MAIN_CLASS);
-    $tbl_class_user                        = Database::get_main_table(TABLE_MAIN_CLASS_USER);
+    $tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+    $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
     $id_session = (int) $id_session;
     // Once users are imported in the users base, we can assign them to the session
-    $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'");
-    $CourseList=array();
-    while ($row=Database::fetch_array($result)) {
-        $CourseList[]=$row['c_id'];
+    $result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'");
+    $CourseList = array();
+    while ($row = Database::fetch_array($result)) {
+        $CourseList[] = $row['c_id'];
     }
     foreach ($CourseList as $enreg_course) {
         foreach ($UserList as $enreg_user) {
@@ -562,21 +562,21 @@ 
               "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
+               " FROM $tbl_session_rel_course_rel_user ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
+               " SET nbr_users=$nbr_users ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+               " (session_id, user_id, registered_at) ".
+               " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
@@ -591,13 +591,13 @@ 
 function syncro_users() {
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
@@ -605,7 +605,7 @@ 
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
             $all_user_query = "uid=*";
-            if(!empty($ldap_search_dn)) {
+            if (!empty($ldap_search_dn)) {
                 $sr = ldap_search($ldap_connect, $ldap_search_dn, $all_user_query);
             } else {
                 $sr = ldap_search($ldap_connect, $ldap_basedn, $all_user_query);
@@ -613,7 +613,7 @@ 
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
             //echo " Getting entries ...";
             $info = ldap_get_entries($ldap_connect, $sr);
-            for ($key = 0; $key < $info['count']; $key ++) {
+            for ($key = 0; $key < $info['count']; $key++) {
                 $user_id = ldap_add_user_by_array($info[$key], false);
                 if ($user_id) {
                     echo "User #$user_id created ";

src/Chamilo/FaqBundle/Entity/Category.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param string $rank
      *
-     * @return Question
+     * @return Category
      */
     public function setRank($rank)
     {
@@ -201,7 +201,7 @@ 
     /**
      * Get questions
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Question[]
      */
     public function getQuestions()
     {

src/Chamilo/CoreBundle/Menu/NavBuilder.php

Indentation +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
             );
             /** @var Category $category */
             foreach ($categories as $category) {
-                 $faq->addChild(
+                    $faq->addChild(
                     $category->getHeadline(),
                     array(
                         'route' => 'faq',