chamilo / chamilo-lms

plugin/vchamilo/cli/bulkdestroynodes.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 echo "Chamilo Bulk Nodes Creation v.1.0\n";
 echo "=================================\n";
 require_once('../../../main/inc/global.inc.php');
-require_once('clilib.php');       // cli only functions
+require_once('clilib.php'); // cli only functions
 // Ensure errors are well explained
 ini_set('debug_display', 1);
 ini_set('debug_level', E_ALL);
@@ -91,19 +91,19 @@ 
     }
 }
 
-require_once($_configuration['root_sys'].'local/classes/database.class.php');       // cli only functions
+require_once($_configuration['root_sys'].'local/classes/database.class.php'); // cli only functions
 if ($options['verbose']) {
     echo "loaded dbclass\n";
 }
-require_once($_configuration['root_sys'].'local/classes/textlib.class.php');       // cli only functions
+require_once($_configuration['root_sys'].'local/classes/textlib.class.php'); // cli only functions
 if ($options['verbose']) {
     echo "loaded textlib\n";
 }
-require_once($_configuration['root_sys'].'local/classes/mootochamlib.php');       // moodle like API
+require_once($_configuration['root_sys'].'local/classes/mootochamlib.php'); // moodle like API
 if ($options['verbose']) {
     echo "loaded moodle wrapping\n";
 }
-require_once($_configuration['root_sys'] . '/plugin/vchamilo/lib/vchamilo_plugin.class.php');
+require_once($_configuration['root_sys'].'/plugin/vchamilo/lib/vchamilo_plugin.class.php');
 if ($options['verbose']) {
     echo "loaded vchamilo plugin\n";
 }

main/mySpace/access_details.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 $type = isset($_REQUEST['type']) ? Security::remove_XSS($_REQUEST['type']) : '';
 $course_code = isset($_REQUEST['course']) ? Security::remove_XSS($_REQUEST['course']) : '';
 $courseInfo = api_get_course_info($course_code);
-$courseId = (!empty($courseInfo['real_id'])?$courseInfo['real_id']:null);
+$courseId = (!empty($courseInfo['real_id']) ? $courseInfo['real_id'] : null);
 $connections = MySpace::get_connections_to_course($user_id, $courseId, $session_id);
 $quote_simple = "'";
 
@@ -126,7 +126,7 @@ 
 
 echo Display::page_header(get_lang('DetailsStudentInCourse'));
 echo Display::page_subheader(
-    get_lang('User').': '.$userInfo['complete_name'].' - '.get_lang('Course').': '.$courseInfo['title'] . ' (' . $course_code . ')'
+    get_lang('User').': '.$userInfo['complete_name'].' - '.get_lang('Course').': '.$courseInfo['title'].' ('.$course_code.')'
 );
 
 $form->setDefaults(array('from' => $from, 'to' => $to));

main/admin/configure_inscription.php

Spacing +16 added lines, -16 removed lines

@@ -141,9 +141,9 @@ 
                 // This request is only the preparation for the update of the home_top
                 $home_top = '';
                 if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
-                    $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+                    $home_top = @(string) file_get_contents($homep.$topf.'_'.$lang.$ext);
                 } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
-                    $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
+                    $home_top = @(string) file_get_contents($homep.$topf.$lang.$ext);
                 } else {
                     $errorMsg = get_lang('HomePageFilesNotReadable');
                 }
@@ -184,15 +184,15 @@ 
     if (api_is_western_name_order()) {
         //	FIRST NAME and LAST NAME
         $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled'));
-        $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40, 'disabled' => 'disabled'));
+        $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled'));
     } else {
         //	LAST NAME and FIRST NAME
-        $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40, 'disabled' => 'disabled'));
+        $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled'));
         $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled'));
     }
     $form->applyFilter('firstname', 'trim');
     $form->applyFilter('lastname', 'trim');
-    $form->addRule('lastname',  get_lang('ThisFieldIsRequired'), 'required');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 
     //	EMAIL
@@ -210,10 +210,10 @@ 
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('username', get_lang('UsernameWrong'), 'username');
     $form->addRule('username', get_lang('UserTaken'), 'username_available');
