chamilo / chamilo-lms

plugin/buycourses/src/success.php

Braces +14 added lines, -14 removed lines

@@ -11,20 +11,20 @@ 
 $plugin = BuyCoursesPlugin::create();

 $paypalEnabled = $plugin->get('paypal_enable') === 'true';

 

-if (!$paypalEnabled) {

+if (!$paypalEnabled) {
     api_not_allowed(true);

 }

 

 $sale = $plugin->getSale($_SESSION['bc_sale_id']);

 

-if (empty($sale)) {

+if (empty($sale)) {
     api_not_allowed(true);

 }

 

 $buyingCourse = false;

 $buyingSession = false;

 

-switch ($sale['product_type']) {

+switch ($sale['product_type']) {
     case BuyCoursesPlugin::PRODUCT_TYPE_COURSE:

         $buyingCourse = true;

         $course = $plugin->getCourseInfo($sale['product_id']);

@@ -54,9 +54,9 @@ 
 $form->addButton('confirm', $plugin->get_lang('ConfirmOrder'), 'check', 'success');

 $form->addButtonCancel($plugin->get_lang('CancelOrder'), 'cancel');

 

-if ($form->validate()) {

+if ($form->validate()) {
     $formValues = $form->getSubmitValues();

-    if (isset($formValues['cancel'])) {

+    if (isset($formValues['cancel'])) {
         $plugin->cancelSale($sale['id']);

         unset($_SESSION['bc_sale_id']);

         header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/index.php');

@@ -65,7 +65,7 @@ 
 

     $confirmPayments = ConfirmPayment($sale['price']);

 

-    if ($confirmPayments['ACK'] !== 'Success') {

+    if ($confirmPayments['ACK'] !== 'Success') {
         $erroMessage = vsprintf(

             $plugin->get_lang('ErrorOccurred'),

             [$expressCheckout['L_ERRORCODE0'], $confirmPayments['L_LONGMESSAGE0']]

@@ -80,10 +80,10 @@ 
     $transactionId = $confirmPayments['PAYMENTINFO_0_TRANSACTIONID'];

     $transactionType = $confirmPayments['PAYMENTINFO_0_TRANSACTIONTYPE'];

 

-    switch ($confirmPayments['PAYMENTINFO_0_PAYMENTSTATUS']) {

+    switch ($confirmPayments['PAYMENTINFO_0_PAYMENTSTATUS']) {
         case 'Completed':

             $saleIsCompleted = $plugin->completeSale($sale['id']);

-            if ($saleIsCompleted && $buyingSession) {

+            if ($saleIsCompleted && $buyingSession) {
                 Display::addFlash(

                     Display::return_message(

                         sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $session['name']),

@@ -94,7 +94,7 @@ 
                 break;

             }

 

-            if ($saleIsCompleted && $buyingCourse) {

+            if ($saleIsCompleted && $buyingCourse) {
                 Display::addFlash(

                     Display::return_message(

                         sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $course['title']),

@@ -110,7 +110,7 @@ 
             );

             break;

         case 'Pending':

-            switch ($confirmPayments["PAYMENTINFO_0_PENDINGREASON"]) {

+            switch ($confirmPayments["PAYMENTINFO_0_PENDINGREASON"]) {
                 case 'address':

                     $purchaseStatus = $plugin->get_lang('PendingReasonByAddress');

                     break;

@@ -173,13 +173,13 @@ 
 

 $token = isset($_GET['token']) ? $_GET['token'] : null;

 

-if (empty($token)) {

+if (empty($token)) {
     api_not_allowed(true);

 }

 

 $shippingDetails = GetShippingDetails($token);

 

-if ($shippingDetails['ACK'] !== 'Success') {

+if ($shippingDetails['ACK'] !== 'Success') {
     $erroMessage = vsprintf(

         $plugin->get_lang('ErrorOccurred'),

         [$expressCheckout['L_ERRORCODE0'], $shippingDetails['L_LONGMESSAGE0']]

@@ -196,9 +196,9 @@ 
 $templateName = $plugin->get_lang('PaymentMethods');

 $tpl = new Template($templateName);

 

-if ($buyingCourse) {

+if ($buyingCourse) {
     $tpl->assign('course', $course);

-} elseif ($buyingSession) {

+} elseif ($buyingSession) {
     $tpl->assign('session', $session);

 }

 

plugin/buycourses/src/service_catalog.php

Braces +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     FormValidator::LAYOUT_INLINE

 );

 

-if ($form->validate()) {

+if ($form->validate()) {
     $formValues = $form->getSubmitValues();

     $nameFilter = isset($formValues['name']) ? $formValues['name'] : null;

     $minFilter = isset($formValues['min']) ? $formValues['min'] : 0;

@@ -64,7 +64,7 @@ 
 $serviceList = $plugin->getCatalogServiceList($nameFilter, $minFilter, $maxFilter, $appliesToFilter);

 

 //View

-if (api_is_platform_admin()) {

+if (api_is_platform_admin()) {
     $interbreadcrumb[] = [

         'url' => 'configuration.php',

         'name' => $plugin->get_lang('AvailableCoursesConfiguration')

@@ -73,7 +73,7 @@ 
         'url' => 'paymentsetup.php',

         'name' => $plugin->get_lang('PaymentsConfiguration')

     ];

-} else {

+} else {
     $interbreadcrumb[] = [

         'url' => '../index.php',

         'name' => $plugin->get_lang('UserPanel')

plugin/buycourses/src/service_process_confirm.php

Braces +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 

 $serviceSaleId = $_SESSION['bc_service_sale_id'];

 

-if (empty($serviceSaleId)) {

+if (empty($serviceSaleId)) {
     api_not_allowed(true);

 }

 

@@ -20,14 +20,14 @@ 
 

 $userInfo = api_get_user_info($serviceSale['buyer']['id']);

 

-if (empty($serviceSale)) {

+if (empty($serviceSale)) {
     api_not_allowed(true);

 }

 

 $currency = $plugin->getCurrency($serviceSale['currency_id']);

 $terms = $plugin->getGlobalParameters();

 

-switch ($serviceSale['payment_type']) {

+switch ($serviceSale['payment_type']) {
     case BuyCoursesPlugin::PAYMENT_TYPE_PAYPAL:

         $paypalParams = $plugin->getPaypalParams();

 

@@ -63,7 +63,7 @@ 
             $extra

         );

 

-        if ($expressCheckout["ACK"] !== 'Success') {

+        if ($expressCheckout["ACK"] !== 'Success') {
             $erroMessage = vsprintf(

                 $plugin->get_lang('ErrorOccurred'),

                 [$expressCheckout['L_ERRORCODE0'], $expressCheckout['L_LONGMESSAGE0']]

@@ -92,10 +92,10 @@ 
             FormValidator::LAYOUT_INLINE

         );

 

-        if ($form->validate()) {

+        if ($form->validate()) {
             $formValues = $form->getSubmitValues();

 

-            if (isset($formValues['cancel'])) {

+            if (isset($formValues['cancel'])) {
                 $plugin->cancelServiceSale(intval($serviceSale['id']));

 

                 unset($_SESSION['bc_service_sale_id']);

@@ -180,9 +180,9 @@ 
             FormValidator::LAYOUT_INLINE

         );

 

-        if ($form->validate()) {

+        if ($form->validate()) {
             $formValues = $form->getSubmitValues();

-            if (isset($formValues['cancel'])) {

+            if (isset($formValues['cancel'])) {
                 $plugin->cancelServiceSale($serviceSale['id']);

 

                 unset($_SESSION['bc_service_sale_id']);

main/exercise/exercise.php

Braces +4 added lines, -2 removed lines

@@ -1113,7 +1113,8 @@ 
                 $nbrActiveTests = $nbrActiveTests + 1;
                 $actions .= '      <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=disable&page='.$page.'&file='.$path.'">'.
                     Display::return_icon('visible.png', get_lang('Deactivate'), '', ICON_SIZE_SMALL).'</a>';
-            } else { // else if not active
+            } else {
+// else if not active
                 $actions .= '    <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=enable&page='.$page.'&file='.$path.'">'.
                     Display::return_icon('invisible.png', get_lang('Activate'), '', ICON_SIZE_SMALL).'</a>';
             }
@@ -1219,6 +1220,7 @@ 
     echo '</div>';
 }
 
-if ($origin != 'learnpath') { //so we are not in learnpath tool
+if ($origin != 'learnpath') {
+//so we are not in learnpath tool
     Display :: display_footer();
 }

main/mySpace/user_import.php

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
- 	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+        $id_session = intval($_GET['id_session']);
+    $interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions'));
+    $interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -89,7 +89,7 @@ 
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	echo Display::return_message(get_lang('ThisFieldIsRequired'), 'error');
+    echo Display::return_message(get_lang('ThisFieldIsRequired'), 'error');
 }
 
 if (count($errors) != 0) {

main/mySpace/progression.php

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		echo Display::return_message($export_result, 'error');
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        echo Display::return_message($export_result, 'error');
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/search/index.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $this_section = SECTION_COURSES;
 
 if (extension_loaded('xapian')) {
-	require '../lp/lp_list_search.php';
+    require '../lp/lp_list_search.php';
 } else {
     Display::display_header(get_lang('Search'));
     echo Display::return_message(get_lang('SearchXapianModuleNotInstalled'), 'error');

main/inc/lib/course.lib.php

Indentation +8 added lines, -8 removed lines

@@ -1397,11 +1397,11 @@ 
             }
 
             $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user '
-                  . ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
+                    . ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
                       ON 
                         user.id = course_rel_user.user_id AND
                         course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH.'  '
-                  . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
+                    . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
 
             if (!empty($course_code)) {
                 $sql .= ' AND course_rel_user.c_id = "'.$courseId.'"';
@@ -1745,7 +1745,7 @@ 
 
         // We get the coach for the given course in a given session.
         $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
-               ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2';
+                ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $userInfo = api_get_user_info($user['user_id']);
@@ -3561,13 +3561,13 @@ 
                     $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'];
                     if ($load_dirs) {
                         $params['document'] = '<a id="document_preview_'.$courseId.'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                           . Display::returnFontAwesomeIcon('folder-open').'</a>';
+                            . Display::returnFontAwesomeIcon('folder-open').'</a>';
                         $params['document'] .= Display::div('', ['id' => 'document_result_'.$courseId.'_0', 'class' => 'document_preview_container']);
                     }
                 } else {
                     if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) {
                         $params['document'] = '<a id="document_preview_'.$courseId.'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                           . Display::returnFontAwesomeIcon('folder-open').'</a>';
+                            . Display::returnFontAwesomeIcon('folder-open').'</a>';
                         $params['document'] .= Display::div('', ['id' => 'document_result_'.$courseId.'_0', 'class' => 'document_preview_container']);
                     }
                 }
@@ -3761,7 +3761,7 @@ 
                 $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course_info['code'];
                 if ($load_dirs) {
                     $params['document'] = '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open').'</a>';
+                                . Display::returnFontAwesomeIcon('folder-open').'</a>';
                     $params['document'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class' => 'document_preview_container'));
                 }
             }
@@ -3904,7 +3904,7 @@ 
                 $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course_info['code'];
                 if ($load_dirs) {
                     $params['document'] = '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open').'</a>';
+                                . Display::returnFontAwesomeIcon('folder-open').'</a>';
                     $params['document'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class' => 'document_preview_container'));
                 }
             }
@@ -4852,7 +4852,7 @@ 
                     get_lang('Subscribe').' '.
                     Display::returnFontAwesomeIcon('sign-in'),
                     api_get_path(WEB_COURSE_PATH).$course_info['path'].
-                     '/index.php?action=subscribe&sec_token='.$stok,
+                        '/index.php?action=subscribe&sec_token='.$stok,
                     array(
                         'class' => 'btn btn-success btn-sm',
                         'title' => get_lang('Subscribe'),

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

@@ -302,7 +302,7 @@ 
         $courseId = intval($courseId);
         $isTutor = intval($isTutor);
 
-        $sql = "UPDATE $table SET is_tutor = '".$isTutor."'
+        $sql = "update $table SET is_tutor = '".$isTutor."'
 			    WHERE
 				    user_id = '".$userId."' AND
 				    c_id = '".$courseId."'";
@@ -2333,7 +2333,7 @@ 
 
             // Update ticket
             $table = Database::get_main_table(TABLE_TICKET_TICKET);
-            $sql = "UPDATE $table SET course_id = NULL WHERE course_id = $courseId";
+            $sql = "update $table SET course_id = NULL WHERE course_id = $courseId";
             Database::query($sql);
 
             // Class
@@ -2345,7 +2345,7 @@ 
             // Skills
             $table = Database::get_main_table(TABLE_MAIN_SKILL_REL_USER);
             $argumentation = Database::escape_string(sprintf(get_lang('SkillFromCourseXDeletedSinceThen'), $course['code']));
-            $sql = "UPDATE $table SET course_id = NULL, session_id = NULL, argumentation = '$argumentation' WHERE course_id = $courseId";
+            $sql = "update $table SET course_id = NULL, session_id = NULL, argumentation = '$argumentation' WHERE course_id = $courseId";
             Database::query($sql);
 
             // Delete the course from the database
@@ -2954,7 +2954,7 @@ 
     {
         $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "UPDATE $table SET $name = '".Database::escape_string($value)."'
+        $sql = "update $table SET $name = '".Database::escape_string($value)."'
                 WHERE id = '$id'";
 
         return Database::query($sql);
@@ -2972,7 +2972,7 @@ 
     {
         $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "UPDATE $table SET ";
+        $sql = "update $table SET ";
         $i = 0;
         foreach ($attributes as $name => $value) {
             if ($value != '') {
@@ -4434,12 +4434,12 @@ 
 
         if (empty($session_id)) {
             $table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-            $sql = "UPDATE $table SET legal_agreement = '1'
+            $sql = "update $table SET legal_agreement = '1'
                     WHERE user_id = $user_id AND c_id  = $courseId ";
             Database::query($sql);
         } else {
             $table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-            $sql = "UPDATE  $table SET legal_agreement = '1'
+            $sql = "update  $table SET legal_agreement = '1'
                     WHERE user_id = $user_id AND c_id = $courseId AND session_id = $session_id";
             Database::query($sql);
         }

Braces +4 added lines, -2 removed lines

@@ -5819,7 +5819,8 @@ 
                         "GROUP:".$this_group['id'],
                         $to_already_selected
                     )
-                    ) { // $to_already_selected is the array containing the groups (and users) that are already selected
+                    ) {
+// $to_already_selected is the array containing the groups (and users) that are already selected
                         $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser');
                         $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled";
                         $result[] = array(
@@ -5840,7 +5841,8 @@ 
                         "USER:".$user['user_id'],
                         $to_already_selected
                     )
-                    ) { // $to_already_selected is the array containing the users (and groups) that are already selected
+                    ) {
+// $to_already_selected is the array containing the users (and groups) that are already selected
 
                         $result[] = array(
                             'value' => "USER:".$user['user_id'],

Doc Comments +3 added lines, -2 removed lines

@@ -784,7 +784,7 @@ 
      * @param  string $courseCode the course code
      * @param  int $visible (optional) The course visibility in the catalogue to the user (1=visible, 0=invisible)
      *
-     * @return boolean true if added succesfully, false otherwise.
+     * @return boolean|string true if added succesfully, false otherwise.
      */
     public static function addUserVisibilityToCourseInCatalogue(
         $userId,
@@ -1107,6 +1107,7 @@ 
      * @param  int $user_id
      * @param  string $course_code , if this parameter is null, it'll check for all courses
      * @param  bool $in_a_session True for checking inside sessions too, by default is not checked
+     * @param integer $session_id
      * @return bool   $session_id true if the user is registered in the course, false otherwise
      */
     public static function is_user_subscribed_in_course(
@@ -4657,6 +4658,7 @@ 
      * @param int   session id
      * @param id    url id
      * @param integer $session_id
+     * @param integer $url_id
      * @return array
      **/
     public static function update_course_ranking(
@@ -5918,7 +5920,6 @@ 
     /**
      * Shows the form for sending a message to a specific group or user.
      * @param FormValidator $form
-     * @param int $group_id id
      * @param array $to
      *
      * @return HTML_QuickForm_element

src/Chamilo/PageBundle/Entity/User.php

Doc Comments +5 added lines, -5 removed lines

@@ -828,7 +828,7 @@ 
     /**
      * Get status
      *
-     * @return boolean
+     * @return integer
      */
     public function getStatus()
     {
@@ -897,7 +897,7 @@ 
     /**
      * Get pictureUri
      *
-     * @return Media
+     * @return string
      */
     public function getPictureUri()
     {
@@ -1128,7 +1128,7 @@ 
     /**
      * Get active
      *
-     * @return boolean
+     * @return integer
      */
     public function getActive()
     {
@@ -1205,7 +1205,7 @@ 
     }
 
     /**
-     * @return Media
+     * @return string
      */
     public function getAvatar()
     {
@@ -1972,7 +1972,7 @@ 
     /**
      * Returns the user roles
      *
-     * @return array The roles
+     * @return string[] The roles
      */
     public function getRoles()
     {