chamilo / chamilo-lms

plugin/buycourses/src/process_confirm.php

Braces +14 added lines, -14 removed lines

@@ -11,7 +11,7 @@ 
 

 $saleId = $_SESSION['bc_sale_id'];

 

-if (empty($saleId)) {

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

 }

 

@@ -19,14 +19,14 @@ 
 

 $userInfo = api_get_user_info($sale['user_id']);

 

-if (empty($sale)) {

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

 }

 

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

 $terms = $plugin->getGlobalParameters();

 

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

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

         $paypalParams = $plugin->getPaypalParams();

 

@@ -51,7 +51,7 @@ 
             $extra

         );

 

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

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

                 $plugin->get_lang('ErrorOccurred'),

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

@@ -69,7 +69,7 @@ 
         $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']);

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

         );

 

-        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']);

@@ -153,9 +153,9 @@ 
 

         $template = new Template();

 

-        if ($buyingCourse) {

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

-        } elseif ($buyingSession) {

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

         }

 

@@ -183,7 +183,7 @@ 
         $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']);

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

         );

 

-        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']);

@@ -244,9 +244,9 @@ 
 

         $template = new Template();

 

-        if ($buyingCourse) {

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

-        } elseif ($buyingSession) {

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

         }

 

plugin/buycourses/src/service_error.php

Braces +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  */

 require_once '../config.php';

 

-if (isset($_SESSION['bc_service_sale_id'])) {

+if (isset($_SESSION['bc_service_sale_id'])) {
     $plugin = BuyCoursesPlugin::create();

     $serviceSaleId = $_SESSION['bc_service_sale_id'];

     unset($_SESSION['bc_service_sale_id']);

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/auth/ldap/authldap.php

Braces +45 added lines, -21 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;
 
@@ -394,8 +410,9 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query) != 0)
-            echo Display::return_message(get_lang('LDAPConnectionError'), 'error');
+        if (count($ldap_query) != 0) {
+                    echo Display::return_message(get_lang('LDAPConnectionError'), 'error');
+        }
         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,7 +482,8 @@ 
  * @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'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
@@ -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);

main/inc/lib/document.lib.php

Braces +16 added lines, -8 removed lines

@@ -2350,7 +2350,8 @@ 
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
                                             }
-                                        } elseif (strstr($source, '..') === 0) { //link is relative but going back in the hierarchy
+                                        } elseif (strstr($source, '..') === 0) {
+//link is relative but going back in the hierarchy
                                             $files_list[] = array($source, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
@@ -3052,7 +3053,8 @@ 
             case 'application/postscript':
                 $temp_file = tempnam(sys_get_temp_dir(), 'chamilo');
                 exec("ps2pdf $doc_path $temp_file", $output, $ret_val);
-                if ($ret_val !== 0) { // shell fail, probably 127 (command not found)
+                if ($ret_val !== 0) {
+// shell fail, probably 127 (command not found)
                     return false;
                 }
                 exec("pdftotext $temp_file -", $output, $ret_val);
@@ -3068,7 +3070,8 @@ 
                 // Note: correct handling of code pages in unrtf
                 // on debian lenny unrtf v0.19.2 can not, but unrtf v0.20.5 can
                 exec("unrtf --text $doc_path", $output, $ret_val);
-                if ($ret_val == 127) { // command not found
+                if ($ret_val == 127) {
+// command not found
                     return false;
                 }
                 // Avoid index unrtf comments
@@ -3094,7 +3097,8 @@ 
 
         $content = '';
         if (!is_null($ret_val)) {
-            if ($ret_val !== 0) { // shell fail, probably 127 (command not found)
+            if ($ret_val !== 0) {
+// shell fail, probably 127 (command not found)
                 return false;
             }
         }
@@ -4137,7 +4141,8 @@ 
                             // Update search engine
                             if (isset($specific_fields_values[$specific_field['code']])) {
                                 $sterms = trim($specific_fields_values[$specific_field['code']]);
-                            } else { //if the specific field is not defined, force an empty one
+                            } else {
+//if the specific field is not defined, force an empty one
                                 $sterms = '';
                             }
                             $all_specific_terms .= ' '.$sterms;
@@ -4177,7 +4182,8 @@ 
                     foreach ($specific_fields as $specific_field) {
                         if (isset($specific_fields_values[$specific_field['code']])) {
                             $sterms = trim($specific_fields_values[$specific_field['code']]);
-                        } else { //if the specific field is not defined, force an empty one
+                        } else {
+//if the specific field is not defined, force an empty one
                             $sterms = '';
                         }
                         $all_specific_terms .= ' '.$sterms;
@@ -6002,7 +6008,8 @@ 
                         api_get_self()."?$courseParams&curdirpath=$curdirpath&add_as_template=$id"
                     );
                 }
-                if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates') {//allow attach certificate to course
+                if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates') {
+//allow attach certificate to course
                     $visibility_icon_certificate = 'nocertificate';
                     if (self::get_default_certificate_id(api_get_course_id()) == $id) {
                         $visibility_icon_certificate = 'certificate';
@@ -6291,7 +6298,8 @@ 
           3. check plugins: quicktime, mediaplayer, vlc, acrobat, flash, java
          */
 
-        if (!($result = in_array($file_extension, $allowed_extensions))) { // Assignment + a logical check.
+        if (!($result = in_array($file_extension, $allowed_extensions))) {
+// Assignment + a logical check.
             return false;
         }
 

main/reports/templates/exercicesMultiCourses.reports.php

Braces +17 added lines, -10 removed lines

@@ -43,28 +43,35 @@
         'where r.course_id=c.id and r.tool_id='.
         reports_getToolId(TOOL_QUIZ).
         ' order by r.course_id, r.child_name');
-    if (Database::num_rows($columns) == 0)
-        die('<b>'.get_lang('no data found').'</b>');
+    if (Database::num_rows($columns) == 0) {
+            die('<b>'.get_lang('no data found').'</b>');
+    }
     $query = 'select u.lastname Name, u.firstname Firstname';
     $columns = Database::store_result($columns);
-    if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max')
-        $function = $_REQUEST['tattempt'];
-    else
-        $function = 'avg';
-    foreach ($columns as $key => $column)
-        $query .= ', '.$function.'(k'.$key.'.score) as `'.
+    if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') {
+            $function = $_REQUEST['tattempt'];
+    } else {
+            $function = 'avg';
+    }
+    foreach ($columns as $key => $column) {
+            $query .= ', '.$function.'(k'.$key.'.score) as `'.
                 $column['course'].' - '.
                 $column['test'].'` ';
+    }
     $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-    foreach ($columns as $key => $column) // fixme sessions
+    foreach ($columns as $key => $column) {
+        // fixme sessions
         $query .= 'left outer join '.
             Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
             ' k'.$key.
             ' on k'.$key.'.key_id = '.$column['kid'].
                 ' and k'.$key.'.user_id = u.user_id ';
+    }
     $query .= ' group by ';
-    foreach ($columns as $key => $column) // grouping attempt
+    foreach ($columns as $key => $column) {
+        // grouping attempt
         $query .= 'k'.$key.'.attempt, ';
+    }
     $query = substr($query, 0, -2); // removing last ', ';
 
     return $query;