-    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
 
     //	PASSWORD
-    $form->addElement('password', 'pass1', get_lang('Pass'),         array('size' => 40, 'disabled' => 'disabled'));
+    $form->addElement('password', 'pass1', get_lang('Pass'), array('size' => 40, 'disabled' => 'disabled'));
     $form->addElement('password', 'pass2', get_lang('Confirmation'), array('size' => 40, 'disabled' => 'disabled'));
     $form->addRule('pass1', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('pass2', get_lang('ThisFieldIsRequired'), 'required');
@@ -246,25 +246,25 @@ 
 
     //	EXTENDED FIELDS
     if (api_get_setting('extended_profile') == 'true' &&
-        api_get_setting('extendedprofile_registration','mycomptetences') == 'true'
+        api_get_setting('extendedprofile_registration', 'mycomptetences') == 'true'
     ) {
         $form->addHtmlEditor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
     }
 
     if (api_get_setting('extended_profile') == 'true' &&
-        api_get_setting('extendedprofile_registration','mydiplomas') == 'true'
+        api_get_setting('extendedprofile_registration', 'mydiplomas') == 'true'
     ) {
         $form->addHtmlEditor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
     }
 
     if (api_get_setting('extended_profile') == 'true' &&
-        api_get_setting('extendedprofile_registration','myteach') == 'true'
+        api_get_setting('extendedprofile_registration', 'myteach') == 'true'
     ) {
         $form->addHtmlEditor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
     }
 
     if (api_get_setting('extended_profile') == 'true' &&
-        api_get_setting('extendedprofile_registration','mypersonalopenarea') == 'true'
+        api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
     ) {
         $form->addHtmlEditor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
     }
@@ -354,14 +354,14 @@ 
 
 $form->setDefaults($defaults);
 
-switch ($action){
+switch ($action) {
     case 'edit_top':
         if ($action == 'edit_top') {
             $name = $topf;
             $open = $home_top;
         } else {
             $name = $newsf;
-            $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+            $open = @(string) file_get_contents($homep.$newsf.'_'.$lang.$ext);
             $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         }
 
@@ -371,7 +371,7 @@ 
 
         $default = array();
         $form = new FormValidator('configure_inscription_'.$action, 'post', api_get_self().'?action='.$action, '', array('style' => 'margin: 0px;'));
-        $renderer =& $form->defaultRenderer();
+        $renderer = & $form->defaultRenderer();
         $renderer->setHeaderTemplate('');
         $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
         $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
@@ -390,9 +390,9 @@ 
 
         $open = '';
         if (file_exists($homep.$topf.'_'.$lang.$ext)) {
-            $open = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+            $open = @(string) file_get_contents($homep.$topf.'_'.$lang.$ext);
         } else {
-            $open = @(string)file_get_contents($homep.$topf.$ext);
+            $open = @(string) file_get_contents($homep.$topf.$ext);
         }
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         if (!empty($open)) {

main/permissions/blog_permissions.inc.php

Spacing +22 added lines, -22 removed lines

@@ -46,7 +46,7 @@ 
 $tbl_course_rel_user = $table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $sql = "SELECT user_id
 		FROM $tbl_course_rel_user
-		WHERE status = '1' AND c_id = '" . api_get_course_int_id() . "'";
+		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
 $result = Database::query($sql);
 while ($user = Database::fetch_assoc($result)) {
     unset($blog_users[$user['user_id']]);
@@ -110,7 +110,7 @@ 
     }
 }
 
-echo "<form method=\"post\" action=\"" . str_replace('&', '&amp;', $_SERVER['REQUEST_URI']) . "\">";
+echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
 
 // ---------------------------------------------------
 // 		DISPLAYING THE ROLES LIST
@@ -118,7 +118,7 @@ 
 
 if (api_get_setting('user_roles') == 'true') {
     // the list of the roles for the user
-    echo '<strong>' . get_lang('UserRoles') . '</strong><br />';
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
     $current_user_course_roles = get_roles('user', $user_id);
     $current_user_platform_roles = get_roles('user', $user_id, 'platform');
     display_role_list($current_user_course_roles, $current_user_platform_roles);
@@ -132,24 +132,24 @@ 
 
 // the header
 echo "\t<tr>\n";
-echo "\t\t<th rowspan=\"2\">" . get_lang('Module') . "</th>\n";
-echo "\t\t<th colspan=\"4\">" . get_lang('ArticleManager') . "</th>\n";
-echo "\t\t<th colspan=\"3\">" . get_lang('CommentManager') . "</th>\n";
-echo "\t\t<th colspan=\"3\">" . get_lang('BlogManager') . "</th>\n";
+echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
+echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
+echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
+echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
 echo "\t</tr>\n";
 
 // Subheader
 echo "\t<tr>\n";
-echo "\t\t<th align='center'>" . get_lang('Add') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Delete') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Edit') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Rate') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Add') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Delete') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Rate') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Tasks') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Members') . "</th>\n";
-echo "\t\t<th align='center'>" . get_lang('Roles') . "</th>\n";
+echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
+echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
@@ -172,7 +172,7 @@ 
             display_image_matrix_for_blogs(
                 $current_user_permissions,
                 $user_id,
-                'BLOG_' . $blog_id,
+                'BLOG_'.$blog_id,
                 $value,
                 (isset($inherited_permissions) ? $inherited_permissions : null),
                 (isset($course_admin) ? $course_admin : null)
@@ -191,7 +191,7 @@ 
 echo "</form><br />";
 
 // 			LEGEND
-echo '<strong>' . get_lang('Legend') . '</strong><br />';
-echo '<img src="../img/wrong.gif" /> ' . get_lang('UserHasPermissionNot') . '<br />';
-echo '<img src="../img/checkbox_on2.gif" /> ' . get_lang('UserHasPermission') . '<br />';
-echo '<img src="../img/checkbox_on3.gif" /> ' . get_lang('UserHasPermissionByRoleGroup') . '<br />';
+echo '<strong>'.get_lang('Legend').'</strong><br />';
+echo '<img src="../img/wrong.gif" /> '.get_lang('UserHasPermissionNot').'<br />';
+echo '<img src="../img/checkbox_on2.gif" /> '.get_lang('UserHasPermission').'<br />';
+echo '<img src="../img/checkbox_on3.gif" /> '.get_lang('UserHasPermissionByRoleGroup').'<br />';

main/reports/multiquery.lib.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
         $result[$i]['mysql'] = mysql_query($array[$i]);
 
         if (!$result[$i]['mysql']) {
-            die("error in query $i : " . $array[$i]);
+            die("error in query $i : ".$array[$i]);
         }
 
         // fields
@@ -29,8 +29,8 @@ 
     $numberOfResult = mysql_num_rows($result[0]['mysql']);
     for ($i = 1; $i < $result['num_queries']; $i++) {
         if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) {
-            die("wrong number of row: $numberOfResult vs " .
-                mysql_num_rows($result[$i]['mysql']) . " on query $i");
+            die("wrong number of row: $numberOfResult vs ".
+                mysql_num_rows($result[$i]['mysql'])." on query $i");
         }
     }
 

