chamilo / chamilo-lms

main/admin/ldap_import_students_to_session.php

Indentation +110 added lines, -110 removed lines

@@ -53,93 +53,93 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($id_session))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 elseif (!empty($annee) && empty($id_session))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon(
-			'course.png',
-			get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="id_session">';
-
-	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ".
-		" FROM $tbl_session ".
-		" ORDER BY name";
-	$result = Database::query($sql);
-
-	$sessions = Database::store_result($result);
-	$nbr_results = count($sessions);
-	foreach ($sessions as $row) {
-		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon(
+            'course.png',
+            get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="id_session">';
+
+    $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+    $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ".
+        " FROM $tbl_session ".
+        " ORDER BY name";
+    $result = Database::query($sql);
+
+    $sessions = Database::store_result($result);
+    $nbr_results = count($sessions);
+    foreach ($sessions as $row) {
+        echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut = 5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut = 5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -147,23 +147,23 @@ 
 }
 elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
 {
-	$id = $_POST['username_form'];
-	$UserList = array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[] = $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['id_session'])) {
-		$num = 0;
-		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-		foreach ($UserList as $user_id) {
+    $id = $_POST['username_form'];
+    $UserList = array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[] = $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['id_session'])) {
+        $num = 0;
+        $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+        $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+        foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
                         [
@@ -175,15 +175,15 @@ 
                     if ($res_user !== false) {
                         $num++;
                     }
-		}
-
-		if ($num > 0) {
-			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
-			$res = Database::query($sql);
-		}
-		header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
-	}
-	/*
+        }
+
+        if ($num > 0) {
+            $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
+            $res = Database::query($sql);
+        }
+        header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -202,13 +202,13 @@ 
 		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	*/
-	else
-	{
-		$message = get_lang('NoUserAdded');
-		Display::addFlash(Display::return_message($message, 'normal', false));
+    else
+    {
+        $message = get_lang('NoUserAdded');
+        Display::addFlash(Display::return_message($message, 'normal', false));
         Display::display_header($tool_name);
-	}
-	echo '<br /><br />';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

Braces +7 added lines, -16 removed lines

@@ -51,8 +51,7 @@ 
 
 // form1 annee = 0; composante= 0 etape = 0
 //if ($annee == "" && $composante == "" && $etape == "") {
-if (empty($annee) && empty($id_session))
-{
+if (empty($annee) && empty($id_session)) {
 		Display::display_header($tool_name);
 		echo '<div style="align:center">';
 		echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
@@ -63,9 +62,7 @@ 
 		echo '</form>';
 		echo '</div>';
 
-}
-elseif (!empty($annee) && empty($id_session))
-{
+} elseif (!empty($annee) && empty($id_session)) {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
 	echo Display::return_icon(
@@ -92,8 +89,7 @@ 
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
-elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
-{
+elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed'])) {
 	Display::display_header($tool_name);
 	echo '<div style="align: center;">';
 	echo '<br />';
@@ -144,16 +140,12 @@ 
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
-{
+} elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes')) {
 	$id = $_POST['username_form'];
 	$UserList = array();
 	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
-		{
+	foreach ($id as $form_index=>$user_id) {
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes']))) {
 			$tmp = ldap_add_user($user_id);
 			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
@@ -202,8 +194,7 @@ 
 		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	*/
-	else
-	{
+	else {
 		$message = get_lang('NoUserAdded');
 		Display::addFlash(Display::return_message($message, 'normal', false));
         Display::display_header($tool_name);

main/admin/ldap_users_synchro.php

Indentation +3 added lines, -3 removed lines

@@ -60,9 +60,9 @@
 
 <?php
 if (isset($action) && ($action == "synchro")) {
-	$included = true;
-	require('ldap_synchro.php');
-	echo Display::return_message($message, 'normal', false);
+    $included = true;
+    require('ldap_synchro.php');
+    echo Display::return_message($message, 'normal', false);
 }
 Display::display_footer();
 ?>

main/gradebook/lib/be/learnpathlink.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 
     /**
      * Get the progress of this learnpath. Only the last attempt are taken into account.
-     * @param $stud_id student id (default: all students who have results - then the average is returned)
+     * @param integer $stud_id student id (default: all students who have results - then the average is returned)
      * @param $type The type of score we want to get: best|average|ranking
      * @return    array (score, max) if student is given
      *            array (sum of scores, number of scores) otherwise

plugin/vchamilo/cli/clilib.php

Doc Comments +1 added lines, -1 removed lines

@@ -294,7 +294,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";

Braces +28 added lines, -12 removed lines

@@ -7,7 +7,8 @@ 
  * @param string $plugin
  * @return mixed
  */
-function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null) {
+function vchamilo_parse_csv_nodelist($nodelistlocation = '', $plugin = null)
+{
     global $_configuration;
 
     $vnodes = array();
@@ -102,7 +103,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;
         }
@@ -136,7 +138,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();
                 }
@@ -169,15 +173,21 @@ 
  * @param bool $resetfirst
  * @return bool
  */
-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;
 
@@ -200,7 +210,8 @@ 
  * @param bool $casesensitiveoptions 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);
@@ -226,7 +237,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();
@@ -296,7 +308,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;
@@ -311,7 +324,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;
@@ -325,7 +339,8 @@ 
  * @param $text
  * @return void
  */
-function cli_problem($text) {
+function cli_problem($text)
+{
     fwrite(STDERR, $text."\n");
 }
 
@@ -336,7 +351,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);

src/Chamilo/CoreBundle/Entity/Session.php

Doc Comments +4 added lines, -4 removed lines

@@ -254,7 +254,7 @@ 
     }
 
     /**
-     * @return string
+     * @return boolean
      */
     public function getShowDescription()
     {
@@ -373,7 +373,7 @@ 
     }
 
     /**
-     * @param $courses
+     * @param ArrayCollection $courses
      */
     public function setCourses($courses)
     {
@@ -515,7 +515,7 @@ 
      * Set description
      *
      * @param string $description
-     * @return Groups
+     * @return Session
      */
     public function setDescription($description)
     {
@@ -848,7 +848,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getStatusList()
     {

main/inc/lib/extra_field.lib.php

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

@@ -2230,7 +2230,7 @@ 
             <a href="?action=edit&type={$this->type}&id=' + options.rowId + '" class="btn btn-link btn-xs">\
                 $editIcon\
             </a>
-JAVASCRIPT;
+javascript;
         $deleteButton = <<<JAVASCRIPT
             <a \
                 onclick="if (!confirm(\'$confirmMessage\')) {return false;}" \
@@ -2238,7 +2238,7 @@ 
                 class="btn btn-link btn-xs">\
                 $deleteIcon\
             </a>
-JAVASCRIPT;
+javascript;
 
         return "function action_formatter(cellvalue, options, rowObject) {        
             return '$editButton $deleteButton';

Doc Comments +6 added lines, -6 removed lines

@@ -153,7 +153,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getValidExtraFieldTypes()
     {
@@ -238,7 +238,7 @@ 
 
     /**
      * @param array $conditions
-     * @param null $order_field_options_by
+     * @param string $order_field_options_by
      *
      * @return array
      */
@@ -400,7 +400,7 @@ 
     /**
      * @param string $handler
      *
-     * @return array
+     * @return string[]
      */
     public static function get_extra_fields_by_handler($handler)
     {
@@ -627,7 +627,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function get_field_types()
     {
@@ -637,7 +637,7 @@ 
     /**
      * @param int $id
      *
-     * @return null
+     * @return string|null
      */
     public function get_field_type_by_id($id)
     {
@@ -2044,7 +2044,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getJqgridColumnNames()
     {

main/inc/lib/usermanager.lib.php

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

@@ -375,7 +375,7 @@ 
 
         if (!empty($userId)) {
             $return = $userId;
-            $sql = "UPDATE $table_user SET user_id = $return WHERE id = $return";
+            $sql = "update $table_user SET user_id = $return WHERE id = $return";
             Database::query($sql);
 
             if ($isAdmin) {
@@ -638,11 +638,11 @@ 
 
         // If the user was added as a id_coach then set the current admin as coach see BT#
         $currentUserId = api_get_user_id();
-        $sql = "UPDATE $table_session SET id_coach = $currentUserId
+        $sql = "update $table_session SET id_coach = $currentUserId
                 WHERE id_coach = '".$user_id."'";
         Database::query($sql);
 
-        $sql = "UPDATE $table_session SET id_coach = $currentUserId
+        $sql = "update $table_session SET id_coach = $currentUserId
                 WHERE session_admin_id = '".$user_id."'";
         Database::query($sql);
 
@@ -831,7 +831,7 @@ 
         $ids = array_map('intval', $ids);
         $ids = implode(',', $ids);
 
-        $sql = "UPDATE $table_user SET active = 0 WHERE id IN ($ids)";
+        $sql = "update $table_user SET active = 0 WHERE id IN ($ids)";
         $r = Database::query($sql);
         if ($r !== false) {
             Event::addEvent(LOG_USER_DISABLE, LOG_USER_ID, $ids);
@@ -861,7 +861,7 @@ 
         $ids = array_map('intval', $ids);
         $ids = implode(',', $ids);
 
-        $sql = "UPDATE $table_user SET active = 1 WHERE id IN ($ids)";
+        $sql = "update $table_user SET active = 1 WHERE id IN ($ids)";
         $r = Database::query($sql);
         if ($r !== false) {
             Event::addEvent(LOG_USER_ENABLE, LOG_USER_ID, $ids);
@@ -886,7 +886,7 @@ 
         if ($user_id === false) {
             return false;
         }
-        $sql = "UPDATE $table_user SET
+        $sql = "update $table_user SET
                 openid='".Database::escape_string($openid)."'";
         $sql .= " WHERE id= $user_id";
 
@@ -1123,7 +1123,7 @@ 
         }
         $user_id = intval($user_id);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = "UPDATE $table_user SET active = '$active' WHERE id = $user_id";
+        $sql = "update $table_user SET active = '$active' WHERE id = $user_id";
         $r = Database::query($sql);
         $ev = LOG_USER_DISABLE;
         if ($active == 1) {
@@ -2885,7 +2885,7 @@ 
         $sessionLimitRestriction = '';
         if (!empty($sessionLimit)) {
             $sessionLimit = (int) $sessionLimit;
-            $sessionLimitRestriction = "LIMIT $sessionLimit";
+            $sessionLimitRestriction = "limit $sessionLimit";
         }
 
         $sql = "SELECT DISTINCT s.id, name, access_start_date, access_end_date
@@ -3691,7 +3691,7 @@ 
             $last_insert_id = Database::insert_id();
         } else {
             //the tag exists we update it
-            $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
+            $sql = "update $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
              Database::query($sql);
             $last_insert_id = $tag_id;
         }
@@ -3724,7 +3724,7 @@ 
         if (is_array($tags) && count($tags) > 0) {
             foreach ($tags as $key => $tag) {
                 if ($tag['count'] > '0') {
-                    $sql = "UPDATE $table_user_tag SET count = count - 1  WHERE id = $key ";
+                    $sql = "update $table_user_tag SET count = count - 1  WHERE id = $key ";
                     Database::query($sql);
                 }
                 $sql = "DELETE FROM $table_user_tag_values
@@ -4288,7 +4288,7 @@ 
         if (isset($from) && isset($numberItems)) {
             $from = intval($from);
             $numberItems = intval($numberItems);
-            $limitCondition = "LIMIT $from, $numberItems";
+            $limitCondition = "limit $from, $numberItems";
         }
 
         $column = Database::escape_string($column);
@@ -4872,7 +4872,7 @@ 
         $to = Database::escape_string($to);
 
         if (!empty($to) && !empty($from)) {
-            $sql = "UPDATE $table_user SET language = '$to'
+            $sql = "update $table_user SET language = '$to'
                     WHERE language = '$from'";
             Database::query($sql);
         }
@@ -5230,7 +5230,7 @@ 
             WHERE 
                 firstname LIKE '$firstname%' AND
                 lastname LIKE '$lastname%'
-SQL;
+sql;
 
         $result = Database::query($sql);
 

Indentation +34 added lines, -34 removed lines

@@ -730,7 +730,7 @@ 
         $connection = Database::getManager()->getConnection();
         $tableExists = $connection->getSchemaManager()->tablesExist(['plugin_bbb_room']);
         if ($tableExists) {
-             // Delete user from database
+                // Delete user from database
             $sql = "DELETE FROM plugin_bbb_room WHERE participant_id = $user_id";
             Database::query($sql);
         }
@@ -1375,13 +1375,13 @@ 
     }
 
     /**
-    * Get the users by ID
-    * @param array $ids student ids
-    * @param string $active
-    * @param string $order
-    * @param string $limit
-    * @return array $result student information
-    */
+     * Get the users by ID
+     * @param array $ids student ids
+     * @param string $active
+     * @param string $order
+     * @param string $limit
+     * @return array $result student information
+     */
     public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null)
     {
         if (empty($ids)) {
@@ -2546,7 +2546,7 @@ 
      *
      * @return array with extra data info of a user i.e array('field_variable'=>'value');
      */
-     public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true)
+        public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true)
     {
         $extraFieldValue = new ExtraFieldValue('user');
         $extraField = new ExtraField('user');
@@ -3706,12 +3706,12 @@ 
         if ($tag_id == 0) {
             //the tag doesn't exist
             $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = Database::insert_id();
         } else {
             //the tag exists we update it
             $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = $tag_id;
         }
 
@@ -3906,9 +3906,9 @@ 
     }
 
     /**
-      * Get extra filtrable user fields (only type select)
-      * @return array
-      */
+     * Get extra filtrable user fields (only type select)
+     * @return array
+     */
     public static function get_extra_filtrable_fields()
     {
         $extraFieldList = self::get_extra_fields();
@@ -3933,9 +3933,9 @@ 
     }
 
     /**
-      * Get extra where clauses for finding users based on extra filtrable user fields (type select)
-      * @return string With AND clauses based on user's ID which have the values to search in extra user fields
-      */
+     * Get extra where clauses for finding users based on extra filtrable user fields (type select)
+     * @return string With AND clauses based on user's ID which have the values to search in extra user fields
+     */
     public static function get_search_form_where_extra_fields()
     {
         $useExtraFields = false;
@@ -4256,23 +4256,23 @@ 
     }
 
     /**
-    * Get users followed by human resource manager
-    * @param int $userId
-    * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
-    * @param bool $getOnlyUserId
-    * @param bool $getSql
-    * @param bool $getCount
-    * @param int $from
-    * @param int $numberItems
-    * @param int $column
-    * @param string $direction
-    * @param int $active
-    * @param string $lastConnectionDate
-    * @param int $status the function is called by who? COURSEMANAGER, DRH?
-    * @param string $keyword
+     * Get users followed by human resource manager
+     * @param int $userId
+     * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
+     * @param bool $getOnlyUserId
+     * @param bool $getSql
+     * @param bool $getCount
+     * @param int $from
+     * @param int $numberItems
+     * @param int $column
+     * @param string $direction
+     * @param int $active
+     * @param string $lastConnectionDate
+     * @param int $status the function is called by who? COURSEMANAGER, DRH?
+     * @param string $keyword
      *
-    * @return array user list
-    */
+     * @return array user list
+     */
     public static function getUsersFollowedByUser(
         $userId,
         $userStatus = null,
@@ -5309,7 +5309,7 @@ 
      * @return array
      * @author Evie Embrechts
      * @author Yannick Warnier <yannick.warnier@dokeos.com>
-    */
+     */
     public static function loginAsUser($userId, $checkIfUserCanLoginAs = true)
     {
         $userId = intval($userId);

Doc Comments +24 added lines, -18 removed lines

@@ -131,9 +131,9 @@ 
     /**
      * Validates the password
      *
-     * @param $encoded
-     * @param $raw
-     * @param $salt
+     * @param string $encoded
+     * @param string $raw
+     * @param string $salt
      * @return bool
      */
     public static function isPasswordValid($encoded, $raw, $salt)
@@ -148,7 +148,7 @@ 
      * @param string $raw
      * @param User   $user
      *
-     * @return bool
+     * @return string
      */
     public static function encryptPassword($raw, User $user)
     {
@@ -1217,6 +1217,7 @@ 
     /**
      * Disables a user
      * @param int User id
+     * @param integer $user_id
      * @return bool
      * @uses UserManager::change_active_state() to actually disable the user
      * @assert (0) === false
@@ -1233,6 +1234,7 @@ 
     /**
      * Enable a user
      * @param int User id
+     * @param integer $user_id
      * @return bool
      * @uses UserManager::change_active_state() to actually disable the user
      * @assert (0) === false
@@ -1409,6 +1411,7 @@ 
      * Checks whether the user id exists in the database
      *
      * @param int User id
+     * @param integer $userId
      * @return bool True if user id was found, false otherwise
      */
     public static function is_user_id_valid($userId)
@@ -1625,7 +1628,7 @@ 
      * @param   array $userInfo user information to avoid query the DB
      * returns the /main/img/unknown.jpg image set it at true
      *
-     * @return    array     Array of 2 elements: 'dir' and 'file' which contain
+     * @return    integer     Array of 2 elements: 'dir' and 'file' which contain
      * the dir and file as the name implies if image does not exist it will
      * return the unknow image if anonymous parameter is true if not it returns an empty array
      */
@@ -1909,7 +1912,7 @@ 
      * @see     UserManager::delete_user_picture() as the prefered way for deletion.
      * @param   string $source_file The full system name of the image from which user photos will be created.
      * @param   string $cropParameters Optional string that contents "x,y,width,height" of a cropped image format
-     * @return  mixed Returns the resulting common file name of created images which usually should be stored in database.
+     * @return  false|string Returns the resulting common file name of created images which usually should be stored in database.
      * When deletion is requested returns empty string. In case of internal error or negative validation returns FALSE.
      */
     public static function update_user_picture(
@@ -2068,7 +2071,7 @@ 
      * Deletes user photos.
      * Note: This method relies on configuration setting from main/inc/conf/profile.conf.php
      * @param int $user_id            The user internal identification number.
-     * @return mixed            Returns empty string on success, FALSE on error.
+     * @return false|string            Returns empty string on success, FALSE on error.
      */
     public static function delete_user_picture($user_id)
     {
@@ -2125,7 +2128,7 @@ 
     /**
      * Returns an array with the user's productions.
      *
-     * @param    $user_id    User id
+     * @param    integer $user_id    User id
      * @return   array  An array containing the user's productions
      */
     public static function get_user_productions($user_id)
@@ -2389,7 +2392,7 @@ 
      * @param    int       $fieldType  Field's type
      * @param    string    $displayText Field's language var name
      * @param    string    $default Field's default value
-     * @return int
+     * @return boolean
      */
     public static function create_extra_field(
         $variable,
@@ -2427,6 +2430,7 @@ 
      * @param    boolean    Whether to prefix the fields indexes with "extra_" (might be used by formvalidator)
      * @param    boolean    Whether to return invisible fields as well
      * @param    boolean    Whether to split multiple-selection fields or not
+     * @param boolean $field_filter
      * @return    array    Array of fields => value for the given user
      */
     public static function get_extra_user_data(
@@ -3296,7 +3300,7 @@ 
      * @param    string  $user_id   User ID
      * @param   string  $course course directory
      * @param   string  $resourcetype resourcetype: images, all
-     * @return    int        User ID (or false if not found)
+     * @return    string        User ID (or false if not found)
      */
     public static function get_user_upload_files_by_course(
         $user_id,
@@ -3383,7 +3387,7 @@ 
     /**
      * Adds a new API key to the users' account
      * @param   int     Optional user ID (defaults to the results of api_get_user_id())
-     * @return  boolean True on success, false on failure
+     * @return  false|string True on success, false on failure
      */
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
     {
@@ -3438,6 +3442,7 @@ 
      * Regenerate an API key from the user's account
      * @param   int     user ID (defaults to the results of api_get_user_id())
      * @param   string  API key's internal ID
+     * @param string $api_service
      * @return  int        num
      */
     public static function update_api_key($user_id, $api_service)
@@ -3468,6 +3473,7 @@ 
     /**
      * @param   int     user ID (defaults to the results of api_get_user_id())
      * @param   string    API key's internal ID
+     * @param string $api_service
      * @return  int    row ID, or return false if not found
      */
     public static function get_api_key_id($user_id, $api_service)
@@ -3687,7 +3693,7 @@ 
      * @param int $field_id
      * @param bool $show_links show links or not
      *
-     * @return array
+     * @return string
      */
     public static function get_user_tags_to_string($user_id, $field_id, $show_links = true)
     {
@@ -3784,7 +3790,7 @@ 
      * @param mixed $tag
      * @param int $user_id
      * @param int $field_id field id of the tag
-     * @return bool
+     * @return boolean|null
      */
     public static function add_tag($tag, $user_id, $field_id)
     {
@@ -5016,7 +5022,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_user_field_types()
     {
@@ -5110,7 +5116,7 @@ 
      * @param int $studentId
      * @param array $bossList
      * @param bool $sendNotification
-     * @return int Affected rows
+     * @return false|null Affected rows
      */
     public static function subscribeUserToBossList(
         $studentId,
@@ -5342,7 +5348,7 @@ 
 
     /**
      * Get the boss user ID from a followed user id
-     * @param $userId
+     * @param integer $userId
      * @return bool
      */
     public static function getStudentBossList($userId)
@@ -5394,7 +5400,7 @@ 
      * Get either a Gravatar URL or complete image tag for a specified email address.
      *
      * @param string $email The email address
-     * @param string $s Size in pixels, defaults to 80px [ 1 - 2048 ]
+     * @param integer $s Size in pixels, defaults to 80px [ 1 - 2048 ]
      * @param string $d Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]
      * @param string $r Maximum rating (inclusive) [ g | pg | r | x ]
      * @param boole $img True to return a complete IMG tag False for just the URL
@@ -5538,7 +5544,7 @@ 
      * This function defines globals.
      * @param  int $userId
      * @param bool $checkIfUserCanLoginAs
-     * @return array
+     * @return boolean
      * @author Evie Embrechts
      * @author Yannick Warnier <yannick.warnier@dokeos.com>
     */

Braces +65 added lines, -41 removed lines

@@ -2440,8 +2440,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2533,8 +2534,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2651,7 +2653,7 @@ 
      * @return array with extra data info of a user i.e array('field_variable'=>'value');
      */
      public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true)
-    {
+     {
         $extraFieldValue = new ExtraFieldValue('user');
         $extraField = new ExtraField('user');
 
@@ -3354,13 +3356,15 @@ 
      */
     public static function get_api_keys($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3368,11 +3372,14 @@ 
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE user_id = $user_id AND api_service='$api_service';";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num == 0)
-            return false;
+        if ($num == 0) {
+                    return false;
+        }
         $list = array();
         while ($row = Database::fetch_array($res)) {
             $list[$row['id']] = $row['api_key'];
@@ -3387,13 +3394,15 @@ 
      */
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3402,8 +3411,10 @@ 
         $md5 = md5((time() + ($user_id * 5)) - rand(10000, 10000)); //generate some kind of random key
         $sql = "INSERT INTO $t_api (user_id, api_key,api_service) VALUES ($user_id,'$md5','$service_name')";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::insert_id();
         return ($num == 0) ? false : $num;
     }
@@ -3415,22 +3426,29 @@ 
      */
     public static function delete_api_key($key_id)
     {
-        if ($key_id != strval(intval($key_id)))
-            return false;
-        if ($key_id === false)
-            return false;
+        if ($key_id != strval(intval($key_id))) {
+                    return false;
+        }
+        if ($key_id === false) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num !== 1)
-            return false;
+        if ($num !== 1) {
+                    return false;
+        }
         $sql = "DELETE FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         return true;
     }
 
@@ -3442,10 +3460,12 @@ 
      */
     public static function update_api_key($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3472,12 +3492,15 @@ 
      */
     public static function get_api_key_id($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
-        if (empty($api_service))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
+        if (empty($api_service)) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $api_service = Database::escape_string($api_service);
         $sql = "SELECT id FROM $t_api 
@@ -5418,8 +5441,9 @@ 
         $url .= "?s=$s&d=$d&r=$r";
         if ($img) {
             $url = '<img src="'.$url.'"';
-            foreach ($atts as $key => $val)
-                $url .= ' '.$key.'="'.$val.'"';
+            foreach ($atts as $key => $val) {
+                            $url .= ' '.$key.'="'.$val.'"';
+            }
             $url .= ' />';
         }
         return $url;

plugin/studentfollowup/Entity/CarePost.php

Indentation +8 added lines, -8 removed lines

@@ -51,10 +51,10 @@ 
      */
     protected $externalCareId;
 
-     /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"})
-     * @ORM\JoinColumn(name="insert_user_id", referencedColumnName="id", nullable=false)
-     */
+        /**
+         * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"})
+         * @ORM\JoinColumn(name="insert_user_id", referencedColumnName="id", nullable=false)
+         */
     private $insertUser;
 
     /**
@@ -110,10 +110,10 @@ 
      */
     private $parent;
 
-     /**
-     * @ORM\OneToMany(targetEntity="CarePost", mappedBy="parent")
-     * @ORM\OrderBy({"createdAt" = "DESC"})
-     */
+        /**
+         * @ORM\OneToMany(targetEntity="CarePost", mappedBy="parent")
+         * @ORM\OrderBy({"createdAt" = "DESC"})
+         */
     private $children;
 
     /**

main/auth/gotocourse.php

Braces +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 require_once __DIR__.'/../inc/global.inc.php';

 require_once api_get_path(SYS_PATH).'main/auth/cas/authcas.php';

 $msg = null;

-if (isset($_GET['firstpage'])) {

+if (isset($_GET['firstpage'])) {
     $firstpage = $_GET['firstpage'];

 

     // if course is public, go to course without auth

@@ -41,7 +41,7 @@ 
     );

     $form->addButtonNext(get_lang('LoginEnter'), 'submitAuth');

     // see same text in main_api.lib.php function api_not_allowed

-    if (api_is_cas_activated()) {

+    if (api_is_cas_activated()) {
         $msg .= Display::return_message(sprintf(get_lang('YouHaveAnInstitutionalAccount'), api_get_setting("Institution")), '', false);

         $msg .= Display::div("<br/><a href='".get_cas_direct_URL(api_get_course_id())."'>".getCASLogoHTML()." ".sprintf(get_lang('LoginWithYourAccount'), api_get_setting("Institution"))."</a><br/><br/>", array('align'=>'center'));

         $msg .= Display::return_message(get_lang('YouDontHaveAnInstitutionAccount'));

@@ -52,7 +52,7 @@ 
     $msg .= '<div class="well_login">';

     $msg .= $form->returnForm();

     $msg .= '</div>';

-    if (api_is_cas_activated()) {

+    if (api_is_cas_activated()) {
         $msg .= "</div>";

     }

     $msg .= '<hr/><p style="text-align:center"><a href="'.api_get_path(WEB_PATH).'">'.get_lang('ReturnToCourseHomepage').'</a></p>';

@@ -60,7 +60,7 @@ 
     $tpl->assign('content', '<h4>'.get_lang('LoginToGoToThisCourse').'</h4>'.$msg);

     $tpl->display_one_col_template();

 

-} else {

+} else {
     api_delete_firstpage_parameter();

     header('Location: '.api_get_path(WEB_PATH).'index.php');

     exit;