main/reports/templates/courseTime.reports.php

Spacing +14 added lines, -14 removed lines

@@ -15,32 +15,32 @@
 {
     // fetch columns
     $result = array();
-    $query = 'select r.id as kid, c.title as course ' .
-        'from ' .
-        Database::get_main_table(TABLE_MAIN_REPORTS_KEYS) . ' r, ' .
-        Database::get_main_table(TABLE_MAIN_COURSE) . ' c ' .
-        'where r.course_id=c.id and r.tool_id is null and r.child_id is null' .
+    $query = 'select r.id as kid, c.title as course '.
+        'from '.
+        Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '.
+        Database::get_main_table(TABLE_MAIN_COURSE).' c '.
+        'where r.course_id=c.id and r.tool_id is null and r.child_id is null'.
         ' order by c.title';
     $columns = Database::query($query);
     if (Database::num_rows($columns) == 0) {
-        die('<b>' . get_lang('no data found: ' . $query) . '</b>');
+        die('<b>'.get_lang('no data found: '.$query).'</b>');
     }
     $columns = Database::store_result($columns);
 
     // fetch data
     $query = 'select u.lastname Name, u.firstname Firstname';
     foreach ($columns as $key => $column) {
-        $query .= ', sec_to_time(k' . $key . '.report_time) as `' .
-            $column['course'] . '` ';
+        $query .= ', sec_to_time(k'.$key.'.report_time) as `'.
+            $column['course'].'` ';
     }
-    $query .= ' from ' . Database::get_main_table(TABLE_MAIN_USER) . ' u ';
+    $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
     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 .= '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 ';
     }
     return $query;
 }

main/reports/templates/generic.reports.php

Spacing +15 added lines, -15 removed lines

@@ -19,18 +19,18 @@ 
 
     // Nom, prenom
     $query = 'select u.lastname as "Last name", u.firstname as "First name" ';
-    $query .= 'from ' . Database::get_main_table(TABLE_MAIN_USER) . ' u ';
-    $query .= ' where u.user_id in (' . reports_getVisibilitySQL() . ') ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
     $query .= ' order by u.user_id ';
     $queries[0] = $query;
 
     // Custom Field
     foreach (array(10 => "description") as $k => $v) {
-        $query = 'select ufv.value  as "' . $v . '" ';
-        $query .= 'from ' . Database::get_main_table(TABLE_MAIN_USER) . ' u ';
-        $query .= 'left outer join ' . Database::get_main_table(TABLE_EXTRA_FIELD_VALUES) . ' ufv ';
-        $query .= ' on ufv.item_id = u.user_id and ufv.field_id = ' . $k;
-        $query .= ' where u.user_id in (' . reports_getVisibilitySQL() . ') ';
+        $query = 'select ufv.value  as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
+        $query .= ' on ufv.item_id = u.user_id and ufv.field_id = '.$k;
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
         $query .= ' order by u.user_id ';
         $queries[] = $query;
     }
@@ -38,21 +38,21 @@ 
     // Stored Value
     $sv = array();
     foreach ($sv as $k => $v) {
-        $query = 'select sec_to_time(sv.sv_value) as "' . $v . '" ';
-        $query .= 'from ' . Database::get_main_table(TABLE_MAIN_USER) . ' u ';
-        $query .= ' left outer join ' . Database::get_main_table(TABLE_TRACK_STORED_VALUES) . ' sv ';
-        $query .= 'on sv.user_id = u.user_id and sv_key = "' . $k . '" ';
-        $query .= ' where u.user_id in (' . reports_getVisibilitySQL() . ') ';
+        $query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
+        $query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
         $query .= ' order by u.user_id ';
         $queries[] = $query;
     }
 
     // premiere connexion
     $query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
-    $query .= 'from ' . Database::get_main_table(TABLE_MAIN_USER) . ' u ';
-    $query .= 'left outer join ' . Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN) . ' tel ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
     $query .= ' on tel.login_user_id = u.user_id ';
-    $query .= ' where u.user_id in (' . reports_getVisibilitySQL() . ') ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
     $query .= ' group by u.user_id ';
     $query .= ' order by u.user_id ';
     $queries[] = $query;

main/reports/modules/course.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
     array_push($reports_modules['course'],
         array(
             'keys_query' =>
-                'select ' . $course_id . ' as course_id, "' . $course_code . '" as course_code',
+                'select '.$course_id.' as course_id, "'.$course_code.'" as course_code',
             'values_query_function' => 'reports_modules_course_val'
         ));
 }
@@ -26,12 +26,12 @@ 
     return array(
         'type' => 'sql',
         'sql' =>
-            'select ' . $key_id . ', user_id as uid, ' .
-            '-1 as session_id, -1 as attempt, null as score, ' .
-            'NULL as progress, ' .
-            '(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from ' .
-            Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS) .
-            ' where c_id = ' . $course['real_id'] .
+            'select '.$key_id.', user_id as uid, '.
+            '-1 as session_id, -1 as attempt, null as score, '.
+            'NULL as progress, '.
+            '(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
+            Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
+            ' where c_id = '.$course['real_id'].
             ' group by user_id'
     );
 }

main/reports/modules/scorm.php

Spacing +79 added lines, -79 removed lines

@@ -17,11 +17,11 @@ 
     array_push($reports_modules['scorm'],
         array(
             'keys_query' =>
-                'select ' . $course_id . ' as course_id, ' .
-                $reports_modules_scorm_toolid . ' as tool_id, ' .
-                'lp.id as child_id, lp.name as child_name, ' .
-                "'" . $course_db . "'" . ' as course_db from ' .
-                Database::get_course_table(TABLE_LP_MAIN) . ' lp',
+                'select '.$course_id.' as course_id, '.
+                $reports_modules_scorm_toolid.' as tool_id, '.
+                'lp.id as child_id, lp.name as child_name, '.
+                "'".$course_db."'".' as course_db from '.
+                Database::get_course_table(TABLE_LP_MAIN).' lp',
             'values_query_function' => 'reports_modules_scorm_packageVal'
         ));
 
@@ -29,14 +29,14 @@ 
     array_push($reports_modules['scorm'],
         array(
             'keys_query' =>
-                'select ' . $course_id . ' as course_id, ' .
-                $reports_modules_scorm_toolid . ' as tool_id, ' .
-                'lp.id as child_id, lp.name as child_name, ' .
-                'lpi.id as subchild_id, lpi.title as subchild_name, ' .
-                "'" . $course_db . "'" . ' as course_db from ' .
-                Database::get_course_table(TABLE_LP_MAIN, $course_db) .
-                ' lp,' .
-                Database::get_course_table(TABLE_LP_ITEM, $course_db) .
+                'select '.$course_id.' as course_id, '.
+                $reports_modules_scorm_toolid.' as tool_id, '.
+                'lp.id as child_id, lp.name as child_name, '.
+                'lpi.id as subchild_id, lpi.title as subchild_name, '.
+                "'".$course_db."'".' as course_db from '.
+                Database::get_course_table(TABLE_LP_MAIN, $course_db).
+                ' lp,'.
+                Database::get_course_table(TABLE_LP_ITEM, $course_db).
                 ' lpi where lp.id = lpi.lp_id',
             'values_query_function' => 'reports_modules_scorm_scoVal'
         ));
@@ -45,24 +45,24 @@ 
     array_push($reports_modules['scorm'],
         array(
             'keys_query' =>
-                'select distinct ' . $course_id . ' as course_id, ' .
-                $reports_modules_scorm_toolid . ' as tool_id, ' .
-                'lp.id as child_id, lp.name as child_name, ' .
-                'lpi.id as subchild_id, ' .
-                'lpi.title as subchild_name, ' .
-                'null as subsubchild_id, ' .
-                'lpivo.objective_id as subsubchild_name, ' .
-                "'" . $course_db . "'" . ' as course_db from ' .
-                Database::get_course_table(TABLE_LP_MAIN, $course_db) .
-                ' lp,' .
-                Database::get_course_table(TABLE_LP_ITEM, $course_db) .
-                ' lpi, ' .
-                Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db) .
-                ' lpiv, ' .
-                Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db) .
-                ' lpivo ' .
-                'where lp.id = lpi.lp_id ' .
-                'and lpi.id = lpiv.lp_item_id ' .
+                'select distinct '.$course_id.' as course_id, '.
+                $reports_modules_scorm_toolid.' as tool_id, '.
+                'lp.id as child_id, lp.name as child_name, '.
+                'lpi.id as subchild_id, '.
+                'lpi.title as subchild_name, '.
+                'null as subsubchild_id, '.
+                'lpivo.objective_id as subsubchild_name, '.
+                "'".$course_db."'".' as course_db from '.
+                Database::get_course_table(TABLE_LP_MAIN, $course_db).
+                ' lp,'.
+                Database::get_course_table(TABLE_LP_ITEM, $course_db).
+                ' lpi, '.
+                Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db).
+                ' lpiv, '.
+                Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db).
+                ' lpivo '.
+                'where lp.id = lpi.lp_id '.
+                'and lpi.id = lpiv.lp_item_id '.
                 'and lpiv.id = lpivo.lp_iv_id ',
             'values_query_function' => 'reports_modules_scorm_objVal'
         ));
@@ -73,12 +73,12 @@ 
     return array(
         'type' => 'sql',
         'sql' =>
-            'select ' . $key_id . ', user_id as uid, ' .
-            'session_id, view_count as attempt, null as score, ' .
-            'progress as progress, ' .
-            'null as time, null as ts from ' .
-            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']) .
-            ' where lp_id = ' . $scorm['child_id']
+            'select '.$key_id.', user_id as uid, '.
+            'session_id, view_count as attempt, null as score, '.
+            'progress as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' where lp_id = '.$scorm['child_id']
     );
 }
 
@@ -87,25 +87,25 @@ 
     return array(
         'type' => 'sql',
         'sql' =>
-            'select ' . $key_id . ', lpv.user_id as uid, ' .
-            'lpv.session_id, lpiv.view_count as attempt, ' .
-            'lpiv.score as score, ' .
-            '(case lpiv.status ' .
-            'when "incomplete" then 0 ' .
-            'when "completed" then 1 ' .
-            'when "passed" then 2 ' .
-            'when "failed" then 3 ' .
-            'when "browsed" then 4 ' .
-            'when "not attempted" then 5 ' .
-            'else 6 ' .
-            'end) as progress, ' .
-            'lpiv.total_time as time, null as ts from ' .
-            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']) .
-            ' lpv, ' .
-            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']) .
-            ' lpiv ' .
-            ' where lpv.lp_id = ' . $scorm['child_id'] .
-            ' and lpiv.lp_item_id = ' . $scorm['subchild_id'] .
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpiv.score as score, '.
+            '(case lpiv.status '.
+            'when "incomplete" then 0 '.
+            'when "completed" then 1 '.
+            'when "passed" then 2 '.
+            'when "failed" then 3 '.
+            'when "browsed" then 4 '.
+            'when "not attempted" then 5 '.
+            'else 6 '.
+            'end) as progress, '.
+            'lpiv.total_time as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
             ' and lpiv.lp_view_id = lpv.id'
     );
 }
@@ -115,29 +115,29 @@ 
     return array(
         'type' => 'sql',
         'sql' =>
-            'select ' . $key_id . ', lpv.user_id as uid, ' .
-            'lpv.session_id, lpiv.view_count as attempt, ' .
-            'lpivo.score_raw as score, ' .
-            '(case lpivo.status ' .
-            'when "incomplete" then 0 ' .
-            'when "completed" then 1 ' .
-            'when "passed" then 2 ' .
-            'when "failed" then 3 ' .
-            'when "browsed" then 4 ' .
-            'when "not attempted" then 5 ' .
-            'else 6 ' .
-            'end) as progress, ' .
-            'null as time, null as ts from ' .
-            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']) .
-            ' lpv, ' .
-            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']) .
-            ' lpiv, ' .
-            Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']) .
-            ' lpivo ' .
-            ' where lpv.lp_id = ' . $scorm['child_id'] .
-            ' and lpiv.lp_item_id = ' . $scorm['subchild_id'] .
-            ' and lpivo.objective_id = "' . $scorm['subsubchild_name'] . '" ' .
-            ' and lpiv.lp_view_id = lpv.id' .
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpivo.score_raw as score, '.
+            '(case lpivo.status '.
+            'when "incomplete" then 0 '.
+            'when "completed" then 1 '.
+            'when "passed" then 2 '.
+            'when "failed" then 3 '.
+            'when "browsed" then 4 '.
+            'when "not attempted" then 5 '.
+            'else 6 '.
+            'end) as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv, '.
+            Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']).
+            ' lpivo '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
+            ' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '.
+            ' and lpiv.lp_view_id = lpv.id'.
             ' and lpivo.lp_iv_id=lpiv.id'
     );
 }