chamilo / chamilo-lms

main/attendance/attendance_sheet.php

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
     $form = new FormValidator(
             'filter',
             'post',
-            'index.php?action=attendance_sheet_list&' . api_get_cidreq().'&attendance_id=' . $attendance_id,
+            'index.php?action=attendance_sheet_list&'.api_get_cidreq().'&attendance_id='.$attendance_id,
             null,
             array(),
             'inline'
@@ -217,7 +217,7 @@ 
                             <th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
                         </tr>
                         <tr class="tableFloatingHeaderOriginal" >
-                            <th width="10px"><?php echo '#';?></th>
+                            <th width="10px"><?php echo '#'; ?></th>
                             <th width="10px"><?php echo get_lang('Photo')?></th>
                             <th width="150px"><?php echo get_lang('LastName')?></th>
                             <th width="140px"><?php echo get_lang('FirstName')?></th>
@@ -231,9 +231,9 @@ 
                         foreach ($users_in_course as $data) {
                             $faults = 0;
                             if ($i % 2 == 0) {
-                                $class='row_odd';
+                                $class = 'row_odd';
                             } else {
-                                $class='row_even';
+                                $class = 'row_even';
                             }
                             $username = api_htmlentities(sprintf(get_lang('LoginX'), $data['username']), ENT_QUOTES);
                             ?>
@@ -243,7 +243,7 @@ 
                                 <td><span title="<?php echo $username ?>"><?php echo $data['lastname'] ?></span></td>
                                 <td><?php echo $data['firstname'] ?></td>
                                 <td>
-                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
+                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar']) ? $data['result_color_bar'] : 'none') ?>">
                                         <?php echo $data['attendance_result'] ?>
                                     </div>
                                 </td>
@@ -265,7 +265,7 @@ 
                     foreach ($attendant_calendar as $calendar) {
                         $date = $calendar['date'];
                         $time = $calendar['time'];
-                        $datetime = '<div class="grey">'. $date . ' - ' . $time . '</div>';
+                        $datetime = '<div class="grey">'.$date.' - '.$time.'</div>';
 
                         $img_lock = Display::return_icon(
                             'lock-closed.png',
@@ -274,21 +274,21 @@ 
                         );
 
                         if (!empty($calendar['done_attendance'])) {
-                            $datetime = '<div class="blue">' . $date . ' - ' . $time . '</div>';
+                            $datetime = '<div class="blue">'.$date.' - '.$time.'</div>';
                         }
                         $disabled_check = 'disabled = "true"';
                         $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
                         if ($next_attendance_calendar_id == $calendar['id']) {
                             $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
                             $disabled_check = '';
-                            $img_lock = Display::return_icon('lock-closed.png',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
+                            $img_lock = Display::return_icon('lock-closed.png', get_lang('DateLock'), array('class'=>'img_unlock', 'id'=>'datetime_column_'.$calendar['id']));
                         }
 
                         $result .= '<th>';
                         $result .= '<div class="date-attendance">'.$datetime.'&nbsp;';
 
                         if (api_is_allowed_to_edit(null, true)) {
-                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
+                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin() ? $img_lock : '').'</span>';
                         }
 
                         if ($is_locked_attendance == false) {
@@ -299,7 +299,7 @@ 
                     }
                 } else {
                     $result  = '<th width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.'">';
-                    $result .= Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
+                    $result .= Display::return_icon('attendance_calendar.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
                 }
 
                 echo '<tr class="tableFloatingHeader row_odd" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px">';
@@ -313,7 +313,7 @@ 
                 $i = 0;
                 foreach ($users_in_course as $user) {
                     $class = '';
-                    if ($i%2 == 0) {
+                    if ($i % 2 == 0) {
                         $class = 'row_even';
                     } else {
                         $class = 'row_odd';
@@ -360,7 +360,7 @@ 
                                     echo '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value="'.$user['user_id'].'" '.$disabled.' '.$checked.' />';
                                     echo '<span class="anchor_'.$calendar['id'].'"></span>';
                                 } else {
-                                    echo $presence ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence'));
+                                    echo $presence ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence'));
                                 }
                             } else {
                                 switch ($presence) {
@@ -391,7 +391,7 @@ 
                         </td>';
                     }
                     echo '</tr>';
-                    $i++ ;
+                    $i++;
                 }
                 echo '</tbody></table>';
                 echo '</div></div>';
@@ -419,13 +419,13 @@ 
     echo Display::page_header(get_lang('AttendanceSheetReport'));
     // View for students
     ?>
-    <?php if(!empty($users_presence)) { ?>
+    <?php if (!empty($users_presence)) { ?>
         <div>
             <table width="250px;">
                 <tr>
                     <td><?php echo get_lang('ToAttend').': ' ?></td>
                     <td>
-                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar'])?$faults['color_bar']:'none') ?>">
+                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar']) ? $faults['color_bar'] : 'none') ?>">
                         <?php echo $faults['faults'].'/'.$faults['total'].' ('.$faults['faults_porcent'].'%)' ?></div></center>
                     </td>
                 </tr>
@@ -442,7 +442,7 @@ 
             $i = 0;
             foreach ($users_presence[$user_id] as $presence) {
                 $class = '';
-                if ($i%2==0) {
+                if ($i % 2 == 0) {
                     $class = 'row_even';
                 } else {
                     $class = 'row_odd';
@@ -450,7 +450,7 @@ 
                 ?>
                 <tr class="<?php echo $class ?>">
                     <td>
-                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?>
+                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence')) ?>
                         <?php echo "&nbsp; ".$presence['date_time'] ?>
                     </td>
                 </tr>

main/inc/lib/tracking.lib.php

Indentation +862 added lines, -862 removed lines

@@ -311,8 +311,8 @@ 
                     $extend_link = '';
                     if (!empty($inter_num)) {
                         $extend_link = Display::url(
-                              Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                              api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
+                                Display::return_icon('visible.gif', get_lang('HideAttemptView')),
+                                api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
                         );
                     }
                     $title = $row['mytitle'];
@@ -1319,7 +1319,7 @@ 
             case 'last_30_days':
                 $new_date = date('Y-m-d H:i:s', strtotime('-30 day'));
                 $condition_time = ' AND (login_date >= "'.$new_date.'" AND logout_date <= "'.$today.'") ';
-               break;
+                break;
             case 'custom':
                 if (!empty($start_date) && !empty($end_date)) {
                     $start_date = Database::escape_string($start_date);
@@ -1329,10 +1329,10 @@ 
                 break;
         }
 
-    	$sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
+        $sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
     	        FROM '.$tbl_track_login.'
                 WHERE '.$userCondition.$condition_time;
-    	$rs = Database::query($sql);
+        $rs = Database::query($sql);
         $row = Database::fetch_array($rs, 'ASSOC');
         $diff = $row['diff'];
 
@@ -1354,18 +1354,18 @@ 
     public static function get_time_spent_on_the_course($user_id, $courseId, $session_id = 0)
     {
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-
-    	$tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	if (is_array($user_id)) {
-    	    $user_id = array_map('intval', $user_id);
-    		$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
-    	} else {
-    		$user_id = intval($user_id);
-    		$condition_user = " AND user_id = $user_id ";
-    	}
-
-    	$sql = "SELECT
+        $session_id  = intval($session_id);
+
+        $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        if (is_array($user_id)) {
+            $user_id = array_map('intval', $user_id);
+            $condition_user = " AND user_id IN (".implode(',',$user_id).") ";
+        } else {
+            $user_id = intval($user_id);
+            $condition_user = " AND user_id = $user_id ";
+        }
+
+        $sql = "SELECT
     	        SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
                 FROM $tbl_track_course
                 WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) ";
@@ -1381,9 +1381,9 @@ 
         $sql .= $condition_user;
 
         $rs = Database::query($sql);
-    	$row = Database::fetch_array($rs);
+        $row = Database::fetch_array($rs);
 
-    	return $row['nb_seconds'];
+        return $row['nb_seconds'];
     }
 
     /**
@@ -1394,25 +1394,25 @@ 
      */
     public static function get_first_connection_date($student_id)
     {
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $tbl_track_login . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date ASC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs)>0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
                 return api_convert_and_format_date(
                     $first_login_date,
                     DATE_FORMAT_SHORT,
                     date_default_timezone_get()
                 );
-    		}
-    	}
+            }
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -1425,38 +1425,38 @@ 
      */
     public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false)
     {
-    	$table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $table . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date
                 DESC LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
-    			$last_login_date = api_get_local_time($last_login_date);
-    			if ($return_timestamp) {
-    				return api_strtotime($last_login_date,'UTC');
-    			} else {
-    				if (!$warning_message) {
-    					return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					$timestamp = api_strtotime($last_login_date,'UTC');
-    					$currentTimestamp = time();
-
-    					//If the last connection is > than 7 days, the text is red
-    					//345600 = 7 days in seconds
-    					if ($currentTimestamp - $timestamp > 604800) {
-    						return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
-    					} else {
-    						return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
+                $last_login_date = api_get_local_time($last_login_date);
+                if ($return_timestamp) {
+                    return api_strtotime($last_login_date,'UTC');
+                } else {
+                    if (!$warning_message) {
+                        return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        $timestamp = api_strtotime($last_login_date,'UTC');
+                        $currentTimestamp = time();
+
+                        //If the last connection is > than 7 days, the text is red
+                        //345600 = 7 days in seconds
+                        if ($currentTimestamp - $timestamp > 604800) {
+                            return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
+                        } else {
+                            return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                        }
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1510,30 +1510,30 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	$student_id  = intval($student_id);
+        $student_id  = intval($student_id);
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	$sql = 'SELECT login_course_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $sql = 'SELECT login_course_date
     	        FROM '.$tbl_track_login.'
                 WHERE
                     user_id = '.$student_id.' AND
                     c_id = '.$courseId.' AND
                     session_id = '.$session_id.'
                 ORDER BY login_course_date ASC LIMIT 0,1';
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
-    			if ($convert_date) {
-    				return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
-    			} else {
-    				return $first_login_date;
-    			}
-    		}
-    	}
-
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
+                if ($convert_date) {
+                    return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
+                } else {
+                    return $first_login_date;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -1549,13 +1549,13 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	// protect data
-    	$student_id  = intval($student_id);
+        // protect data
+        $student_id  = intval($student_id);
         $courseId = $courseInfo['real_id'];
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$sql = 'SELECT access_date
+        $tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $sql = 'SELECT access_date
                 FROM '.$tbl_track_e_access.'
                 WHERE   access_user_id = '.$student_id.' AND
                         c_id = "'.$courseId.'" AND
@@ -1563,39 +1563,39 @@ 
                 ORDER BY access_date DESC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
                 if (empty($last_login_date) || $last_login_date == '0000-00-00 00:00:00') {
                     return false;
                 }
                 //see #5736
                 $last_login_date_timestamp = api_strtotime($last_login_date);
-    			$now = time();
-    			//If the last connection is > than 7 days, the text is red
-    			//345600 = 7 days in seconds
-    			if ($now - $last_login_date_timestamp > 604800) {
-    				if ($convert_date) {
+                $now = time();
+                //If the last connection is > than 7 days, the text is red
+                //345600 = 7 days in seconds
+                if ($now - $last_login_date_timestamp > 604800) {
+                    if ($convert_date) {
                         $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
                         $icon = api_is_allowed_to_edit() ?
                             '<a href="'.api_get_path(REL_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'">
                               '.Display::return_icon('messagebox_warning.gif').'
                              </a>'
                             : null;
-    					return $icon. Display::label($last_login_date, 'warning');
-    				} else {
-    					return $last_login_date;
-    				}
-    			} else {
-    				if ($convert_date) {
-    					return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					return $last_login_date;
-    				}
-    			}
-    		}
-    	}
-    	return false;
+                        return $icon. Display::label($last_login_date, 'warning');
+                    } else {
+                        return $last_login_date;
+                    }
+                } else {
+                    if ($convert_date) {
+                        return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        return $last_login_date;
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1608,36 +1608,36 @@ 
      */
     public static function get_course_connections_count($courseId, $session_id = 0, $start = 0, $stop = null)
     {
-    	if ($start < 0) {
-    		$start = 0;
-    	}
-    	if (!isset($stop) or ($stop < 0)) {
-    		$stop = api_get_utc_datetime();
-    	}
+        if ($start < 0) {
+            $start = 0;
+        }
+        if (!isset($stop) or ($stop < 0)) {
+            $stop = api_get_utc_datetime();
+        }
 
         $start = Database::escape_string($start);
         $stop = Database::escape_string($stop);
 
-    	$month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' ";
+        $month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' ";
 
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-    	$count = 0;
+        $session_id  = intval($session_id);
+        $count = 0;
 
-    	$tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	$sql = "SELECT count(*) as count_connections
+        $tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $sql = "SELECT count(*) as count_connections
                 FROM $tbl_track_e_course_access
                 WHERE
                     c_id = $courseId AND
                     session_id = $session_id
                     $month_filter";
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
-    		$row = Database::fetch_object($rs);
-    		$count = $row->count_connections;
-    	}
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs)>0) {
+            $row = Database::fetch_object($rs);
+            $count = $row->count_connections;
+        }
 
-    	return $count;
+        return $count;
     }
 
     /**
@@ -1648,25 +1648,25 @@ 
      */
     public static function count_course_per_student($user_id, $include_sessions = true)
     {
-    	$user_id = intval($user_id);
-    	$tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-    	$tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+        $user_id = intval($user_id);
+        $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+        $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
-    	$sql = 'SELECT DISTINCT c_id
+        $sql = 'SELECT DISTINCT c_id
                 FROM ' . $tbl_course_rel_user . '
                 WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH;
-    	$rs = Database::query($sql);
-    	$nb_courses = Database::num_rows($rs);
+        $rs = Database::query($sql);
+        $nb_courses = Database::num_rows($rs);
 
-    	if ($include_sessions) {
-    		$sql = 'SELECT DISTINCT c_id
+        if ($include_sessions) {
+            $sql = 'SELECT DISTINCT c_id
                     FROM ' . $tbl_session_course_rel_user . '
                     WHERE user_id = ' . $user_id;
-    		$rs = Database::query($sql);
-    		$nb_courses += Database::num_rows($rs);
-    	}
+            $rs = Database::query($sql);
+            $nb_courses += Database::num_rows($rs);
+        }
 
-    	return $nb_courses;
+        return $nb_courses;
     }
 
     /**
@@ -1697,25 +1697,25 @@ 
         $into_lp = 0
     ) {
         $course_code = Database::escape_string($course_code);
-    	$course_info = api_get_course_info($course_code);
-    	if (!empty($course_info)) {
-    		// table definition
-    		$tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
-    		$tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-
-    		// Compose a filter based on optional exercise given
-    		$condition_quiz = "";
-    		if (!empty($exercise_id)) {
-    			$exercise_id = intval($exercise_id);
-    			$condition_quiz =" AND id = $exercise_id ";
-    		}
-
-    		// Compose a filter based on optional session id given
-    		$condition_session = "";
-    		if (isset($session_id)) {
-    			$session_id = intval($session_id);
-    			$condition_session = " AND session_id = $session_id ";
-    		}
+        $course_info = api_get_course_info($course_code);
+        if (!empty($course_info)) {
+            // table definition
+            $tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
+            $tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+            // Compose a filter based on optional exercise given
+            $condition_quiz = "";
+            if (!empty($exercise_id)) {
+                $exercise_id = intval($exercise_id);
+                $condition_quiz =" AND id = $exercise_id ";
+            }
+
+            // Compose a filter based on optional session id given
+            $condition_session = "";
+            if (isset($session_id)) {
+                $session_id = intval($session_id);
+                $condition_session = " AND session_id = $session_id ";
+            }
             if ($active_filter == 1) {
                 $condition_active = 'AND active <> -1';
             } elseif ($active_filter == 0) {
@@ -1731,25 +1731,25 @@ 
                 $select_lp_id = ', orig_lp_id as lp_id ';
             }
 
-    		$sql = "SELECT count(id) FROM $tbl_course_quiz
+            $sql = "SELECT count(id) FROM $tbl_course_quiz
     				WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz ";
-    		$count_quiz = Database::fetch_row(Database::query($sql));
+            $count_quiz = Database::fetch_row(Database::query($sql));
 
-    		if (!empty($count_quiz[0]) && !empty($student_id)) {
-    			if (is_array($student_id)) {
+            if (!empty($count_quiz[0]) && !empty($student_id)) {
+                if (is_array($student_id)) {
                     $student_id = array_map('intval', $student_id);
-    				$condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
-    			} else {
+                    $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
+                } else {
                     $student_id = intval($student_id);
-    				$condition_user = " AND exe_user_id = '$student_id' ";
-    			}
+                    $condition_user = " AND exe_user_id = '$student_id' ";
+                }
 
-    			if (empty($exercise_id)) {
-    				$sql = "SELECT id FROM $tbl_course_quiz
+                if (empty($exercise_id)) {
+                    $sql = "SELECT id FROM $tbl_course_quiz
     						WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz";
                     $result = Database::query($sql);
                     $exercise_list = array();
-    				$exercise_id = null;
+                    $exercise_id = null;
                     if (Database::num_rows($result)) {
                         while ($row = Database::fetch_array($result)) {
                             $exercise_list[] = $row['id'];
@@ -1758,11 +1758,11 @@ 
                     if (!empty($exercise_list)) {
                         $exercise_id = implode("','",$exercise_list);
                     }
-    			}
+                }
 
-    			$count_quiz = Database::fetch_row(Database::query($sql));
+                $count_quiz = Database::fetch_row(Database::query($sql));
 
-    			$sql = "SELECT
+                $sql = "SELECT
     			        SUM(exe_result/exe_weighting*100) as avg_score,
     			        COUNT(*) as num_attempts
     			        $select_lp_id
@@ -1776,20 +1776,20 @@ 
                             $condition_into_lp
                         ORDER BY exe_date DESC";
 
-    			$res = Database::query($sql);
-    			$row = Database::fetch_array($res);
-    			$quiz_avg_score = null;
+                $res = Database::query($sql);
+                $row = Database::fetch_array($res);
+                $quiz_avg_score = null;
 
-    			if (!empty($row['avg_score'])) {
-    				$quiz_avg_score = round($row['avg_score'],2);
-    			}
+                if (!empty($row['avg_score'])) {
+                    $quiz_avg_score = round($row['avg_score'],2);
+                }
 
-    			if(!empty($row['num_attempts'])) {
-    				$quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
-    			}
-    			if (is_array($student_id)) {
-    				$quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
-    			}
+                if(!empty($row['num_attempts'])) {
+                    $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
+                }
+                if (is_array($student_id)) {
+                    $quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
+                }
                 if ($into_lp == 0) {
                     return $quiz_avg_score;
                 } else {
@@ -1812,9 +1812,9 @@ 
                         return array($quiz_avg_score, null);
                     }
                 }
-    		}
-    	}
-    	return null;
+            }
+        }
+        return null;
     }
 
     /**
@@ -1847,15 +1847,15 @@ 
         $find_all_lp = 0
     ) {
         $courseId = intval($courseId);
-    	$student_id  = intval($student_id);
-    	$exercise_id = intval($exercise_id);
-    	$session_id  = intval($session_id);
+        $student_id  = intval($student_id);
+        $exercise_id = intval($exercise_id);
+        $session_id  = intval($session_id);
 
-    	$lp_id = intval($lp_id);
+        $lp_id = intval($lp_id);
         $lp_item_id = intval($lp_item_id);
-    	$tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 
-    	$sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
+        $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
                 WHERE  ex.c_id = $courseId
                 AND ex.exe_exo_id = $exercise_id
                 AND status = ''
@@ -1870,11 +1870,11 @@ 
                 AND orig_lp_item_id = $lp_item_id";
         }
 
-    	$rs = Database::query($sql);
-    	$row = Database::fetch_row($rs);
-    	$count_attempts = $row[0];
+        $rs = Database::query($sql);
+        $row = Database::fetch_row($rs);
+        $count_attempts = $row[0];
 
-    	return $count_attempts;
+        return $count_attempts;
     }
 
     /**
@@ -1884,7 +1884,7 @@ 
      * @param int    $user_id
      * @param int    $courseId
      * @param int    $session_id
-    */
+     */
     public static function get_exercise_student_progress($exercise_list, $user_id, $courseId, $session_id)
     {
         $courseId = intval($courseId);
@@ -3500,8 +3500,8 @@ 
 
         $condition_session = '';
         if (isset($session_id)) {
-             $session_id = intval($session_id);
-             $condition_session = ' AND f.session_id = '. $session_id;
+                $session_id = intval($session_id);
+                $condition_session = ' AND f.session_id = '. $session_id;
         }
 
         $groupId = intval($groupId);
@@ -5400,9 +5400,9 @@ 
     }
 
     /**
-    * @param FormValidator $form
-    * @return mixed
-    */
+     * @param FormValidator $form
+     * @return mixed
+     */
     public static function setUserSearchForm($form)
     {
         global $_configuration;
@@ -5681,26 +5681,26 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
-    	$sql = "SELECT count(tool) AS total_number_of_items
+        $sql = "SELECT count(tool) AS total_number_of_items
     	        FROM $table_item_property track_resource, $table_user user
     	        WHERE
                     track_resource.c_id = $course_id AND
                     track_resource.insert_user_id = user.user_id AND
                     session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                     )";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -5712,10 +5712,10 @@ 
     	            'thematic_advance',
     	            'thematic_plan'
                 )";
-    	$res = Database::query($sql);
-    	$obj = Database::fetch_object($res);
+        $res = Database::query($sql);
+        $obj = Database::fetch_object($res);
 
-    	return $obj->total_number_of_items;
+        return $obj->total_number_of_items;
     }
 
     /**
@@ -5730,12 +5730,12 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
-    	$table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-    	$session_id = intval($session_id);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+        $session_id = intval($session_id);
 
-    	$sql = "SELECT
+        $sql = "SELECT
                     tool as col0,
                     lastedit_type as col1,
                     ref as ref,
@@ -5749,16 +5749,16 @@ 
                   track_resource.insert_user_id = user.user_id AND
                   session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                      ) ";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -5771,41 +5771,41 @@ 
     	            'thematic_plan'
                 )";
 
-    	if ($column == 0) {
-    		$column = '0';
-    	}
-    	if ($column != '' && $direction != '') {
-    		if ($column != 2 && $column != 4) {
-    			$sql .= " ORDER BY col$column $direction";
-    		}
-    	} else {
-    		$sql .= " ORDER BY col5 DESC ";
-    	}
+        if ($column == 0) {
+            $column = '0';
+        }
+        if ($column != '' && $direction != '') {
+            if ($column != 2 && $column != 4) {
+                $sql .= " ORDER BY col$column $direction";
+            }
+        } else {
+            $sql .= " ORDER BY col5 DESC ";
+        }
 
         $from = intval($from);
         $number_of_items = intval($number_of_items);
 
-    	$sql .= " LIMIT $from, $number_of_items ";
-
-    	$res = Database::query($sql);
-    	$resources = array();
-    	$thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
-    	while ($row = Database::fetch_array($res)) {
-    		$ref = $row['ref'];
-    		$table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
-    		$table_tool = Database :: get_course_table($table_name['table_name']);
-
-    		$id = $table_name['id_tool'];
-    		$recorset = false;
+        $sql .= " LIMIT $from, $number_of_items ";
 
-    		if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
-    			$tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
-    			$sql = "SELECT thematic_id FROM $table_tool
+        $res = Database::query($sql);
+        $resources = array();
+        $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
+        while ($row = Database::fetch_array($res)) {
+            $ref = $row['ref'];
+            $table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
+            $table_tool = Database :: get_course_table($table_name['table_name']);
+
+            $id = $table_name['id_tool'];
+            $recorset = false;
+
+            if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
+                $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
+                $sql = "SELECT thematic_id FROM $table_tool
     			        WHERE c_id = $course_id AND id = $ref";
-    			$rs_thematic  = Database::query($sql);
-    			if (Database::num_rows($rs_thematic)) {
-    				$row_thematic = Database::fetch_array($rs_thematic);
-    				$thematic_id = $row_thematic['thematic_id'];
+                $rs_thematic  = Database::query($sql);
+                if (Database::num_rows($rs_thematic)) {
+                    $row_thematic = Database::fetch_array($rs_thematic);
+                    $thematic_id = $row_thematic['thematic_id'];
 
                     $sql = "SELECT session.id, session.name, user.username
                             FROM $tbl_thematic t, $table_session session, $table_user user
@@ -5814,9 +5814,9 @@ 
                               t.session_id = session.id AND
                               session.id_coach = user.user_id AND
                               t.id = $thematic_id";
-    				$recorset = Database::query($sql);
-    			}
-    		} else {
+                    $recorset = Database::query($sql);
+                }
+            } else {
                 $sql = "SELECT session.id, session.name, user.username
                           FROM $table_tool tool, $table_session session, $table_user user
     			          WHERE
@@ -5824,127 +5824,127 @@ 
     			              tool.session_id = session.id AND
     			              session.id_coach = user.user_id AND
     			              tool.$id = $ref";
-    			$recorset = Database::query($sql);
-    		}
-
-    		if (!empty($recorset)) {
-    			$obj = Database::fetch_object($recorset);
-
-    			$name_session = '';
-    			$coach_name = '';
-    			if (!empty($obj)) {
-    				$name_session = $obj->name;
-    				$coach_name   = $obj->username;
-    			}
-
-    			$url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
-    			$row[0] = '';
-    			if ($row['col6'] != 2) {
-    				if (in_array($row['col0'], $thematic_tools)) {
-
-    					$exp_thematic_tool = explode('_', $row['col0']);
-    					$thematic_tool_title = '';
-    					if (is_array($exp_thematic_tool)) {
-    						foreach ($exp_thematic_tool as $exp) {
-    							$thematic_tool_title .= api_ucfirst($exp);
-    						}
-    					} else {
-    						$thematic_tool_title = api_ucfirst($row['col0']);
-    					}
-
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
-    				} else {
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
-    				}
-    			} else {
-    				$row[0] = api_ucfirst($row['col0']);
-    			}
-    			$row[1] = get_lang($row[1]);
-    			$row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
-    			$row[5] = '';
-    			//@todo Improve this code please
-    			switch ($table_name['table_name']) {
-    				case 'document' :
-    					$sql = "SELECT tool.title as title FROM $table_tool tool
+                $recorset = Database::query($sql);
+            }
+
+            if (!empty($recorset)) {
+                $obj = Database::fetch_object($recorset);
+
+                $name_session = '';
+                $coach_name = '';
+                if (!empty($obj)) {
+                    $name_session = $obj->name;
+                    $coach_name   = $obj->username;
+                }
+
+                $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
+                $row[0] = '';
+                if ($row['col6'] != 2) {
+                    if (in_array($row['col0'], $thematic_tools)) {
+
+                        $exp_thematic_tool = explode('_', $row['col0']);
+                        $thematic_tool_title = '';
+                        if (is_array($exp_thematic_tool)) {
+                            foreach ($exp_thematic_tool as $exp) {
+                                $thematic_tool_title .= api_ucfirst($exp);
+                            }
+                        } else {
+                            $thematic_tool_title = api_ucfirst($row['col0']);
+                        }
+
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
+                    } else {
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
+                    }
+                } else {
+                    $row[0] = api_ucfirst($row['col0']);
+                }
+                $row[1] = get_lang($row[1]);
+                $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
+                $row[5] = '';
+                //@todo Improve this code please
+                switch ($table_name['table_name']) {
+                    case 'document' :
+                        $sql = "SELECT tool.title as title FROM $table_tool tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
 
-    					break;
-    				case 'announcement':
+                        break;
+                    case 'announcement':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'glossary':
+                        break;
+                    case 'glossary':
                         $sql = "SELECT name FROM $table_tool
     					        WHERE c_id = $course_id AND glossary_id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->name;
                         }
-    					break;
-    				case 'lp':
+                        break;
+                    case 'lp':
                         $sql = "SELECT name
                                 FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->name;
-    					break;
-    				case 'quiz':
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->name;
+                        break;
+                    case 'quiz':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'course_description':
+                        break;
+                    case 'course_description':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'thematic':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-    					}
-    					break;
-    				case 'thematic_advance':
-    					$rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->content;
-    					}
-    					break;
-    				case 'thematic_plan':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-    					}
-    					break;
-    				default:
-    					break;
-    			}
-
-    			$row2 = $name_session;
-    			if (!empty($coach_name)) {
-    				$row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
-    			}
-    			$row[2] = $row2;
+                        break;
+                    case 'thematic':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+                    case 'thematic_advance':
+                        $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->content;
+                        }
+                        break;
+                    case 'thematic_plan':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                $row2 = $name_session;
+                if (!empty($coach_name)) {
+                    $row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
+                }
+                $row[2] = $row2;
                 if (!empty($row['col3'])) {
                     $userInfo = api_get_user_info($row['user_id']);
 
@@ -5961,11 +5961,11 @@ 
                     $row[4] = $ip;
                 }
 
-    			$resources[] = $row;
-    		}
-    	}
+                $resources[] = $row;
+            }
+        }
 
-    	return $resources;
+        return $resources;
     }
 
     /**
@@ -5975,63 +5975,63 @@ 
      */
     public static function get_tool_name_table($tool)
     {
-    	switch ($tool) {
-    		case 'document':
-    			$table_name = TABLE_DOCUMENT;
-    			$link_tool = 'document/document.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'learnpath':
-    			$table_name = TABLE_LP_MAIN;
-    			$link_tool = 'newscorm/lp_controller.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'quiz':
-    			$table_name = TABLE_QUIZ_TEST;
-    			$link_tool = 'exercice/exercice.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'glossary':
-    			$table_name = TABLE_GLOSSARY;
-    			$link_tool = 'glossary/index.php';
-    			$id_tool = 'glossary_id';
-    			break;
-    		case 'link':
-    			$table_name = TABLE_LINK;
-    			$link_tool = 'link/link.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'course_description':
-    			$table_name = TABLE_COURSE_DESCRIPTION;
-    			$link_tool = 'course_description/';
-    			$id_tool = 'id';
-    			break;
-    		case 'announcement':
-    			$table_name = TABLE_ANNOUNCEMENT;
-    			$link_tool = 'announcements/announcements.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic':
-    			$table_name = TABLE_THEMATIC;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_advance':
-    			$table_name = TABLE_THEMATIC_ADVANCE;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_plan':
-    			$table_name = TABLE_THEMATIC_PLAN;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		default:
-    			$table_name = $tool;
-    		break;
-    	}
-
-    	return array(
+        switch ($tool) {
+            case 'document':
+                $table_name = TABLE_DOCUMENT;
+                $link_tool = 'document/document.php';
+                $id_tool = 'id';
+                break;
+            case 'learnpath':
+                $table_name = TABLE_LP_MAIN;
+                $link_tool = 'newscorm/lp_controller.php';
+                $id_tool = 'id';
+                break;
+            case 'quiz':
+                $table_name = TABLE_QUIZ_TEST;
+                $link_tool = 'exercice/exercice.php';
+                $id_tool = 'id';
+                break;
+            case 'glossary':
+                $table_name = TABLE_GLOSSARY;
+                $link_tool = 'glossary/index.php';
+                $id_tool = 'glossary_id';
+                break;
+            case 'link':
+                $table_name = TABLE_LINK;
+                $link_tool = 'link/link.php';
+                $id_tool = 'id';
+                break;
+            case 'course_description':
+                $table_name = TABLE_COURSE_DESCRIPTION;
+                $link_tool = 'course_description/';
+                $id_tool = 'id';
+                break;
+            case 'announcement':
+                $table_name = TABLE_ANNOUNCEMENT;
+                $link_tool = 'announcements/announcements.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic':
+                $table_name = TABLE_THEMATIC;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_advance':
+                $table_name = TABLE_THEMATIC_ADVANCE;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_plan':
+                $table_name = TABLE_THEMATIC_PLAN;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            default:
+                $table_name = $tool;
+            break;
+        }
+
+        return array(
             'table_name' => $table_name,
             'link_tool' => $link_tool,
             'id_tool' => $id_tool
@@ -6040,45 +6040,45 @@ 
 
     public static function display_additional_profile_fields()
     {
-    	// getting all the extra profile fields that are defined by the platform administrator
-    	$extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
-
-    	// creating the form
-    	$return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
-
-    	// the select field with the additional user profile fields (= this is where we select the field of which we want to see
-    	// the information the users have entered or selected.
-    	$return .= '<select name="additional_profile_field">';
-    	$return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
-    	$extra_fields_to_show = 0;
-    	foreach ($extra_fields as $key=>$field) {
-    		// show only extra fields that are visible + and can be filtered, added by J.Montoya
-    		if ($field[6]==1 && $field[8] == 1) {
-    			if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
-    				$selected = 'selected="selected"';
-    			} else {
-    				$selected = '';
-    			}
-    			$extra_fields_to_show++;
-    			$return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
-    		}
-    	}
-    	$return .= '</select>';
-
-    	// the form elements for the $_GET parameters (because the form is passed through GET
-    	foreach ($_GET as $key=>$value){
-    		if ($key <> 'additional_profile_field')    {
-    			$return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
-    		}
-    	}
-    	// the submit button
-    	$return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
-    	$return .= '</form>';
-    	if ($extra_fields_to_show > 0) {
-    		return $return;
-    	} else {
-    		return '';
-    	}
+        // getting all the extra profile fields that are defined by the platform administrator
+        $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
+
+        // creating the form
+        $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
+
+        // the select field with the additional user profile fields (= this is where we select the field of which we want to see
+        // the information the users have entered or selected.
+        $return .= '<select name="additional_profile_field">';
+        $return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
+        $extra_fields_to_show = 0;
+        foreach ($extra_fields as $key=>$field) {
+            // show only extra fields that are visible + and can be filtered, added by J.Montoya
+            if ($field[6]==1 && $field[8] == 1) {
+                if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
+                    $selected = 'selected="selected"';
+                } else {
+                    $selected = '';
+                }
+                $extra_fields_to_show++;
+                $return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
+            }
+        }
+        $return .= '</select>';
+
+        // the form elements for the $_GET parameters (because the form is passed through GET
+        foreach ($_GET as $key=>$value){
+            if ($key <> 'additional_profile_field')    {
+                $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
+            }
+        }
+        // the submit button
+        $return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
+        $return .= '</form>';
+        if ($extra_fields_to_show > 0) {
+            return $return;
+        } else {
+            return '';
+        }
     }
 
     /**
@@ -6097,31 +6097,31 @@ 
      */
     public static function get_addtional_profile_information_of_field_by_user($field_id, $users)
     {
-    	// Database table definition
-    	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+        // Database table definition
+        $table_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
         $extraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-    	$result_extra_field = UserManager::get_extra_field_information($field_id);
-
-    	if (!empty($users)) {
-    		if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
-    			foreach($users as $user_id) {
-    				$user_result = UserManager::get_user_tags($user_id, $field_id);
-    				$tag_list = array();
-    				foreach($user_result as $item) {
-    					$tag_list[] = $item['tag'];
-    				}
-    				$return[$user_id][] = implode(', ',$tag_list);
-    			}
-    		} else {
-    			$new_user_array = array();
-    			foreach ($users as $user_id) {
-    				$new_user_array[]= "'".$user_id."'";
-    			}
-    			$users = implode(',',$new_user_array);
+        $result_extra_field = UserManager::get_extra_field_information($field_id);
+
+        if (!empty($users)) {
+            if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
+                foreach($users as $user_id) {
+                    $user_result = UserManager::get_user_tags($user_id, $field_id);
+                    $tag_list = array();
+                    foreach($user_result as $item) {
+                        $tag_list[] = $item['tag'];
+                    }
+                    $return[$user_id][] = implode(', ',$tag_list);
+                }
+            } else {
+                $new_user_array = array();
+                foreach ($users as $user_id) {
+                    $new_user_array[]= "'".$user_id."'";
+                }
+                $users = implode(',',$new_user_array);
                 $extraFieldType = EntityExtraField::USER_FIELD_TYPE;
-    			// Selecting only the necessary information NOT ALL the user list
-    			$sql = "SELECT user.user_id, v.value
+                // Selecting only the necessary information NOT ALL the user list
+                $sql = "SELECT user.user_id, v.value
     			        FROM $table_user user
     			        INNER JOIN $table_user_field_values v
                         ON (user.user_id = v.item_id)
@@ -6132,27 +6132,27 @@ 
                             v.field_id=".intval($field_id)." AND
                             user.user_id IN ($users)";
 
-    			$result = Database::query($sql);
-    			while($row = Database::fetch_array($result)) {
-    				// get option value for field type double select by id
-    				if (!empty($row['value'])) {
-    					if ($result_extra_field['field_type'] ==
+                $result = Database::query($sql);
+                while($row = Database::fetch_array($result)) {
+                    // get option value for field type double select by id
+                    if (!empty($row['value'])) {
+                        if ($result_extra_field['field_type'] ==
                             ExtraField::FIELD_TYPE_DOUBLE_SELECT
                         ) {
-    						$id_double_select = explode(';', $row['value']);
-    						if (is_array($id_double_select)) {
-    							$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
-    							$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
-    							$row['value'] = ($value1.';'.$value2);
-    						}
-    					}
-    				}
-    				// get other value from extra field
-    				$return[$row['user_id']][] = $row['value'];
-    			}
-    		}
-    	}
-    	return $return;
+                            $id_double_select = explode(';', $row['value']);
+                            if (is_array($id_double_select)) {
+                                $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+                                $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+                                $row['value'] = ($value1.';'.$value2);
+                            }
+                        }
+                    }
+                    // get other value from extra field
+                    $return[$row['user_id']][] = $row['value'];
+                }
+            }
+        }
+        return $return;
     }
 
     /**
@@ -6161,18 +6161,18 @@ 
      */
     public function count_student_in_course()
     {
-    	global $nbStudents;
-    	return $nbStudents;
+        global $nbStudents;
+        return $nbStudents;
     }
 
     public function sort_users($a, $b)
     {
-    	return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
+        return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
     }
 
     public function sort_users_desc($a, $b)
     {
-    	return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
+        return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
     }
 
     /**
@@ -6181,8 +6181,8 @@ 
      */
     public static function get_number_of_users()
     {
-    	global $user_ids;
-    	return count($user_ids);
+        global $user_ids;
+        return count($user_ids);
     }
 
     /**
@@ -6198,37 +6198,37 @@ 
     {
         global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id;
 
-    	$course_code = Database::escape_string($course_code);
-    	$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $course_code = Database::escape_string($course_code);
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-    	$access_url_id = api_get_current_access_url_id();
+        $access_url_id = api_get_current_access_url_id();
 
-    	// get all users data from a course for sortable with limit
-    	if (is_array($user_ids)) {
-    		$user_ids = array_map('intval', $user_ids);
-    		$condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
-    	} else {
-    		$user_ids = intval($user_ids);
-    		$condition_user = " WHERE user.user_id = $user_ids ";
-    	}
+        // get all users data from a course for sortable with limit
+        if (is_array($user_ids)) {
+            $user_ids = array_map('intval', $user_ids);
+            $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
+        } else {
+            $user_ids = intval($user_ids);
+            $condition_user = " WHERE user.user_id = $user_ids ";
+        }
 
-    	if (!empty($_GET['user_keyword'])) {
-    		$keyword = trim(Database::escape_string($_GET['user_keyword']));
-    		$condition_user .=  " AND (
+        if (!empty($_GET['user_keyword'])) {
+            $keyword = trim(Database::escape_string($_GET['user_keyword']));
+            $condition_user .=  " AND (
                 user.firstname LIKE '%".$keyword."%' OR
                 user.lastname LIKE '%".$keyword."%'  OR
                 user.username LIKE '%".$keyword."%'  OR
                 user.email LIKE '%".$keyword."%'
              ) ";
-    	}
+        }
 
         $url_table = null;
         $url_condition = null;
-    	if (api_is_multiple_url_enabled()) {
-    		$url_table = ", ".$tbl_url_rel_user." as url_users";
-    		$url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
-    	}
+        if (api_is_multiple_url_enabled()) {
+            $url_table = ", ".$tbl_url_rel_user." as url_users";
+            $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
+        }
 
         $invitedUsersCondition = '';
 
@@ -6236,7 +6236,7 @@ 
             $invitedUsersCondition = " AND user.status != " . INVITEE;
         }
 
-    	$sql = "SELECT  user.user_id as user_id,
+        $sql = "SELECT  user.user_id as user_id,
                     user.official_code  as col0,
                     user.lastname       as col1,
                     user.firstname      as col2,
@@ -6244,17 +6244,17 @@ 
                 FROM $tbl_user as user $url_table
     	        $condition_user $url_condition $invitedUsersCondition";
 
-    	if (!in_array($direction, array('ASC','DESC'))) {
-    		$direction = 'ASC';
-    	}
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
-    	$column = intval($column);
+        $column = intval($column);
 
-    	$from = intval($from);
-    	$number_of_items = intval($number_of_items);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
 
-    	$sql .= " ORDER BY col$column $direction ";
-    	$sql .= " LIMIT $from,$number_of_items";
+        $sql .= " ORDER BY col$column $direction ";
+        $sql .= " LIMIT $from,$number_of_items";
 
         $res = Database::query($sql);
         $users = array();
@@ -6288,7 +6288,7 @@ 
             }
         }
 
-    	while ($user = Database::fetch_array($res, 'ASSOC')) {
+        while ($user = Database::fetch_array($res, 'ASSOC')) {
             $courseInfo = api_get_course_info($course_code);
             $courseId = $courseInfo['real_id'];
 
@@ -6319,10 +6319,10 @@ 
                 $session_id
             );
 
-    		if (empty($avg_student_progress)) {
+            if (empty($avg_student_progress)) {
                 $avg_student_progress = 0;
-    		}
-    		$user['average_progress'] = $avg_student_progress.'%';
+            }
+            $user['average_progress'] = $avg_student_progress.'%';
 
             $total_user_exercise = Tracking::get_exercise_student_progress(
                 $total_exercises,
@@ -6342,11 +6342,11 @@ 
 
             $user['exercise_average_best_attempt'] = $total_user_exercise;
 
-    		if (is_numeric($avg_student_score)) {
-    			$user['student_score']  = $avg_student_score.'%';
-    		} else {
-    			$user['student_score']  = $avg_student_score;
-    		}
+            if (is_numeric($avg_student_score)) {
+                $user['student_score']  = $avg_student_score.'%';
+            } else {
+                $user['student_score']  = $avg_student_score;
+            }
 
             $user['count_assignments'] = Tracking::count_student_assignments(
                 $user['user_id'],
@@ -6369,29 +6369,29 @@ 
                 $session_id
             );
 
-    		// we need to display an additional profile field
-    		$user['additional'] = '';
+            // we need to display an additional profile field
+            $user['additional'] = '';
 
-    		if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
-    			if (isset($additional_user_profile_info[$user['user_id']]) &&
+            if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
+                if (isset($additional_user_profile_info[$user['user_id']]) &&
                     is_array($additional_user_profile_info[$user['user_id']])
                 ) {
-    				$user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
-    			}
-    		}
+                    $user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
+                }
+            }
 
             if (empty($session_id)) {
                 $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
             }
 
-    		$user['link'] = '<center>
+            $user['link'] = '<center>
                              <a href="../mySpace/myStudents.php?student='.$user['user_id'].'&details=true&course='.$course_code.'&origin=tracking_course&id_session='.$session_id.'">
     		                 '.Display::return_icon('2rightarrow.png').'
     		                 </a>
                          </center>';
 
-    		// store columns in array $users
-    		$is_western_name_order = api_is_western_name_order();
+            // store columns in array $users
+            $is_western_name_order = api_is_western_name_order();
             $user_row = array();
             $user_row[]= $user['official_code']; //0
             if ($is_western_name_order) {
@@ -6424,21 +6424,21 @@ 
 
             $users[] = $user_row;
 
-    		if ($export_csv) {
-    		    if (empty($session_id)) {
+            if ($export_csv) {
+                if (empty($session_id)) {
                     $user_row = array_map('strip_tags', $user_row);
-    			    unset($user_row[14]);
-    			    unset($user_row[15]);
+                    unset($user_row[14]);
+                    unset($user_row[15]);
                 } else {
                     $user_row = array_map('strip_tags', $user_row);
                     unset($user_row[13]);
                     unset($user_row[14]);
                 }
 
-    			$csv_content[] = $user_row;
-    		}
-    	}
-    	return $users;
+                $csv_content[] = $user_row;
+            }
+        }
+        return $users;
     }
 }
 
@@ -6456,18 +6456,18 @@ 
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-
-    	// protected data
-    	$user_id = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id = Database::escape_string($course_id);
-
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$tempView = $view;
-    	if(substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		echo "
+        $MonthsLong = $GLOBALS['MonthsLong'];
+
+        // protected data
+        $user_id = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id = Database::escape_string($course_id);
+
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $tempView = $view;
+        if(substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font>" .
@@ -6475,9 +6475,9 @@ 
                     </td>
                 </tr>
                 ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
 
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                         FROM $track_access_table
                         WHERE access_user_id = $user_id
                         AND c_id = $course_id
@@ -6485,11 +6485,11 @@ 
                         GROUP BY YEAR(access_date),MONTH(access_date)
                         ORDER BY YEAR(access_date),MONTH(access_date) ASC";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = getManyResults3Col($sql);
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = getManyResults3Col($sql);
 
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LoginsTitleMonthColumn')."
                     </td>
@@ -6497,36 +6497,36 @@ 
                     ".get_lang('LoginsTitleCountColumn')."
                     </td>
                 </tr>";
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
-    				echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
-    				echo"</tr>";
-    				$total = $total + $results[$j][1];
-    			}
-    			echo "<tr>";
-    			echo "<td>".get_lang('Total')."</td>";
-    			echo "<td align='right' class='content'>".$total."</td>";
-    			echo"</tr>";
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    		echo "
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
+                    echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
+                    echo"</tr>";
+                    $total = $total + $results[$j][1];
+                }
+                echo "<tr>";
+                echo "<td>".get_lang('Total')."</td>";
+                echo "<td align='right' class='content'>".$total."</td>";
+                echo"</tr>";
+            } else {
+                echo "<tr>";
+                echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".$user_id."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LoginsAndAccessTools')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6539,38 +6539,38 @@ 
      */
     public function display_exercise_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
+        global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
-    	if(substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		echo "<tr>
+        if(substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            echo "<tr>
                     <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('ExercicesResults')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
 
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = ".intval($user_id)."
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TBL_TRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '".intval($user_id)."' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
-    		echo "
+            echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
+            echo "
                 <tr bgcolor='#E6E6E6'>
                     <td>
                     ".get_lang('ExercicesTitleExerciceColumn')."
@@ -6583,28 +6583,28 @@ 
                     </td>
                 </tr>";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++) {
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				echo "<tr>\n";
-    				echo "<td class='content'>".$results[$i][0]."</td>\n";
-    				echo "<td class='content'>".$display_date."</td>\n";
-    				echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
-    				echo "</tr>\n";
-    			}
-    		} else {
-    			// istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-    				?>
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++) {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    echo "<tr>\n";
+                    echo "<td class='content'>".$results[$i][0]."</td>\n";
+                    echo "<td class='content'>".$display_date."</td>\n";
+                    echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
+                    echo "</tr>\n";
+                }
+            } else {
+                // istvan begin
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+                    ?>
                     <tr>
                         <td class="content"><?php echo $title; ?></td>
                         <td class="content" align="center"><?php echo $display_date; ?></td>
@@ -6614,26 +6614,26 @@ 
 
                     <?php
                 }
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			echo "<tr>\n";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
-    			echo "</tr>\n";
-    		}
-    		echo "</table>";
-    		echo "</td>\n</tr>\n";
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    		echo "
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                echo "<tr>\n";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
+                echo "</tr>\n";
+            }
+            echo "</table>";
+            echo "</td>\n</tr>\n";
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+            echo "
                 <tr>
                     <td valign='top'>
                         +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=$user_id&view=".$new_view."' class='specialLink'>".get_lang('ExercicesResults')."</a>
                     </td>
                 </tr>";
-    	}
+        }
     }
 
     /**
@@ -6642,27 +6642,27 @@ 
      */
     public function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info_by_id($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$new_view = substr_replace($view,'0',2,1);
-    		echo "<tr>
+        if (substr($view,2,1) == '1') {
+            $new_view = substr_replace($view,'0',2,1);
+            echo "<tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('WorkUploads')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
-    		$sql = "SELECT u.upload_date, w.title, w.author,w.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
+            $sql = "SELECT u.upload_date, w.title, w.author,w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE u.upload_work_id = w.id
                         AND u.upload_user_id = '".intval($user_id)."'
                         AND u.c_id = '".intval($course_id)."'
                     ORDER BY u.upload_date DESC";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine' width='40%'>
                     ".get_lang('WorkTitle')."
                     </td>
@@ -6673,35 +6673,35 @@ 
                     ".get_lang('Date')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				echo "<tr>";
-    				echo "<td class='content'>"
-    				."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
-    				."</td>";
-    				echo "<td class='content'>".$results[$j][2]."</td>";
-    				echo "<td class='content'>".$beautifulDate."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',2,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    echo "<tr>";
+                    echo "<td class='content'>"
+                    ."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
+                    ."</td>";
+                    echo "<td class='content'>".$results[$j][2]."</td>";
+                    echo "<td class='content'>".$beautifulDate."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',2,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('WorkUploads')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6710,55 +6710,55 @@ 
      */
     public function display_links_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		echo "
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            echo "
                 <tr>
                         <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('LinksAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00010'>".get_lang('ExportAsCSV')."</a>]
                         </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
-    		$sql = "SELECT cl.title, cl.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
+            $sql = "SELECT cl.title, cl.url
                     FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                     WHERE sl.links_link_id = cl.id
                         AND sl.c_id = $courseId
                         AND sl.links_user_id = ".intval($user_id)."
                     GROUP BY cl.title, cl.url";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults2Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LinksTitleLinkColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td ><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td ><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LinksAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6771,61 +6771,61 @@ 
      */
     public static function display_document_tracking_info($view, $user_id, $course_code, $session_id = 0)
     {
-    	// protect data
+        // protect data
         $user_id = intval($user_id);
         $courseId = api_get_course_int_id($course_code);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-    	if(substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		echo "
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        if(substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('DocumentsAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00001'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                     FROM $downloads_table
                     WHERE c_id = $courseId
                         AND down_user_id = $user_id
                         AND down_session_id = $session_id
                     GROUP BY down_doc_path";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults1Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('DocumentsTitleDocumentColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'>".$results[$j]."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'>".$results[$j]."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('DocumentsAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6882,43 +6882,43 @@ 
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-
-    	// protected data
-    	$user_id    = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id  = intval($course_id);
-
-    	$tempView = $view;
-    	if (substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		$title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+        $MonthsLong = $GLOBALS['MonthsLong'];
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+
+        // protected data
+        $user_id    = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id  = intval($course_id);
+
+        $tempView = $view;
+        if (substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                     FROM $track_access_table
                     WHERE access_user_id = $user_id
                     AND c_id = $course_id
                     AND access_session_id = $session_id
                     GROUP BY YEAR(access_date),MONTH(access_date)
                     ORDER BY YEAR(access_date),MONTH(access_date) ASC";
-    		//$results = getManyResults2Col($sql);
-    		$results = getManyResults3Col($sql);
-    		$title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
-    		$line='';
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0].';'.$results[$j][1]."\n";
-    				$total = $total + $results[$j][1];
-    			}
-    			$line .= get_lang('Total').";".$total."\n";
-    		} else {
-    			$line= get_lang('NoResult')."</center></td>";
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    	}
-    	return array($title_line, $line);
+            //$results = getManyResults2Col($sql);
+            $results = getManyResults3Col($sql);
+            $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
+            $line='';
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0].';'.$results[$j][1]."\n";
+                    $total = $total + $results[$j][1];
+                }
+                $line .= get_lang('Total').";".$total."\n";
+            } else {
+                $line= get_lang('NoResult')."</center></td>";
+            }
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -6931,67 +6931,67 @@ 
      */
     public function display_exercise_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
+        global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
-    	if (substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		$title[1] = get_lang('ExercicesDetails');
-    		$line = '';
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+        if (substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            $title[1] = get_lang('ExercicesDetails');
+            $line = '';
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = $userId
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TABLETRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '$userId' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		$title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++)
-    			{
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				$line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
-    			}
-    		} else {
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++)
+                {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
+                }
+            } else {
                 // istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-
-    				$line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
-    			}
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    	}
-    	return array($title_line, $line);
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+
+                    $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
+                }
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7000,37 +7000,37 @@ 
      */
     public function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info();
         $user_id = intval($user_id);
         $course_id = intval($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$sql = "SELECT u.upload_date, w.title, w.author, w.url
+        if (substr($view,2,1) == '1') {
+            $sql = "SELECT u.upload_date, w.title, w.author, w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE
                         u.upload_work_id = w.id AND
                         u.upload_user_id = '$user_id' AND
                         u.c_id = '$course_id'
                     ORDER BY u.upload_date DESC";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-
-    		$title[1]=get_lang('WorksDetails');
-    		$line='';
-    		$title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
-
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				$line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
-    			}
-
-    		} else {
-    			$line= get_lang('NoResult');
-    		}
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+
+            $title[1]=get_lang('WorksDetails');
+            $line='';
+            $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
+
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
+                }
+
+            } else {
+                $line= get_lang('NoResult');
+            }
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7039,32 +7039,32 @@ 
      */
     public function display_links_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
         $line = null;
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		$title[1]=get_lang('LinksDetails');
-    		$sql = "SELECT cl.title, cl.url
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            $title[1]=get_lang('LinksDetails');
+            $sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
                             AND sl.c_id = $courseId
                             AND sl.links_user_id = $userId
                         GROUP BY cl.title, cl.url";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		$title_line= get_lang('LinksTitleLinkColumn')."\n";
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0]."\n";
-    			}
-    		} else {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResults2Col($sql);
+            $title_line= get_lang('LinksTitleLinkColumn')."\n";
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0]."\n";
+                }
+            } else {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7077,38 +7077,38 @@ 
      */
     public function display_document_tracking_info($view, $user_id, $courseCode, $session_id = 0)
     {
-    	// protect data
-    	$user_id     = intval($user_id);
+        // protect data
+        $user_id     = intval($user_id);
         $courseId = api_get_course_int_id($courseCode);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 
-    	if (substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		$title[1]= get_lang('DocumentsDetails');
+        if (substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            $title[1]= get_lang('DocumentsDetails');
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                         FROM $downloads_table
                         WHERE c_id = $courseId
                             AND down_user_id = $user_id
                             AND down_session_id = $session_id
                         GROUP BY down_doc_path";
 
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		$title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
+            $results = StatsUtils::getManyResults1Col($sql);
+            $title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
             $line = null;
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j]."\n";
-    			}
-    		} else {
-    			$line = get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    	}
-    	return array($title_line, $line);
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j]."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+        }
+        return array($title_line, $line);
     }
 
     /**

main/inc/lib/document.lib.php

Spacing +335 added lines, -335 removed lines

@@ -290,7 +290,7 @@ 
             return true;
         } else {
             $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
-            $tbl_item_property = $this_course . 'item_property';
+            $tbl_item_property = $this_course.'item_property';
             $doc_url = Database::escape_string($doc_url);
             $query = "SELECT 1 FROM $tbl_document AS docs,$tbl_item_property AS props
                       WHERE
@@ -340,18 +340,18 @@ 
             }
 
             header('Content-type: application/octet-stream');
-            header('Content-length: ' . $len);
+            header('Content-length: '.$len);
             if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-                header('Content-Disposition: filename= ' . $filename);
+                header('Content-Disposition: filename= '.$filename);
             } else {
-                header('Content-Disposition: attachment; filename= ' . $filename);
+                header('Content-Disposition: attachment; filename= '.$filename);
             }
             if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
                 header('Pragma: ');
                 header('Cache-Control: ');
                 header('Cache-Control: public'); // IE cannot download from sessions without a cache
             }
-            header('Content-Description: ' . $filename);
+            header('Content-Description: '.$filename);
             header('Content-Transfer-Encoding: binary');
 
             $res = fopen($full_file_name, 'r');
@@ -365,7 +365,7 @@ 
             $lpFixedEncoding = api_get_configuration_value('lp_fixed_encoding');
 
             header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
             // Commented to avoid double caching declaration when playing with IE and HTTPS
             //header('Cache-Control: no-cache, must-revalidate');
             //header('Pragma: no-cache');
@@ -376,7 +376,7 @@ 
                     } else {
                         $encoding = @api_detect_encoding_html(file_get_contents($full_file_name));
                         if (!empty($encoding)) {
-                            $content_type .= '; charset=' . $encoding;
+                            $content_type .= '; charset='.$encoding;
                         }
                     }
                     break;
@@ -386,7 +386,7 @@ 
                     } else {
                         $encoding = @api_detect_encoding(strip_tags(file_get_contents($full_file_name)));
                         if (!empty($encoding)) {
-                            $content_type .= '; charset=' . $encoding;
+                            $content_type .= '; charset='.$encoding;
                         }
                     }
                     break;
@@ -395,13 +395,13 @@ 
                     header('Content-type: application/octet-stream');
                     break;
             }
-            header('Content-type: ' . $content_type);
-            header('Content-Length: ' . $len);
+            header('Content-type: '.$content_type);
+            header('Content-Length: '.$len);
             $user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
             if (strpos($user_agent, 'msie')) {
-                header('Content-Disposition: ; filename= ' . $filename);
+                header('Content-Disposition: ; filename= '.$filename);
             } else {
-                header('Content-Disposition: inline; filename= ' . $filename);
+                header('Content-Disposition: inline; filename= '.$filename);
             }
 
             if ($fixLinksHttpToHttps) {
@@ -442,18 +442,18 @@ 
 
             header('Content-type: application/octet-stream');
             //header('Content-Type: application/force-download');
-            header('Content-length: ' . $len);
+            header('Content-length: '.$len);
             if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-                header('Content-Disposition: filename= ' . $filename);
+                header('Content-Disposition: filename= '.$filename);
             } else {
-                header('Content-Disposition: attachment; filename= ' . $filename);
+                header('Content-Disposition: attachment; filename= '.$filename);
             }
             if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
                 header('Pragma: ');
                 header('Cache-Control: ');
                 header('Cache-Control: public'); // IE cannot download from sessions without a cache
             }
-            header('Content-Description: ' . $filename);
+            header('Content-Description: '.$filename);
             header('Content-transfer-encoding: binary');
             echo $full_string;
 
@@ -466,30 +466,30 @@ 
 
             $content_type = self::file_get_mime_type($filename);
             header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
             header('Cache-Control: no-cache, must-revalidate');
             header('Pragma: no-cache');
             switch ($content_type) {
                 case 'text/html':
                     $encoding = @api_detect_encoding_html($full_string);
                     if (!empty($encoding)) {
-                        $content_type .= '; charset=' . $encoding;
+                        $content_type .= '; charset='.$encoding;
                     }
                     break;
                 case 'text/plain':
                     $encoding = @api_detect_encoding(strip_tags($full_string));
                     if (!empty($encoding)) {
-                        $content_type .= '; charset=' . $encoding;
+                        $content_type .= '; charset='.$encoding;
                     }
                     break;
             }
-            header('Content-type: ' . $content_type);
-            header('Content-Length: ' . $len);
+            header('Content-type: '.$content_type);
+            header('Content-Length: '.$len);
             $user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
             if (strpos($user_agent, 'msie')) {
-                header('Content-Disposition: ; filename= ' . $filename);
+                header('Content-Disposition: ; filename= '.$filename);
             } else {
-                header('Content-Disposition: inline; filename= ' . $filename);
+                header('Content-Disposition: inline; filename= '.$filename);
             }
             echo($full_string);
             //You have to ensure that the calling script then stops processing (exit();)
@@ -582,9 +582,9 @@ 
             if (!empty($students)) {
                 $conditionList = array();
                 foreach ($students as $studentId => $studentInfo) {
-                    $conditionList[] = '/shared_folder/sf_user_' . $studentInfo['user_id'];
+                    $conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
                 }
-                $sharedCondition .= ' AND docs.path IN ("' . implode('","', $conditionList) . '")';
+                $sharedCondition .= ' AND docs.path IN ("'.implode('","', $conditionList).'")';
             }
         }
 
@@ -610,8 +610,8 @@ 
                     last.c_id = {$_course['real_id']}
                 )
                 WHERE
-                    docs.path LIKE '" . Database::escape_string($path . $added_slash.'%'). "' AND
-                    docs.path NOT LIKE '" . Database::escape_string($path . $added_slash.'%/%')."' AND
+                    docs.path LIKE '".Database::escape_string($path.$added_slash.'%')."' AND
+                    docs.path NOT LIKE '" . Database::escape_string($path.$added_slash.'%/%')."' AND
                     docs.path NOT LIKE '%_DELETED_%' AND
                     $userGroupFilter AND
                     last.visibility $visibility_bit
@@ -652,7 +652,7 @@ 
                     $table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES);
                     $sql = "SELECT id FROM $table_template
                             WHERE
-                                course_code = '" . $_course['code'] . "' AND
+                                course_code = '".$_course['code']."' AND
                                 user_id = '".api_get_user_id()."' AND
                                 ref_doc = '".$row['id']."'";
                     $template_result = Database::query($sql);
@@ -762,7 +762,7 @@ 
         if (!empty($students)) {
             $conditionList = array();
             foreach ($students as $studentId => $studentInfo) {
-                $conditionList[] = '/shared_folder/sf_user_' . $studentInfo['user_id'];
+                $conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
             }
         }
 
@@ -786,7 +786,7 @@ 
                        INNER JOIN $TABLE_DOCUMENT  AS docs
                        ON (
                             docs.id = last.ref AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '".TOOL_DOCUMENT."' AND
                             last.c_id = {$_course['real_id']} AND
                             docs.c_id = {$_course['real_id']}
                        )
@@ -803,7 +803,7 @@ 
                         INNER JOIN $TABLE_DOCUMENT  AS docs
                         ON (
                             docs.id = last.ref AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '".TOOL_DOCUMENT."' AND
                             last.c_id = {$_course['real_id']} AND
                             docs.c_id = {$_course['real_id']}
                         )
@@ -850,7 +850,7 @@ 
                     WHERE
                         docs.id = last.ref AND
                         docs.filetype = 'folder' AND
-                        last.tool = '" . TOOL_DOCUMENT . "' AND
+                        last.tool = '".TOOL_DOCUMENT."' AND
                         $groupCondition AND
                         last.visibility = 1
                         $condition_session AND
@@ -871,7 +871,7 @@ 
                     WHERE
                         docs.id = last.ref AND
                         docs.filetype = 'folder' AND
-                        last.tool = '" . TOOL_DOCUMENT . "' AND
+                        last.tool = '".TOOL_DOCUMENT."' AND
                         $groupCondition AND
                         last.visibility = 0 $condition_session AND
                         last.c_id = {$_course['real_id']} AND
@@ -887,9 +887,9 @@ 
                         FROM $TABLE_ITEMPROPERTY AS last, $TABLE_DOCUMENT AS docs
                         WHERE
                             docs.id = last.ref AND
-                            docs.path LIKE '" . Database::escape_string($row['path'].'/%') . "' AND
+                            docs.path LIKE '".Database::escape_string($row['path'].'/%')."' AND
                             docs.filetype = 'folder' AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '" . TOOL_DOCUMENT."' AND
                             $groupCondition AND
                             last.visibility = 1 $condition_session AND
                             last.c_id = {$_course['real_id']} AND
@@ -966,7 +966,7 @@ 
                                 tp.c_id = $course_id AND
                                 td.session_id = $sessionId AND
                                 tp.ref= td.id AND
-                                (path='" . $path . "' OR path LIKE BINARY '" . $path . "/%' ) ";
+                                (path='".$path."' OR path LIKE BINARY '".$path."/%' ) ";
                     // Get all id's of documents that are deleted
                     $what_to_check_result = Database::query($sql);
 
@@ -1308,7 +1308,7 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $row2 = Database::fetch_array($res);
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
                 $di->remove_document((int) $row2['search_did']);
             }
@@ -1317,7 +1317,7 @@ 
             Database::query($sql);
 
             // remove terms from db
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $document_id);
         }
     }
@@ -1406,12 +1406,12 @@ 
             $path = str_replace('%2F', '/', $url_path);
             $pathinfo = pathinfo($row['path']);
 
-            $row['url'] = api_get_path(WEB_CODE_PATH) . 'document/showinframes.php?cidReq=' . $course_code . '&id=' . $id;
-            $row['document_url'] = api_get_path(WEB_CODE_PATH) . 'document/document.php?cidReq=' . $course_code . '&id=' . $id;
-            $row['absolute_path'] = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document' . $row['path'];
-            $row['absolute_path_from_document'] = '/document' . $row['path'];
-            $row['absolute_parent_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$pathinfo['dirname'] . '/';
-            $row['direct_url'] = $www . $path;
+            $row['url'] = api_get_path(WEB_CODE_PATH).'document/showinframes.php?cidReq='.$course_code.'&id='.$id;
+            $row['document_url'] = api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.$course_code.'&id='.$id;
+            $row['absolute_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$row['path'];
+            $row['absolute_path_from_document'] = '/document'.$row['path'];
+            $row['absolute_parent_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$pathinfo['dirname'].'/';
+            $row['direct_url'] = $www.$path;
 
             if (dirname($row['path']) == '.') {
                 $row['parent_id'] = '0';
@@ -1430,7 +1430,7 @@ 
                 $real_dir = '';
 
                 for ($i = 1; $i < $array_len; $i++) {
-                    $real_dir .= '/' . $dir_array[$i];
+                    $real_dir .= '/'.$dir_array[$i];
                     $parent_id = self::get_document_id($course_info, $real_dir);
                     if ($session_id != 0 && empty($parent_id)) {
                         $parent_id = self::get_document_id($course_info, $real_dir, 0);
@@ -1504,21 +1504,21 @@ 
         $user_id = intval($user_id);
         $document_id = intval($document_id);
 
-        $sql = 'SELECT id FROM ' . $table_template . '
+        $sql = 'SELECT id FROM '.$table_template.'
                 WHERE
-                    course_code="' . $course_code . '" AND
-                    user_id="' . $user_id . '" AND
-                    ref_doc="' . $document_id . '"';
+                    course_code="' . $course_code.'" AND
+                    user_id="' . $user_id.'" AND
+                    ref_doc="' . $document_id.'"';
         $result = Database::query($sql);
         $template_id = Database::result($result, 0, 0);
 
-        my_delete(api_get_path(SYS_CODE_PATH) . 'upload/template_thumbnails/' . $template_id . '.jpg');
+        my_delete(api_get_path(SYS_CODE_PATH).'upload/template_thumbnails/'.$template_id.'.jpg');
 
-        $sql = 'DELETE FROM ' . $table_template . '
+        $sql = 'DELETE FROM '.$table_template.'
                 WHERE
-                    course_code="' . $course_code . '" AND
-                    user_id="' . $user_id . '" AND
-                    ref_doc="' . $document_id . '"';
+                    course_code="' . $course_code.'" AND
+                    user_id="' . $user_id.'" AND
+                    ref_doc="' . $document_id.'"';
 
         Database::query($sql);
     }
@@ -1578,9 +1578,9 @@ 
                 INNER JOIN $propTable ip
                 ON (d.id = ip.ref AND d.c_id  = $course_id AND ip.c_id = $course_id)
         		WHERE
-        		    ip.tool = '" . TOOL_DOCUMENT . "' $condition AND
+        		    ip.tool = '".TOOL_DOCUMENT."' $condition AND
         			filetype = '$file_type' AND
-        			locate(concat(path,'/'), '" . Database::escape_string($doc_path.'/'). "')=1
+        			locate(concat(path,'/'), '".Database::escape_string($doc_path.'/')."')=1
                 ";
 
         $result = Database::query($sql);
@@ -1743,12 +1743,12 @@ 
         if (empty($session_id)) {
             $sql_session = 'AND (session_id = 0 OR isnull(session_id)) ';
         } elseif ($session_id > 0) {
-            $sql_session = 'AND session_id=' . intval($session_id);
+            $sql_session = 'AND session_id='.intval($session_id);
         } else {
             $sql_session = '';
         }
-        $sql = 'UPDATE ' . $tbl_category . ' SET document_id="' . intval($document_id) . '"
-                WHERE course_code="' . Database::escape_string($course_id) . '" ' . $sql_session;
+        $sql = 'UPDATE '.$tbl_category.' SET document_id="'.intval($document_id).'"
+                WHERE course_code="' . Database::escape_string($course_id).'" '.$sql_session;
         Database::query($sql);
     }
 
@@ -1770,12 +1770,12 @@ 
         if (empty($session_id)) {
             $sql_session = 'AND (session_id = 0 OR isnull(session_id)) ';
         } elseif ($session_id > 0) {
-            $sql_session = 'AND session_id=' . intval($session_id);
+            $sql_session = 'AND session_id='.intval($session_id);
         } else {
             $sql_session = '';
         }
-        $sql = 'SELECT document_id FROM ' . $tbl_category . '
-                WHERE course_code="' . Database::escape_string($course_id) . '" ' . $sql_session;
+        $sql = 'SELECT document_id FROM '.$tbl_category.'
+                WHERE course_code="' . Database::escape_string($course_id).'" '.$sql_session;
 
         $rs = Database::query($sql);
         $num = Database::num_rows($rs);
@@ -1816,7 +1816,7 @@ 
             $all_user_info = array();
             if (Database::num_rows($rs)) {
                 $row = Database::fetch_array($rs);
-                $filepath = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document' . $row['path'];
+                $filepath = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$row['path'];
                 if (is_file($filepath)) {
                     $my_content_html = file_get_contents($filepath);
                 }
@@ -1899,7 +1899,7 @@ 
             $date_no_time = api_convert_and_format_date(api_get_utc_datetime(), DATE_FORMAT_LONG_NO_DAY);
         }
 
-        $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $info_grade_certificate['id'];
+        $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$info_grade_certificate['id'];
 
         //replace content
         $info_to_replace_in_content_html = array(
@@ -1916,7 +1916,7 @@ 
             $course_info['name'],
             $info_grade_certificate['grade'],
             $url,
-            '<a href="' . $url . '" target="_blank">' . get_lang('CertificateOnlineLink') . '</a>',
+            '<a href="'.$url.'" target="_blank">'.get_lang('CertificateOnlineLink').'</a>',
             '((certificate_barcode))',
         );
 
@@ -1940,7 +1940,7 @@ 
         if (!empty($extraFields)) {
             foreach ($extraFields as $extraField) {
                 $valueExtra = isset($extra_user_info_data[$extraField['variable']]) ? $extra_user_info_data[$extraField['variable']] : '';
-                $info_to_be_replaced_in_content_html[] = '((' . strtolower($extraField['variable']) . '))';
+                $info_to_be_replaced_in_content_html[] = '(('.strtolower($extraField['variable']).'))';
                 $info_to_replace_in_content_html[] = $valueExtra;
             }
         }
@@ -1968,17 +1968,17 @@ 
             $tbl_category = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
             $session_id = api_get_session_id();
             if ($session_id == 0 || is_null($session_id)) {
-                $sql_session = 'AND (session_id=' . intval($session_id) . ' OR isnull(session_id)) ';
+                $sql_session = 'AND (session_id='.intval($session_id).' OR isnull(session_id)) ';
             } elseif ($session_id > 0) {
-                $sql_session = 'AND session_id=' . intval($session_id);
+                $sql_session = 'AND session_id='.intval($session_id);
             } else {
                 $sql_session = '';
             }
 
-            $sql = 'UPDATE ' . $tbl_category . ' SET document_id=null
+            $sql = 'UPDATE '.$tbl_category.' SET document_id=null
                     WHERE
-                        course_code = "' . Database::escape_string($course_id) . '" AND
-                        document_id="' . $default_certificate_id . '" ' . $sql_session;
+                        course_code = "' . Database::escape_string($course_id).'" AND
+                        document_id="' . $default_certificate_id.'" '.$sql_session;
             Database::query($sql);
         }
     }
@@ -1994,10 +1994,10 @@ 
         if (!empty($courseInfo)) {
             $to_group_id = 0;
             $to_user_id = null;
-            $course_dir = $courseInfo['path'] . "/document/";
+            $course_dir = $courseInfo['path']."/document/";
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $base_work_dir = $sys_course_path . $course_dir;
-            $base_work_dir_test = $base_work_dir . 'certificates';
+            $base_work_dir = $sys_course_path.$course_dir;
+            $base_work_dir_test = $base_work_dir.'certificates';
             $dir_name = '/certificates';
             $post_dir_name = get_lang('CertificatesFiles');
             $visibility_command = 'invisible';
@@ -2224,9 +2224,9 @@ 
                                             //$new_abs_path = realpath($dir.'/'.$second_part);
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $second_part);
+                                            $new_abs_path = realpath($dir.$second_part);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2239,9 +2239,9 @@ 
                                             $files_list[] = array($second_part, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $second_part);
+                                            $new_abs_path = realpath($dir.$second_part);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2275,9 +2275,9 @@ 
                                             $files_list[] = array($source, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $source);
+                                            $new_abs_path = realpath($dir.$source);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2290,9 +2290,9 @@ 
                                             $files_list[] = array($source, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $source);
+                                            $new_abs_path = realpath($dir.$source);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2326,9 +2326,9 @@ 
                                     $files_list[] = array($source, 'local', 'rel');
                                     $dir = '';
                                     if (!empty($abs_path)) {
-                                        $dir = dirname($abs_path) . '/';
+                                        $dir = dirname($abs_path).'/';
                                     }
-                                    $new_abs_path = realpath($dir . $source);
+                                    $new_abs_path = realpath($dir.$source);
                                     $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                     if (count($in_files_list) > 0) {
                                         $files_list = array_merge($files_list, $in_files_list);
@@ -2341,9 +2341,9 @@ 
                                     $files_list[] = array($source, 'local', 'rel');
                                     $dir = '';
                                     if (!empty($abs_path)) {
-                                        $dir = dirname($abs_path) . '/';
+                                        $dir = dirname($abs_path).'/';
                                     }
-                                    $new_abs_path = realpath($dir . $source);
+                                    $new_abs_path = realpath($dir.$source);
                                     $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                     if (count($in_files_list) > 0) {
                                         $files_list = array_merge($files_list, $in_files_list);
@@ -2401,24 +2401,24 @@ 
             // then possible closing brackets if we were in the opening bracket case
             // OR something like @import()
             $res = preg_match_all(
-                '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]*))' .
+                '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]*))'.
                 // '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]|[^\x00-\x7F])*)' . -> seems to be taking too much
                 // '/(((([A-Za-z_:])([^\x00-\x7F])*)' . -> takes only last letter of parameter name
-                '([ \n\t\r]+)?(' .
+                '([ \n\t\r]+)?('.
                 // '(=([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+))' . -> doesn't restrict close enough to the url itself
-                '(=([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+))' .
-                '|' .
+                '(=([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+))'.
+                '|'.
                 // '(\(([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)\))' . -> doesn't restrict close enough to the url itself
-                '(\(([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+)\))' .
-                '))' .
-                '|' .
+                '(\(([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+)\))'.
+                '))'.
+                '|'.
                 // '(@import([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)))?/', -> takes a lot (like 100's of thousands of empty possibilities)
                 '(@import([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)))/',
                 $attrString,
                 $regs
             );
         } catch (Exception $e) {
-            error_log('Caught exception: ' . $e->getMessage(), 0);
+            error_log('Caught exception: '.$e->getMessage(), 0);
         }
         if ($res) {
             for ($i = 0; $i < count($regs[1]); $i++) {
@@ -2496,14 +2496,14 @@ 
                 $orig_course_info_path = $origin_course_info_path;
             }
         } else {
-            $orig_course_path = api_get_path(SYS_COURSE_PATH).$orig_course_info['path'] . '/';
+            $orig_course_path = api_get_path(SYS_COURSE_PATH).$orig_course_info['path'].'/';
             $orig_course_info_path = $orig_course_info['path'];
         }
 
         $destination_course_code = CourseManager::get_course_id_from_path($destination_course_directory);
         $destination_course_info = api_get_course_info($destination_course_code);
-        $dest_course_path = api_get_path(SYS_COURSE_PATH) . $destination_course_directory . '/';
-        $dest_course_path_rel = api_get_path(REL_COURSE_PATH) . $destination_course_directory . '/';
+        $dest_course_path = api_get_path(SYS_COURSE_PATH).$destination_course_directory.'/';
+        $dest_course_path_rel = api_get_path(REL_COURSE_PATH).$destination_course_directory.'/';
 
         $user_id = api_get_user_id();
 
@@ -2512,7 +2512,7 @@ 
 
                 // Get information about source url
                 $real_orig_url = $source[0]; // url
-                $scope_url = $source[1];   // scope (local, remote)
+                $scope_url = $source[1]; // scope (local, remote)
                 $type_url = $source[2]; // type (rel, abs, url)
 
                 // Get path and query from origin url
@@ -2524,7 +2524,7 @@ 
                 $dest_url_query = '';
 
                 if (!empty($real_orig_query)) {
-                    $dest_url_query = '?' . $real_orig_query;
+                    $dest_url_query = '?'.$real_orig_query;
                     if (strpos($dest_url_query, $origin_course_code) !== false) {
                         $dest_url_query = str_replace($origin_course_code, $destination_course_code, $dest_url_query);
                     }
@@ -2605,7 +2605,7 @@ 
 
                                 //$destination_url = $url_course_path . $destination_course_directory . '/' . $document_file . $dest_url_query;
                                 // See BT#7780
-                                $destination_url = $dest_course_path_rel . $document_file . $dest_url_query;
+                                $destination_url = $dest_course_path_rel.$document_file.$dest_url_query;
 
                                 // If the course code doesn't exist in the path? what we do? Nothing! see BT#1985
                                 if (strpos($real_orig_path, $origin_course_code) === false) {
@@ -2640,14 +2640,14 @@ 
     function replace_urls_inside_content_html_when_moving_file($file_name, $original_path, $destiny_path)
     {
         if (substr($original_path, strlen($original_path) - 1, strlen($original_path)) == '/') {
-            $original = $original_path . $file_name;
+            $original = $original_path.$file_name;
         } else {
-            $original = $original_path . '/' . $file_name;
+            $original = $original_path.'/'.$file_name;
         }
         if (substr($destiny_path, strlen($destiny_path) - 1, strlen($destiny_path)) == '/') {
-            $destination = $destiny_path . $file_name;
+            $destination = $destiny_path.$file_name;
         } else {
-            $destination = $destiny_path . '/' . $file_name;
+            $destination = $destiny_path.'/'.$file_name;
         }
         $original_count = count(explode('/', $original));
         $destination_count = count(explode('/', $destination));
@@ -2661,8 +2661,8 @@ 
             $mode = 'inside';
         }
         //We do not select the $original_path becayse the file was already moved
-        $content_html = file_get_contents($destiny_path . '/' . $file_name);
-        $destination_file = $destiny_path . '/' . $file_name;
+        $content_html = file_get_contents($destiny_path.'/'.$file_name);
+        $destination_file = $destiny_path.'/'.$file_name;
 
         $pre_original = strstr($original_path, 'document');
         $pre_destin = strstr($destiny_path, 'document');
@@ -2684,11 +2684,11 @@ 
         }
 
         if ($pre_original != '') {
-            $pre_original = '..' . $pre_original . '/';
+            $pre_original = '..'.$pre_original.'/';
         }
 
         if ($pre_destin != '') {
-            $pre_destin = '..' . $pre_destin . '/';
+            $pre_destin = '..'.$pre_destin.'/';
         }
 
         $levels = explode('/', $pre_original);
@@ -2706,7 +2706,7 @@ 
         //echo '$count_pre_destination_levels '. $count_pre_destination_levels;
         $pre_remove = '';
         for ($i = 1; $i <= $count_pre_destination_levels; $i++) {
-            $pre_remove .='..\/';
+            $pre_remove .= '..\/';
         }
 
         $orig_source_html = DocumentManager::get_resources_from_source_html($content_html);
@@ -2714,9 +2714,9 @@ 
         foreach ($orig_source_html as $source) {
 
             // get information about source url
-            $real_orig_url = $source[0];   // url
-            $scope_url = $source[1];   // scope (local, remote)
-            $type_url = $source[2];   // tyle (rel, abs, url)
+            $real_orig_url = $source[0]; // url
+            $scope_url = $source[1]; // scope (local, remote)
+            $type_url = $source[2]; // tyle (rel, abs, url)
             // Get path and query from origin url
             $orig_parse_url = parse_url($real_orig_url);
             $real_orig_path = $orig_parse_url['path'];
@@ -2743,11 +2743,11 @@ 
                         $real_orig_url_temp = '';
                         if ($mode == 'inside') {
                             $real_orig_url_temp = str_replace('../', '', $real_orig_url);
-                            $destination_url = $link_to_add . $real_orig_url_temp;
+                            $destination_url = $link_to_add.$real_orig_url_temp;
                         } else {
                             $real_orig_url_temp = $real_orig_url;
 
-                            $destination_url = preg_replace("/" . $pre_remove . "/", '', $real_orig_url, 1);
+                            $destination_url = preg_replace("/".$pre_remove."/", '', $real_orig_url, 1);
                         }
                         if ($real_orig_url == $destination_url) {
                             //echo 'continue2';
@@ -2773,7 +2773,7 @@ 
     {
         $course_data = api_get_course_info($course_code);
         $document_data = self::get_document_data_by_id($document_id, $course_code);
-        $file_path = api_get_path(SYS_COURSE_PATH) . $course_data['path'] . '/document' . $document_data['path'];
+        $file_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document'.$document_data['path'];
         $pdf = new PDF('A4-L', 'L');
         $pdf->html_to_pdf($file_path, $document_data['title'], $course_code);
     }
@@ -2804,9 +2804,9 @@ 
     ) {
         $course_info = api_get_course_info();
         $sessionId = api_get_session_id();
-        $course_dir = $course_info['path'] . '/document';
+        $course_dir = $course_info['path'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         if (isset($files[$fileKey])) {
             $upload_ok = process_uploaded_file($files[$fileKey], $show_output);
@@ -2878,7 +2878,7 @@ 
                     // Showing message when sending zip files
                     if ($new_path === true && $unzip == 1 && $show_output) {
                         Display::display_confirmation_message(
-                            get_lang('UplUploadSucceeded') . '<br />',
+                            get_lang('UplUploadSucceeded').'<br />',
                             false
                         );
                     }
@@ -2980,7 +2980,7 @@ 
         }
         if (isset($output)) {
             foreach ($output as & $line) {
-                $content .= $line . "\n";
+                $content .= $line."\n";
             }
             return $content;
         } else {
@@ -3012,13 +3012,13 @@ 
         $group_condition = null;
         if (isset($group_id)) {
             $group_id = intval($group_id);
-            $group_condition = " AND props.to_group_id='" . $group_id . "' ";
+            $group_condition = " AND props.to_group_id='".$group_id."' ";
         }
 
         $session_condition = null;
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $session_condition = " AND props.session_id='" . $session_id . "' ";
+            $session_condition = " AND props.session_id='".$session_id."' ";
         }
 
         $sql = "SELECT SUM(size)
@@ -3028,7 +3028,7 @@ 
                 WHERE
                     props.c_id 	= $course_id AND
                     docs.c_id 	= $course_id AND
-                    props.tool 	= '" . TOOL_DOCUMENT . "' AND
+                    props.tool 	= '".TOOL_DOCUMENT."' AND
                     props.visibility <> 2
                     $group_condition
                     $session_condition
@@ -3051,8 +3051,8 @@ 
         $course_quota_m = round($course_quota / 1048576);
         $already_consumed_space_m = round($already_consumed_space / 1048576);
 
-        $message = get_lang('MaximumAllowedQuota') . ' <strong>' . $course_quota_m . ' megabyte</strong>.<br />';
-        $message .= get_lang('CourseCurrentlyUses') . ' <strong>' . $already_consumed_space_m . ' megabyte</strong>.<br />';
+        $message = get_lang('MaximumAllowedQuota').' <strong>'.$course_quota_m.' megabyte</strong>.<br />';
+        $message .= get_lang('CourseCurrentlyUses').' <strong>'.$already_consumed_space_m.' megabyte</strong>.<br />';
 
         $percentage = round(($already_consumed_space / $course_quota * 100), 1);
 
@@ -3060,33 +3060,33 @@ 
 
         // Decide where to place percentage in graph
         if ($percentage >= 50) {
-            $text_in_filled = '&nbsp;' . $other_percentage . '%';
+            $text_in_filled = '&nbsp;'.$other_percentage.'%';
             $text_in_unfilled = '';
         } else {
-            $text_in_unfilled = '&nbsp;' . $other_percentage . '%';
+            $text_in_unfilled = '&nbsp;'.$other_percentage.'%';
             $text_in_filled = '';
         }
 
         // Decide the background colour of the graph
         if ($percentage < 65) {
-            $colour = '#00BB00';        // Safe - green
+            $colour = '#00BB00'; // Safe - green
         } elseif ($percentage < 90) {
-            $colour = '#ffd400';        // Filling up - yelloworange
+            $colour = '#ffd400'; // Filling up - yelloworange
         } else {
-            $colour = '#DD0000';        // Full - red
+            $colour = '#DD0000'; // Full - red
         }
 
         // This is used for the table width: a table of only 100 pixels looks too small
         $visual_percentage = 4 * $percentage;
         $visual_other_percentage = 4 * $other_percentage;
 
-        $message .= get_lang('PercentageQuotaInUse') . ': <strong>' . $percentage . '%</strong>.<br />' .
-            get_lang('PercentageQuotaFree') . ': <strong>' . $other_percentage . '%</strong>.<br />';
+        $message .= get_lang('PercentageQuotaInUse').': <strong>'.$percentage.'%</strong>.<br />'.
+            get_lang('PercentageQuotaFree').': <strong>'.$other_percentage.'%</strong>.<br />';
 
-        $show_percentage = '&nbsp;' . $percentage . '%';
-        $message .= '<div style="width: 80%; text-align: center; -moz-border-radius: 5px 5px 5px 5px; border: 1px solid #aaa; background-image: url(\'' . api_get_path(WEB_CODE_PATH) . 'css/' . api_get_visual_theme() . '/images/bg-header4.png\');" class="document-quota-bar">' .
-            '<div style="width:' . $percentage . '%; background-color: #bbb; border-right:3px groove #bbb; -moz-border-radius:5px;">&nbsp;</div>' .
-            '<span style="margin-top: -15px; margin-left:-15px; position: absolute;font-weight:bold;">' . $show_percentage . '</span></div>';
+        $show_percentage = '&nbsp;'.$percentage.'%';
+        $message .= '<div style="width: 80%; text-align: center; -moz-border-radius: 5px 5px 5px 5px; border: 1px solid #aaa; background-image: url(\''.api_get_path(WEB_CODE_PATH).'css/'.api_get_visual_theme().'/images/bg-header4.png\');" class="document-quota-bar">'.
+            '<div style="width:'.$percentage.'%; background-color: #bbb; border-right:3px groove #bbb; -moz-border-radius:5px;">&nbsp;</div>'.
+            '<span style="margin-top: -15px; margin-left:-15px; position: absolute;font-weight:bold;">'.$show_percentage.'</span></div>';
         echo $message;
     }
 
@@ -3102,7 +3102,7 @@ 
         $percentage = $already_consumed_space / $course_quota * 100;
         $percentage = round($percentage, 1);
         $message = get_lang('YouAreCurrentlyUsingXOfYourX');
-        $message = sprintf($message, $already_consumed_space_m, $percentage . '%', $course_quota_m . ' ');
+        $message = sprintf($message, $already_consumed_space_m, $percentage.'%', $course_quota_m.' ');
         echo Display::div($message, array('id' => 'document_quota'));
     }
 
@@ -3133,13 +3133,13 @@ 
      */
     static function generate_jplayer_jquery($params = array())
     {
-        $js_path = api_get_path(WEB_LIBRARY_PATH) . 'javascript/';
+        $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
 
         $js = '
-            $("#jquery_jplayer_' . $params['count'] . '").jPlayer({
+            $("#jquery_jplayer_' . $params['count'].'").jPlayer({
                 ready: function() {
                     $(this).jPlayer("setMedia", {
-                        ' . $params['extension'] . ' : "' . $params['url'] . '"
+                        ' . $params['extension'].' : "'.$params['url'].'"
                     });
                 },
                 play: function() { // To avoid both jPlayers playing together.
@@ -3147,12 +3147,12 @@ 
                 },
                 //errorAlerts: true,
                 //warningAlerts: true,
-                swfPath: "' . $js_path . 'jquery-jplayer/jplayer/",
+                swfPath: "' . $js_path.'jquery-jplayer/jplayer/",
                 //supplied: "m4a, oga, mp3, ogg, wav",
-                supplied: "' . $params['extension'] . '",
+                supplied: "' . $params['extension'].'",
                 wmode: "window",
                 solution: "flash, html",  // Do not change this setting
-                cssSelectorAncestor: "#jp_container_' . $params['count'] . '",
+                cssSelectorAncestor: "#jp_container_' . $params['count'].'",
             });  	 ' . "\n\n";
 
         return $js;
@@ -3182,16 +3182,16 @@ 
         }
 
         //Shows only the play button
-        $html = '<div id="jquery_jplayer_' . $i . '" class="jp-jplayer"></div>
-                <div id="jp_container_' . $i . '" class="jp-audio">
+        $html = '<div id="jquery_jplayer_'.$i.'" class="jp-jplayer"></div>
+                <div id="jp_container_' . $i.'" class="jp-audio">
                     <div class="jp-type-single">
                         <div class="jp-gui jp-interface">
                             <ul class="jp-controls">
                                 <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
                                 <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
-                                ' . $extra_controls . '
+                                ' . $extra_controls.'
                             </ul>
-                            ' . $progress . '
+                            ' . $progress.'
                         </div>
                     </div>
                 </div>';
@@ -3244,8 +3244,8 @@ 
                     </div>
                 </div>
                 <div class="jp-no-solution">
-                    <span>' . get_lang('UpdateRequire') . '</span>
-                    ' . get_lang("ToPlayTheMediaYouWillNeedToUpdateYourBrowserToARecentVersionYouCanAlsoDownloadTheFile") . '
+                    <span>' . get_lang('UpdateRequire').'</span>
+                    ' . get_lang("ToPlayTheMediaYouWillNeedToUpdateYourBrowserToARecentVersionYouCanAlsoDownloadTheFile").'
                 </div>
             </div>
         </div>';
@@ -3326,7 +3326,7 @@ 
 
         $add_folder_filter = null;
         if (!empty($filter_by_folder)) {
-            $add_folder_filter = " AND docs.path LIKE '" . Database::escape_string($filter_by_folder) . "%'";
+            $add_folder_filter = " AND docs.path LIKE '".Database::escape_string($filter_by_folder)."%'";
         }
 
         // If we are in LP display hidden folder https://support.chamilo.org/issues/6679
@@ -3361,7 +3361,7 @@ 
 
                 $notLikeCondition = null;
                 for ($i = 1; $i <= $num; $i++) {
-                    $repeat = str_repeat('/%', $i+1);
+                    $repeat = str_repeat('/%', $i + 1);
                     $notLikeCondition .= " AND docs.path NOT LIKE '".Database::escape_string($cleanedPath.$repeat)."' ";
                 }
 
@@ -3386,7 +3386,7 @@ 
                 ON (docs.id = last.ref AND docs.c_id = last.c_id)
                 WHERE
                     docs.path NOT LIKE '%_DELETED_%' AND
-                    last.tool = '" . TOOL_DOCUMENT . "' $condition_session AND
+                    last.tool = '".TOOL_DOCUMENT."' $condition_session AND
                     (last.visibility = '1' $lp_visibility_condition) AND
                     last.visibility <> 2 AND
                     docs.c_id = {$course_info['real_id']} AND
@@ -3416,7 +3416,7 @@ 
                 Display::url(
                     Display::return_icon('close.png', get_lang('Close'), array(), ICON_SIZE_SMALL),
                     ' javascript:void(0);',
-                    array('id' => 'close_div_' . $course_info['real_id'] . '_' . $session_id, 'class' => 'close_div')
+                    array('id' => 'close_div_'.$course_info['real_id'].'_'.$session_id, 'class' => 'close_div')
                 ),
                 array('style' => 'position:absolute;right:10px')
             );
@@ -3520,7 +3520,7 @@ 
                     $('#'+tempId).hide();
                 } else {
                     image.addClass('open');
-                    image.attr('src', '" . Display::returnIconPath('nolines_minus.gif') . "');
+                    image.attr('src', '" . Display::returnIconPath('nolines_minus.gif')."');
                     $('#'+id).hide();
                     $('#'+tempId).show();
 
@@ -3567,7 +3567,7 @@ 
         $target,
         $overwrite_url
     ) {
-        $img_sys_path = api_get_path(SYS_CODE_PATH) . 'img/';
+        $img_sys_path = api_get_path(SYS_CODE_PATH).'img/';
         $web_code_path = api_get_path(WEB_CODE_PATH);
 
         $documentId = $resource['id'];
@@ -3582,7 +3582,7 @@ 
         // It's a file.
         $icon = choose_image($path);
         $position = strrpos($icon, '.');
-        $icon = substr($icon, 0, $position) . '_small.gif';
+        $icon = substr($icon, 0, $position).'_small.gif';
         $my_file_title = $resource['title'];
         $visibility = $resource['visibility'];
 
@@ -3594,25 +3594,25 @@ 
         // Show the "image name" not the filename of the image.
         if ($lp_id) {
             // LP URL
-            $url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;file=' . $documentId . '&amp;lp_id=' . $lp_id;
+            $url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&amp;action=add_item&amp;type='.TOOL_DOCUMENT.'&amp;file='.$documentId.'&amp;lp_id='.$lp_id;
             if (!empty($overwrite_url)) {
-                $url = $overwrite_url . '&cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&document_id=' . $documentId.'';
+                $url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId.'';
             }
         } else {
             // Direct document URL
-            $url = $web_code_path . 'document/document.php?cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&id=' . $documentId;
+            $url = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$documentId;
             if (!empty($overwrite_url)) {
-                $url = $overwrite_url . '&cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&document_id=' . $documentId;
+                $url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId;
             }
         }
 
         $img = Display::returnIconPath($icon);
-        if (!file_exists($img_sys_path . $icon)) {
+        if (!file_exists($img_sys_path.$icon)) {
             $img = Display::returnIconPath('default_small.gif');
         }
 
         $link = Display::url(
-            '<img alt="" src="' . $img . '" title="" />&nbsp;' . $my_file_title, $url,
+            '<img alt="" src="'.$img.'" title="" />&nbsp;'.$my_file_title, $url,
             array('target' => $target)
         );
 
@@ -3623,12 +3623,12 @@ 
         $return = null;
 
         if ($lp_id == false) {
-            $return .= '<li class="doc_resource '.$visibilityClass.' " data_id="' . $documentId . '" data_type="document" title="' . $my_file_title . '" >';
+            $return .= '<li class="doc_resource '.$visibilityClass.' " data_id="'.$documentId.'" data_type="document" title="'.$my_file_title.'" >';
         } else {
-            $return .= '<li class="doc_resource lp_resource_element '.$visibilityClass.' " data_id="' . $documentId . '" data_type="document" title="' . $my_file_title . '" >';
+            $return .= '<li class="doc_resource lp_resource_element '.$visibilityClass.' " data_id="'.$documentId.'" data_type="document" title="'.$my_file_title.'" >';
         }
 
-        $return .= '<div class="item_data" style="margin-left:' . ($num  * 18) . 'px;margin-right:5px;">';
+        $return .= '<div class="item_data" style="margin-left:'.($num * 18).'px;margin-right:5px;">';
 
         if ($add_move_button) {
             $return .= '<a class="moved" href="#">';
@@ -3693,7 +3693,7 @@ 
             if (isset($resource['visible']) && $resource['visible'] == 0) {
                 $folder_class_hidden = "doc_folder_hidden"; // in base.css
             }
-            $onclick = 'onclick="javascript: testResources(\'res_' . $resource['id'] . '\',\'img_' . $resource['id'] . '\')"';
+            $onclick = 'onclick="javascript: testResources(\'res_'.$resource['id'].'\',\'img_'.$resource['id'].'\')"';
         }
         $return = null;
 
@@ -3701,22 +3701,22 @@ 
             $return = '<ul class="lp_resource">';
         }
 
-        $return .= '<li class="doc_folder '.$folder_class_hidden.'" id="doc_id_' . $resource['id'] . '"  style="margin-left:' . ($num * 18) . 'px; ">';
+        $return .= '<li class="doc_folder '.$folder_class_hidden.'" id="doc_id_'.$resource['id'].'"  style="margin-left:'.($num * 18).'px; ">';
 
         $image = Display::returnIconPath('nolines_plus.gif');
         if (empty($path)) {
             $image = Display::returnIconPath('nolines_minus.gif');
         }
-        $return .= '<img style="cursor: pointer;" src="'.$image.'" align="absmiddle" id="img_'.$resource['id'] . '" '.$onclick.'>';
+        $return .= '<img style="cursor: pointer;" src="'.$image.'" align="absmiddle" id="img_'.$resource['id'].'" '.$onclick.'>';
         $return .= Display::returnIconPath('lp_folder.gif').'&nbsp;';
         $return .= '<span '.$onclick.' style="cursor: pointer;" >'.$title.'</span>';
         $return .= '</li>';
 
         if (empty($path)) {
             if ($folderId == false) {
-                $return .= '<div id="res_' . $resource['id'] . '" >';
+                $return .= '<div id="res_'.$resource['id'].'" >';
             } else {
-                $return .= '<div id="res_' . $resource['id'] . '" style="display: none;" >';
+                $return .= '<div id="res_'.$resource['id'].'" style="display: none;" >';
             }
         }
 
@@ -3878,9 +3878,9 @@ 
             $session_id = api_get_session_id();
         }
         $course_info = api_get_course_info($course_code);
-        $course_dir = $course_info['path'] . '/document';
+        $course_dir = $course_info['path'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         $course_id = $course_info['real_id'];
         $table_document = Database::get_course_table(TABLE_DOCUMENT);
@@ -3889,7 +3889,7 @@ 
         $result = Database::query($qry);
         if (Database::num_rows($result) == 1) {
             $row = Database::fetch_array($result);
-            $doc_path = api_get_path(SYS_COURSE_PATH) . $course_dir . $row['path'];
+            $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
             //TODO: mime_content_type is deprecated, fileinfo php extension is enabled by default as of PHP 5.3.0
             // now versions of PHP on Debian testing(5.2.6-5) and Ubuntu(5.2.6-2ubuntu) are lower, so wait for a while
             $doc_mime = mime_content_type($doc_path);
@@ -3920,8 +3920,8 @@ 
                 $file_content = self::get_text_content($doc_path, $doc_mime);
                 $course_code = Database::escape_string($course_code);
 
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
 
                 $ic_slide = new IndexableChunk();
                 $ic_slide->addValue('title', $file_title);
@@ -3938,7 +3938,7 @@ 
                 $di = new ChamiloIndexer();
                 $return = $di->connectDb(null, null, $lang);
 
-                require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
                 $specific_fields = get_specific_field_list();
 
                 // process different depending on what to do if file exists
@@ -3975,7 +3975,7 @@ 
                             } else { //if the specific field is not defined, force an empty one
                                 $sterms = '';
                             }
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $sterm = trim($sterm);
@@ -3989,7 +3989,7 @@ 
                             }
                         }
                         // Add terms also to content to make terms findable by probabilistic search
-                        $file_content = $all_specific_terms . ' ' . $file_content;
+                        $file_content = $all_specific_terms.' '.$file_content;
 
                         if (!$simulation) {
                             $ic_slide->addValue('content', $file_content);
@@ -4015,7 +4015,7 @@ 
                         } else { //if the specific field is not defined, force an empty one
                             $sterms = '';
                         }
-                        $all_specific_terms .= ' ' . $sterms;
+                        $all_specific_terms .= ' '.$sterms;
                         if (!empty($sterms)) {
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
@@ -4027,7 +4027,7 @@ 
                         }
                     }
                     // Add terms also to content to make terms findable by probabilistic search
-                    $file_content = $all_specific_terms . ' ' . $file_content;
+                    $file_content = $all_specific_terms.' '.$file_content;
                     if (!$simulation) {
                         $ic_slide->addValue('content', $file_content);
                         $di->addChunk($ic_slide);
@@ -4311,7 +4311,7 @@ 
         $defaultVisibility = 'visible';
 
         if (isset($settings['documents'])) {
-            $portalDefaultVisibility =  'invisible';
+            $portalDefaultVisibility = 'invisible';
             if ($settings['documents'] == 'true') {
                 $portalDefaultVisibility = 'visible';
             }
@@ -4549,7 +4549,7 @@ 
         //make htaccess with allow from all, and file index.html into temp/audio
         $htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/audio/.htaccess';
         if (!file_exists($htaccess)) {
-            $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+            $htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes";
             $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/audio/.htaccess', 'w');
             if ($fp) {
                 fwrite($fp, $htaccess_content);
@@ -4558,9 +4558,9 @@ 
         }
 
         //encript temp name file
-        $name_crip = sha1(uniqid());//encript
-        $findext= explode(".", $file);
-        $extension = $findext[count($findext)-1];
+        $name_crip = sha1(uniqid()); //encript
+        $findext = explode(".", $file);
+        $extension = $findext[count($findext) - 1];
         $file_crip = $name_crip.'.'.$extension;
 
         //copy file to temp/audio directory
@@ -4664,7 +4664,7 @@ 
         $comment = null;
 
         $fileName = api_replace_dangerous_char($title);
-        $filePath = api_get_path(SYS_COURSE_PATH) . "{$courseData['path']}/document{$dir}";
+        $filePath = api_get_path(SYS_COURSE_PATH)."{$courseData['path']}/document{$dir}";
         $fileFullPath = "{$filePath}/{$fileName}.html";
         $fileSize = 0;
         $fileType = 'file';
@@ -4716,7 +4716,7 @@ 
             $fileSize,
             $title,
             $comment,
-            0,//$readonly = 0,
+            0, //$readonly = 0,
             true, //$save_visibility = true,
             null, //$group_id = null,
             $sessionId
@@ -5001,8 +5001,8 @@ 
             $sessionId,
             $groupId
         )) {
-            $uniqueName = self::addSuffixToFileName($name, '_' . $counter);
-            $filePath = $path . $uniqueName;
+            $uniqueName = self::addSuffixToFileName($name, '_'.$counter);
+            $filePath = $path.$uniqueName;
             $counter++;
         }
 
@@ -5035,7 +5035,7 @@ 
             $folder_sql = implode("','", $escaped_folders);
 
             $sql = "SELECT * FROM $doc_table
-                WHERE filetype = 'folder' AND c_id = $course_id AND path IN ('" . $folder_sql . "')";
+                WHERE filetype = 'folder' AND c_id = $course_id AND path IN ('".$folder_sql."')";
             $res = Database::query($sql);
             $folder_titles = array();
             while ($obj = Database::fetch_object($res)) {
@@ -5043,7 +5043,7 @@ 
             }
         }
 
-        $form = new FormValidator('selector', 'GET', api_get_self() . '?' . api_get_cidreq());
+        $form = new FormValidator('selector', 'GET', api_get_self().'?'.api_get_cidreq());
         $form->addElement('hidden', 'cidReq', api_get_course_id());
         $parent_select = $form->addSelect('id', get_lang('CurrentDirectory'), '', array('onchange' => 'javascript: document.selector.submit();'));
 
@@ -5063,9 +5063,9 @@ 
                     $folder_titles[$folder] = cut($folder_titles[$folder], 80);
                     $counter = count($path_parts) - 2;
                     if ($counter > 0) {
-                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', $counter) . ' &mdash; ' . $folder_titles[$folder];
+                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', $counter).' &mdash; '.$folder_titles[$folder];
                     } else {
-                        $label = ' &mdash; ' . $folder_titles[$folder];
+                        $label = ' &mdash; '.$folder_titles[$folder];
                     }
                     $parent_select->addOption($label, $folder_id);
                     if ($selected != '') {
@@ -5083,7 +5083,7 @@ 
                     } else {
                         $path_parts = explode('/', str_replace($group_dir, '', $folder));
                         $label = cut($label, 80);
-                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label;
+                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
                     }
                     $parent_select->addOption($label, $folder_id);
                     if ($selected != '') {
@@ -5115,7 +5115,7 @@ 
     ) {
         global $dbl_click_id;
         $course_info = api_get_course_info();
-        $www = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/document';
+        $www = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document';
         $webOdflist = DocumentManager::get_web_odf_extension_list();
 
         // Get the title or the basename depending on what we're using
@@ -5139,11 +5139,11 @@ 
 
         if (!$show_as_icon) {
             // Build download link (icon)
-            $forcedownload_link = ($filetype == 'folder') ? api_get_self() . '?' . api_get_cidreq() . '&action=downloadfolder&id=' . $document_data['id'] : api_get_self() . '?' . api_get_cidreq() . '&amp;action=download&amp;id=' . $document_data['id'];
+            $forcedownload_link = ($filetype == 'folder') ? api_get_self().'?'.api_get_cidreq().'&action=downloadfolder&id='.$document_data['id'] : api_get_self().'?'.api_get_cidreq().'&amp;action=download&amp;id='.$document_data['id'];
             // Folder download or file download?
             $forcedownload_icon = ($filetype == 'folder') ? 'save_pack.png' : 'save.png';
             // Prevent multiple clicks on zipped folder download
-            $prevent_multiple_click = ($filetype == 'folder') ? " onclick=\"javascript: if(typeof clic_$dbl_click_id == 'undefined' || !clic_$dbl_click_id) { clic_$dbl_click_id=true; window.setTimeout('clic_" . ($dbl_click_id++) . "=false;',10000); } else { return false; }\"" : '';
+            $prevent_multiple_click = ($filetype == 'folder') ? " onclick=\"javascript: if(typeof clic_$dbl_click_id == 'undefined' || !clic_$dbl_click_id) { clic_$dbl_click_id=true; window.setTimeout('clic_".($dbl_click_id++)."=false;',10000); } else { return false; }\"" : '';
         }
 
         $target = '_self';
@@ -5159,20 +5159,20 @@ 
 
             if ($is_browser_viewable_file) {
                 if ($ext == 'pdf' || in_array($ext, $webOdflist)) {
-                    $url = api_get_self() . '?' . api_get_cidreq() . '&amp;action=download&amp;id=' . $document_data['id'];
+                    $url = api_get_self().'?'.api_get_cidreq().'&amp;action=download&amp;id='.$document_data['id'];
                 } else {
-                    $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                    $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
                 }
             } else {
                 // url-encode for problematic characters (we may not call them dangerous characters...)
-                $path = str_replace('%2F', '/', $url_path) . '?' . api_get_cidreq();
-                $url = $www . $path;
+                $path = str_replace('%2F', '/', $url_path).'?'.api_get_cidreq();
+                $url = $www.$path;
             }
 
             /*$path = str_replace('%2F', '/', $url_path); //yox view hack otherwise the image can't be well read
             $url = $www . $path;*/
         } else {
-            $url = api_get_self() . '?' . api_get_cidreq() . '&id=' . $document_data['id'];
+            $url = api_get_self().'?'.api_get_cidreq().'&id='.$document_data['id'];
         }
 
         // The little download icon
@@ -5182,10 +5182,10 @@ 
         if ($path == '/shared_folder') {
             $tooltip_title_alt = get_lang('UserFolders');
         } elseif (strstr($path, 'shared_folder_session_')) {
-            $tooltip_title_alt = get_lang('UserFolders') . ' (' . api_get_session_name(api_get_session_id()) . ')';
+            $tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name(api_get_session_id()).')';
         } elseif (strstr($tooltip_title, 'sf_user_')) {
             $userinfo = api_get_user_info(substr($tooltip_title, 8));
-            $tooltip_title_alt = get_lang('UserFolder') . ' ' . $userinfo['complete_name'];
+            $tooltip_title_alt = get_lang('UserFolder').' '.$userinfo['complete_name'];
         } elseif ($path == '/chat_files') {
             $tooltip_title_alt = get_lang('ChatFiles');
         } elseif ($path == '/learning_path') {
@@ -5218,24 +5218,24 @@ 
                 ) {
                     //filter when I am into shared folder, I can show for donwload only my shared folder
                     if (DocumentManager::is_shared_folder($curdirpath, $current_session_id)) {
-                        if (preg_match('/shared_folder\/sf_user_' . api_get_user_id() . '$/', urldecode($forcedownload_link)) ||
-                            preg_match('/shared_folder_session_' . $current_session_id . '\/sf_user_' . api_get_user_id() . '$/', urldecode($forcedownload_link)) ||
+                        if (preg_match('/shared_folder\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link)) ||
+                            preg_match('/shared_folder_session_'.$current_session_id.'\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link)) ||
                             api_is_allowed_to_edit() || api_is_platform_admin()
                         ) {
-                            $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                                Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                            $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                                Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
                         }
                     } elseif (!preg_match('/shared_folder/', urldecode($forcedownload_link)) ||
                         api_is_allowed_to_edit() ||
                         api_is_platform_admin()
                     ) {
-                        $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                            Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                            Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 }
             } else {
-                $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                    Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                    Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             // Copy files to users myfiles
@@ -5243,12 +5243,12 @@ 
                 api_get_setting('users_copy_files') == 'true' &&
                 !api_is_anonymous()
             ) {
-                $copy_myfiles_link = ($filetype == 'file') ? api_get_self() . '?' . api_get_cidreq() . '&action=copytomyfiles&id=' . $document_data['id'] : api_get_self() . '?' . api_get_cidreq();
+                $copy_myfiles_link = ($filetype == 'file') ? api_get_self().'?'.api_get_cidreq().'&action=copytomyfiles&id='.$document_data['id'] : api_get_self().'?'.api_get_cidreq();
 
                 if ($filetype == 'file') {
 
-                    $copy_to_myfiles = '<a href="' . $copy_myfiles_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                        Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(), ICON_SIZE_SMALL) . '&nbsp;&nbsp;</a>';
+                    $copy_to_myfiles = '<a href="'.$copy_myfiles_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                        Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(), ICON_SIZE_SMALL).'&nbsp;&nbsp;</a>';
 
                     if (api_get_setting('allow_my_files') === 'false') {
                         $copy_to_myfiles = '';
@@ -5267,13 +5267,13 @@ 
                 $filetype == 'file' &&
                 in_array($extension, array('html', 'htm'))
             ) {
-                $pdf_icon = ' <a style="float:right".' . $prevent_multiple_click . ' href="' . api_get_self() . '?' . api_get_cidreq() . '&action=export_to_pdf&id=' . $document_data['id'] . '">' .
-                    Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '</a> ';
+                $pdf_icon = ' <a style="float:right".'.$prevent_multiple_click.' href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$document_data['id'].'">'.
+                    Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL).'</a> ';
             }
 
             if ($is_browser_viewable_file) {
-                $open_in_new_window_link = '<a href="' . $www . str_replace('%2F', '/', $url_path) . '?' . api_get_cidreq() . '" style="float:right"' . $prevent_multiple_click . ' target="_blank">' .
-                    Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(), ICON_SIZE_SMALL) . '&nbsp;&nbsp;</a>';
+                $open_in_new_window_link = '<a href="'.$www.str_replace('%2F', '/', $url_path).'?'.api_get_cidreq().'" style="float:right"'.$prevent_multiple_click.' target="_blank">'.
+                    Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(), ICON_SIZE_SMALL).'&nbsp;&nbsp;</a>';
             }
 
             if ($filetype == 'file') {
@@ -5282,9 +5282,9 @@ 
                     (preg_match('/wav$/i', urldecode($checkExtension)) && !preg_match('/_chnano_.wav$/i', urldecode($url))) ||
                     preg_match('/ogg$/i', urldecode($checkExtension))
                 ) {
-                    return '<span style="float:left" ' . $visibility_class . '>' .
-                    $title .
-                    '</span>' . $force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                    return '<span style="float:left" '.$visibility_class.'>'.
+                    $title.
+                    '</span>'.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
                 } elseif (
 
                     // Show preview
@@ -5302,7 +5302,7 @@ 
                     )
                 ) {
                     // Simpler version of showinframesmin.php with no headers
-                    $url = 'show_content.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                    $url = 'show_content.php?'.api_get_cidreq().'&id='.$document_data['id'];
                     $class = 'ajax';
                     if ($visibility == false) {
                         $class = "ajax invisible";
@@ -5317,34 +5317,34 @@ 
                             'style' => 'float: left;'
                         ]
                     )
-                    . $force_download_html . $send_to . $copy_to_myfiles
-                    . $open_in_new_window_link . $pdf_icon;
+                    . $force_download_html.$send_to.$copy_to_myfiles
+                    . $open_in_new_window_link.$pdf_icon;
                 } else {
                     // For PDF Download the file.
                     $pdfPreview = null;
                     if ($ext != 'pdf' && !in_array($ext, $webOdflist)) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
                     } else {
                         $pdfPreview = Display::url(
                             Display::return_icon('preview.gif', get_lang('Preview')),
-                            api_get_path(WEB_CODE_PATH).'document/showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'],
+                            api_get_path(WEB_CODE_PATH).'document/showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'],
                             array('style' => 'float:right')
                         );
                     }
                     // No plugin just the old and good showinframes.php page
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" style="float:left" ' . $visibility_class . ' >' . $title . '</a>' .
-                    $pdfPreview.$force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" style="float:left" '.$visibility_class.' >'.$title.'</a>'.
+                    $pdfPreview.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
                 }
             } else {
-                return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' . $title . '</a>' .
-                $force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.$title.'</a>'.
+                $force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
             }
             // end copy files to users myfiles
         } else {
             // Icon column
             if (preg_match('/shared_folder/', urldecode($checkExtension)) &&
                 preg_match('/shared_folder$/', urldecode($checkExtension)) == false &&
-                preg_match('/shared_folder_session_' . $current_session_id . '$/', urldecode($url)) == false
+                preg_match('/shared_folder_session_'.$current_session_id.'$/', urldecode($url)) == false
             ) {
                 if ($filetype == 'file') {
                     //Sound preview with jplayer
@@ -5369,19 +5369,19 @@ 
                             api_get_setting('enable_nanogong') == 'true'
                         )
                     ) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) .
-                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).
+                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                     } else {
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) .
-                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).
+                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                     }
                 } else {
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" target="' . $target . '"' . $visibility_class . ' style="float:left">' .
-                    DocumentManager::build_document_icon_tag($filetype, $path) .
-                    Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.
+                    DocumentManager::build_document_icon_tag($filetype, $path).
+                    Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                 }
             } else {
                 if ($filetype == 'file') {
@@ -5409,16 +5409,16 @@ 
                             api_get_setting('enable_nanogong') == 'true'
                         )
                     ) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id']; //without preview
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id']; //without preview
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                     } else {
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                     }
                 } else {
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" target="' . $target . '"' . $visibility_class . ' style="float:left">' .
-                    DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.
+                    DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                 }
             }
         }
@@ -5442,7 +5442,7 @@ 
 
             if (preg_match('/_chnano_.wav$/i', $basename)) {
                 $icon = "jplayer_play.png";
-                $basename = 'wav' . ' ' . '(Nanogong)';
+                $basename = 'wav'.' '.'(Nanogong)';
             } else {
                 $basename = substr(strrchr($basename, '.'), 1);
             }
@@ -5458,13 +5458,13 @@ 
                 $userinfo = api_get_user_info(substr($basename, 8));
                 $icon = $userinfo['avatar_small'];
 
-                $basename = get_lang('UserFolder') . ' ' . $userinfo['complete_name'];
+                $basename = get_lang('UserFolder').' '.$userinfo['complete_name'];
                 $user_image = true;
             } elseif (strstr($path, 'shared_folder_session_')) {
                 if ($is_allowed_to_edit) {
-                    $basename = '***(' . api_get_session_name($current_session_id) . ')*** ' . get_lang('HelpUsersFolder');
+                    $basename = '***('.api_get_session_name($current_session_id).')*** '.get_lang('HelpUsersFolder');
                 } else {
-                    $basename = get_lang('UserFolders') . ' (' . api_get_session_name($current_session_id) . ')';
+                    $basename = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
                 }
                 $icon = 'folder_users.gif';
             } else {
@@ -5558,16 +5558,16 @@ 
         // Build URL-parameters for table-sorting
         $sort_params = array();
         if (isset($_GET['column'])) {
-            $sort_params[] = 'column=' . Security::remove_XSS($_GET['column']);
+            $sort_params[] = 'column='.Security::remove_XSS($_GET['column']);
         }
         if (isset($_GET['page_nr'])) {
-            $sort_params[] = 'page_nr=' . Security::remove_XSS($_GET['page_nr']);
+            $sort_params[] = 'page_nr='.Security::remove_XSS($_GET['page_nr']);
         }
         if (isset($_GET['per_page'])) {
-            $sort_params[] = 'per_page=' . Security::remove_XSS($_GET['per_page']);
+            $sort_params[] = 'per_page='.Security::remove_XSS($_GET['per_page']);
         }
         if (isset($_GET['direction'])) {
-            $sort_params[] = 'direction=' . Security::remove_XSS($_GET['direction']);
+            $sort_params[] = 'direction='.Security::remove_XSS($_GET['direction']);
         }
         $sort_params = implode('&amp;', $sort_params);
         $visibility_icon = ($visibility == 0) ? 'invisible' : 'visible';
@@ -5580,89 +5580,89 @@ 
         if ($is_read_only /* or ($session_id!=api_get_session_id()) */) {
             if (api_is_course_admin() || api_is_platform_admin()) {
                 if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                    $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                    $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                    $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                    $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 } else {
-                    $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&id=' . $document_id. '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 }
             } else {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             }
-            $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL);
+            $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL);
             if (api_is_allowed_to_edit() || api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon($visibility_icon . '.png', get_lang('VisibilityCannotBeChanged'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'), '', ICON_SIZE_SMALL);
             }
-            $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
+            $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
         } else {
             //Edit button
             if (in_array($path, DocumentManager::get_system_folders())) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
-            } elseif ($is_certificate_mode ) {
+            } elseif ($is_certificate_mode) {
                 // gradebook category doesn't seem to be taken into account
-                $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id . '&curdirpath=/certificates">' . Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'&curdirpath=/certificates">'.Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_get_session_id()) {
                     if ($document_data['session_id'] == api_get_session_id()) {
                         if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                            $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                        } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                            $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                        } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                            $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                            $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         } else {
-                            $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         }
                     } else {
-                        $modify_icons .= '&nbsp;' . Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;'.Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 } else {
                     if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                        $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                    } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                        $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                    } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                        $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                        $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&amp;id=' . $document_id . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     }
                 }
             }
 
             // Move button.
             if ($is_certificate_mode || in_array($path, DocumentManager::get_system_folders())) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_get_session_id()) {
                     if ($document_data['session_id'] == api_get_session_id()) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;move=' . $document_id .  '">' .
-                            Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;move='.$document_id.'">'.
+                            Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 } else {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;move=' . $document_id .  '">' .
-                        Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;move='.$document_id.'">'.
+                        Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                 }
             }
 
             //Visibility button
             if ($is_certificate_mode) {
-                $modify_icons .= '&nbsp;' . Display::return_icon($visibility_icon . '.png', get_lang('VisibilityCannotBeChanged'), array(), ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_is_allowed_to_edit() || api_is_platform_admin()) {
                     if ($visibility_icon == 'invisible') {
@@ -5670,14 +5670,14 @@ 
                     } else {
                         $tip_visibility = get_lang('Hide');
                     }
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;' . $visibility_command . '=' . $id . '&amp;' . $sort_params . '">' .
-                        Display::return_icon($visibility_icon . '.png', $tip_visibility, '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;'.$visibility_command.'='.$id.'&amp;'.$sort_params.'">'.
+                        Display::return_icon($visibility_icon.'.png', $tip_visibility, '', ICON_SIZE_SMALL).'</a>';
                 }
             }
 
             // Delete button
             if (in_array($path, DocumentManager::get_system_folders())) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
             } else {
                 $titleToShow = addslashes(basename($document_data['title']));
 
@@ -5685,23 +5685,23 @@ 
                     $_GET['curdirpath'] == '/certificates' &&
                     DocumentManager::get_default_certificate_id(api_get_course_id()) == $id
                 ) {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;' . $sort_params . 'delete_certificate_id=' . $id . '" onclick="return confirmation(\'' . $titleToShow . '\');">' .
-                        Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'delete_certificate_id='.$id.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                        Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                 } else {
                     if ($is_certificate_mode) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid=' . $document_id  . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow . '\');">' .
-                            Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                     } else {
                         if (api_get_session_id()) {
                             if ($document_data['session_id'] == api_get_session_id()) {
-                                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id  . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow . '\');">'.
-                                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                             } else {
-                                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
+                                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
                             }
                         } else {
-                            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow. '\');">' .
-                                Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                                Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
@@ -5713,15 +5713,15 @@ 
                 // nothing to do
             } else {
                 if ($usePpt2lp && $formatType) {
-                    $modify_icons .= '&nbsp;<a class="convertAction" href="#" ' .
-                        'data-documentId = ' . $document_id .
-                        ' data-formatType = ' . $formatType . '>' .
+                    $modify_icons .= '&nbsp;<a class="convertAction" href="#" '.
+                        'data-documentId = '.$document_id.
+                        ' data-formatType = '.$formatType.'>'.
                         Display::return_icon(
                             'convert.png',
                             get_lang('Convert'),
                             array(),
                             ICON_SIZE_SMALL
-                        ) . '</a>';
+                        ).'</a>';
                 }
             }
         }
@@ -5729,8 +5729,8 @@ 
         if ($type == 'file' && ($extension == 'html' || $extension == 'htm')) {
             if ($is_template == 0) {
                 if ((isset($_GET['curdirpath']) && $_GET['curdirpath'] != '/certificates') || !isset($_GET['curdirpath'])) {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;add_as_template=' . $id .  '&amp;' . $sort_params . '">' .
-                        Display::return_icon('wizard.png', get_lang('AddAsTemplate'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;add_as_template='.$id.'&amp;'.$sort_params.'">'.
+                        Display::return_icon('wizard.png', get_lang('AddAsTemplate'), array(), ICON_SIZE_SMALL).'</a>';
                 }
                 if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates') {//allow attach certificate to course
                     $visibility_icon_certificate = 'nocertificate';
@@ -5744,20 +5744,20 @@ 
                         $certificate = get_lang('NoDefaultCertificate');
                     }
                     if (isset($_GET['selectcat'])) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;selectcat=' . Security::remove_XSS($_GET['selectcat']) . '&amp;set_certificate=' . $id . '&amp;' . $sort_params . '">
-                    <img src="../img/' . $visibility_icon_certificate . '.png" border="0" title="' . $certificate . '" alt="" /></a>';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']).'&amp;set_certificate='.$id.'&amp;'.$sort_params.'">
+                    <img src="../img/' . $visibility_icon_certificate.'.png" border="0" title="'.$certificate.'" alt="" /></a>';
                         if ($is_preview) {
-                            $modify_icons .= '&nbsp;<a target="_blank"  href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;set_preview=' . $id . '&amp;' . $sort_params . '" >' .
-                                Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a target="_blank"  href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;set_preview='.$id.'&amp;'.$sort_params.'" >'.
+                                Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&curdirpath=' . $curdirpath . '&amp;remove_as_template=' . $id. '&amp;' . $sort_params . '">' .
-                    Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.'&amp;'.$sort_params.'">'.
+                    Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'), '', ICON_SIZE_SMALL).'</a>';
             }
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=export_to_pdf&id=' . $id . '">' .
-                Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$id.'">'.
+                Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL).'</a>';
         }
         return $modify_icons;
     }
@@ -5826,7 +5826,7 @@ 
                     // 3. inside a subfolder of the folder you want to move
                     if (($curdirpath != $folder) &&
                         ($folder != $move_file) &&
-                        (substr($folder, 0, strlen($move_file) + 1) != $move_file . '/')
+                        (substr($folder, 0, strlen($move_file) + 1) != $move_file.'/')
                     ) {
                         $path_displayed = $folder;
                         // If document title is used, we have to display titles instead of real paths...
@@ -5843,7 +5843,7 @@ 
             foreach ($folders as $folder) {
                 if (($curdirpath != $folder) &&
                     ($folder != $move_file) &&
-                    (substr($folder, 0, strlen($move_file) + 1) != $move_file . '/')
+                    (substr($folder, 0, strlen($move_file) + 1) != $move_file.'/')
                 ) {
                     // Cannot copy dir into his own subdir
                     $path_displayed = DocumentManager::get_titles_of_path($folder);
@@ -5885,10 +5885,10 @@ 
                 // If this path has soon been stored here we don't need a new query
                 $path_displayed .= $tmp_folders_titles[$tmp_path];
             } else {
-                $sql = 'SELECT title FROM ' . Database::get_course_table(TABLE_DOCUMENT) . '
-                    WHERE c_id = ' . $course_id . ' AND path LIKE BINARY "' . $tmp_path . '"';
+                $sql = 'SELECT title FROM '.Database::get_course_table(TABLE_DOCUMENT).'
+                    WHERE c_id = ' . $course_id.' AND path LIKE BINARY "'.$tmp_path.'"';
                 $rs = Database::query($sql);
-                $tmp_title = '/' . Database::result($rs, 0, 0);
+                $tmp_title = '/'.Database::result($rs, 0, 0);
                 $path_displayed .= $tmp_title;
                 $tmp_folders_titles[$tmp_path] = $tmp_title;
             }
@@ -5924,7 +5924,7 @@ 
         $clean_curdirpath = Security::remove_XSS($curdirpath);
         if ($clean_curdirpath == '/shared_folder') {
             return true;
-        } elseif ($clean_curdirpath == '/shared_folder_session_' . $current_session_id) {
+        } elseif ($clean_curdirpath == '/shared_folder_session_'.$current_session_id) {
             return true;
         } else {
             return false;
@@ -5940,7 +5940,7 @@ 
         $clean_path = Security::remove_XSS($path);
         if (strpos($clean_path, 'shared_folder/sf_user_')) {
             return true;
-        } elseif (strpos($clean_path, 'shared_folder_session_' . $current_session_id . '/sf_user_')) {
+        } elseif (strpos($clean_path, 'shared_folder_session_'.$current_session_id.'/sf_user_')) {
             return true;
         } else {
             return false;
@@ -5953,11 +5953,11 @@ 
      */
     public static function is_my_shared_folder($user_id, $path, $current_session_id)
     {
-        $clean_path = Security::remove_XSS($path) . '/';
+        $clean_path = Security::remove_XSS($path).'/';
         //for security does not remove the last slash
-        $main_user_shared_folder = '/shared_folder\/sf_user_' . $user_id . '\//';
+        $main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//';
         //for security does not remove the last slash
-        $main_user_shared_folder_session = '/shared_folder_session_' . $current_session_id . '\/sf_user_' . $user_id . '\//';
+        $main_user_shared_folder_session = '/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//';
 
         if (preg_match($main_user_shared_folder, $clean_path)) {
             return true;
@@ -6230,7 +6230,7 @@ 
                 ON (i.c_id = d.c_id)
                 WHERE
                     d.id = i.ref AND
-                    i.tool = '" . TOOL_DOCUMENT . "'
+                    i.tool = '".TOOL_DOCUMENT."'
                     $conditionSession AND
                     i.c_id = $courseId AND
                     d.c_id = $courseId ";
@@ -6238,9 +6238,9 @@ 
         $result = Database::query($sql);
         $documents = Database::store_result($result, 'ASSOC');
         if ($documents) {
-            $course_dir = $courseInfo['directory'] . '/document';
+            $course_dir = $courseInfo['directory'].'/document';
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $base_work_dir = $sys_course_path . $course_dir;
+            $base_work_dir = $sys_course_path.$course_dir;
 
             foreach ($documents as $document) {
                 $documentId = $document['id'];

main/inc/lib/formvalidator/FormValidator.class.php

Spacing +12 added lines, -12 removed lines

@@ -99,7 +99,7 @@ 
         $renderer->setHeaderTemplate('<legend>{header}</legend>');
 
         //Set required field template
-        $this->setRequiredNote('<span class="form_required">*</span> <small>' . get_lang('ThisFieldIsRequired') . '</small>');
+        $this->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
         $noteTemplate = <<<EOT
 	<div class="form-group">
 		<div class="col-sm-offset-2 col-sm-10">{requiredNote}</div>
@@ -851,9 +851,9 @@ 
             $label = get_lang('PleaseStandBy');
         }
         $this->with_progress_bar = true;
-        $this->updateAttributes("onsubmit=\"javascript: myUpload.start('dynamic_div','".Display::returnIconPath('progress_bar.gif')."','" . $label . "','" . $this->getAttribute('id') . "')\"");
-        $this->addElement('html', '<script language="javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/upload.js" type="text/javascript"></script>');
-        $this->addElement('html', '<script type="text/javascript">var myUpload = new upload(' . (abs(intval($delay)) * 1000) . ');</script>');
+        $this->updateAttributes("onsubmit=\"javascript: myUpload.start('dynamic_div','".Display::returnIconPath('progress_bar.gif')."','".$label."','".$this->getAttribute('id')."')\"");
+        $this->addElement('html', '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/upload.js" type="text/javascript"></script>');
+        $this->addElement('html', '<script type="text/javascript">var myUpload = new upload('.(abs(intval($delay)) * 1000).');</script>');
     }
 
     /**
@@ -870,11 +870,11 @@ 
             return;
         }
 
-        $xajax_upload = new xajax(api_get_path(WEB_LIBRARY_PATH) . 'upload.xajax.php');
+        $xajax_upload = new xajax(api_get_path(WEB_LIBRARY_PATH).'upload.xajax.php');
 
         $xajax_upload->registerFunction('updateProgress');
         // IMPORTANT : must be the first element of the form
-        $el = $this->insertElementBefore(FormValidator::createElement('html', '<input type="hidden" name="UPLOAD_IDENTIFIER" value="' . $upload_id . '" />'), $element_after);
+        $el = $this->insertElementBefore(FormValidator::createElement('html', '<input type="hidden" name="UPLOAD_IDENTIFIER" value="'.$upload_id.'" />'), $element_after);
 
         $this->addElement('html', '<br />');
 
@@ -882,7 +882,7 @@ 
         $this->addElement(
             'html',
             '<div id="dynamic_div_container" style="display:none">
-                <div id="dynamic_div_label">' . get_lang('UploadFile') . '</div>
+                <div id="dynamic_div_label">' . get_lang('UploadFile').'</div>
                 <div id="dynamic_div_frame" style="width:214px; height:12px; border:1px solid grey; background-image:url(' . Display::returnIconPath('real_upload_frame.gif').');">
                     <div id="dynamic_div_filled" style="width:0%;height:100%;background-image:url(' . Display::returnIconPath('real_upload_step.gif').');background-repeat:repeat-x;background-position:center;"></div>
                 </div>
@@ -893,7 +893,7 @@ 
             $this->addElement('html', '
 			<div id="dynamic_div_waiter_container" style="display:none">
 				<div id="dynamic_div_waiter_label">
-					' . get_lang('SlideshowConversion') . '
+					' . get_lang('SlideshowConversion').'
 				</div>
 				<div id="dynamic_div_waiter_frame">
 					'.Display::return_icon('real_upload_frame.gif').'
@@ -903,18 +903,18 @@ 
         }
 
         // Get the xajax code
-        $this->addElement('html', $xajax_upload->getJavascript(api_get_path(WEB_LIBRARY_PATH) . 'xajax'));
+        $this->addElement('html', $xajax_upload->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax'));
 
         // Get the upload code
-        $this->addElement('html', '<script language="javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/upload.js" type="text/javascript"></script>');
-        $this->addElement('html', '<script type="text/javascript">var myUpload = new upload(' . (abs(intval($delay)) * 1000) . ');</script>');
+        $this->addElement('html', '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/upload.js" type="text/javascript"></script>');
+        $this->addElement('html', '<script type="text/javascript">var myUpload = new upload('.(abs(intval($delay)) * 1000).');</script>');
 
         if (!$wait_after_upload) {
             $wait_after_upload = 0;
         }
 
         // Add the upload event
-        $this->updateAttributes("onsubmit=\"javascript: myUpload.startRealUpload('dynamic_div','" . $upload_id . "','" . $this->getAttribute('id') . "'," . $wait_after_upload . ")\"");
+        $this->updateAttributes("onsubmit=\"javascript: myUpload.startRealUpload('dynamic_div','".$upload_id."','".$this->getAttribute('id')."',".$wait_after_upload.")\"");
     }
 
     /**

main/inc/lib/display.lib.php

Spacing +73 added lines, -73 removed lines

@@ -55,7 +55,7 @@ 
      * @param string Optional help file name
      * @param string $page_header
      */
-    public static function display_header($tool_name ='', $help = null, $page_header = null)
+    public static function display_header($tool_name = '', $help = null, $page_header = null)
     {
         $origin = api_get_origin();
         $showHeader = true;
@@ -351,7 +351,7 @@ 
         $grid_class = array(),
         $elementCount = 0
     ) {
-        $column =  0;
+        $column = 0;
         $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20;
 
         $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
@@ -476,7 +476,7 @@ 
      * @param bool	Filter (true) or not (false)
      * @return void
      */
-    public static function display_confirmation_message ($message, $filter = true, $returnValue = false)
+    public static function display_confirmation_message($message, $filter = true, $returnValue = false)
     {
         $message = self::return_message($message, 'confirm', $filter);
         if ($returnValue) {
@@ -493,7 +493,7 @@ 
      * @param bool	Filter (true) or not (false)
      * @return void
      */
-    public static function display_error_message ($message, $filter = true, $returnValue = false)
+    public static function display_error_message($message, $filter = true, $returnValue = false)
     {
         $message = self::return_message($message, 'error', $filter);
         if ($returnValue) {
@@ -508,7 +508,7 @@ 
      * @param string $type
      * @param bool $filter
      */
-    public static function return_message_and_translate($message, $type='normal', $filter = true)
+    public static function return_message_and_translate($message, $type = 'normal', $filter = true)
     {
         $message = get_lang($message);
         echo self::return_message($message, $type, $filter);
@@ -532,7 +532,7 @@ 
         }
 
         $class = "";
-        switch($type) {
+        switch ($type) {
             case 'warning':
                $class .= 'alert alert-warning';
                break;
@@ -560,7 +560,7 @@ 
      * @param string  optional, class from stylesheet
      * @return string encrypted mailto hyperlink
      */
-    public static function encrypted_mailto_link ($email, $clickable_text = null, $style_class = '')
+    public static function encrypted_mailto_link($email, $clickable_text = null, $style_class = '')
     {
         if (is_null($clickable_text)) {
             $clickable_text = $email;
@@ -575,14 +575,14 @@ 
         }
         // Encrypt email
         $hmail = '';
-        for ($i = 0; $i < strlen($email); $i ++) {
+        for ($i = 0; $i < strlen($email); $i++) {
             $hmail .= '&#'.ord($email {
             $i }).';';
         }
         $hclickable_text = null;
         // Encrypt clickable text if @ is present
         if (strpos($clickable_text, '@')) {
-            for ($i = 0; $i < strlen($clickable_text); $i ++) {
+            for ($i = 0; $i < strlen($clickable_text); $i++) {
                 $hclickable_text .= '&#'.ord($clickable_text {
                 $i }).';';
             }
@@ -614,7 +614,7 @@ 
         }
         // Encrypt email
         $hmail = '';
-        for ($i = 0; $i < strlen($email); $i ++) {
+        for ($i = 0; $i < strlen($email); $i++) {
             $hmail .= '&#'.ord($email {
             $i }).';';
         }
@@ -647,7 +647,7 @@ 
     public static function get_alphabet_options($selected_letter = '')
     {
         $result = '';
-        for ($i = 65; $i <= 90; $i ++) {
+        for ($i = 65; $i <= 90; $i++) {
             $letter = chr($i);
             $result .= '<option value="'.$letter.'"';
             if ($selected_letter == $letter) {
@@ -668,7 +668,7 @@ 
     public static function get_numeric_options($min, $max, $selected_num = 0)
     {
         $result = '';
-        for ($i = $min; $i <= $max; $i ++) {
+        for ($i = $min; $i <= $max; $i++) {
             $result .= '<option value="'.$i.'"';
             if (is_int($selected_num))
                 if ($selected_num == $i) {
@@ -740,7 +740,7 @@ 
 
         if (isset($size)) {
             $size = intval($size);
-            $size_extra = $size . '/';
+            $size_extra = $size.'/';
         } else {
             $size = ICON_SIZE_SMALL;
         }
@@ -751,7 +751,7 @@ 
         $theme = 'themes/chamilo/icons/';
 
         if ($loadThemeIcon) {
-            $theme = 'themes/' . api_get_visual_theme() . '/icons/';
+            $theme = 'themes/'.api_get_visual_theme().'/icons/';
             // Checking the theme icons folder example: app/Resources/public/css/themes/chamilo/icons/XXX
             if (is_file($alternateCssPath.$theme.$size_extra.$image)) {
                 $icon = $alternateWebCssPath.$theme.$size_extra.$image;
@@ -768,11 +768,11 @@ 
         // ask for the SVG version directly
         $testServer = api_get_setting('server_type');
         if ($testServer == 'test' && $return_only_path == false) {
-            $svgImage = substr($image, 0, -3) . 'svg';
-            if (is_file($code_path . $theme . 'svg/' . $svgImage)) {
-                $icon = $w_code_path . $theme . 'svg/' . $svgImage;
-            } elseif (is_file($code_path . 'img/icons/svg/' . $svgImage)) {
-                $icon = $w_code_path . 'img/icons/svg/' . $svgImage;
+            $svgImage = substr($image, 0, -3).'svg';
+            if (is_file($code_path.$theme.'svg/'.$svgImage)) {
+                $icon = $w_code_path.$theme.'svg/'.$svgImage;
+            } elseif (is_file($code_path.'img/icons/svg/'.$svgImage)) {
+                $icon = $w_code_path.'img/icons/svg/'.$svgImage;
             }
 
             if (empty($additional_attributes['height'])) {
@@ -852,7 +852,7 @@ 
             }
         }
         //some tags don't have this </XXX>
-        if (in_array($tag, array('img','input','br'))) {
+        if (in_array($tag, array('img', 'input', 'br'))) {
             $return_value = '<'.$tag.' '.$attribute_list.' />';
         } else {
             $return_value = '<'.$tag.' '.$attribute_list.' > '.$content.'</'.$tag.'>';
@@ -905,13 +905,13 @@ 
     public static function input($type, $name, $value, $attributes = array())
     {
          if (isset($type)) {
-             $attributes['type']= $type;
+             $attributes['type'] = $type;
          }
          if (isset($name)) {
-             $attributes['name']= $name;
+             $attributes['name'] = $name;
          }
          if (isset($value)) {
-             $attributes['value']= $value;
+             $attributes['value'] = $value;
         }
         return self::tag('input', '', $attributes);
     }
@@ -944,14 +944,14 @@ 
     ) {
         $html = '';
         $extra = '';
-        $default_id = 'id="' . $name . '" ';
+        $default_id = 'id="'.$name.'" ';
         foreach ($extra_attributes as $key => $parameter) {
             if ($key == 'id') {
                 $default_id = '';
             }
-            $extra .= $key . '="' . $parameter . '" ';
+            $extra .= $key.'="'.$parameter.'" ';
         }
-        $html .= '<select name="' . $name . '" ' . $default_id . ' ' . $extra . '>';
+        $html .= '<select name="'.$name.'" '.$default_id.' '.$extra.'>';
 
         if ($show_blank_item) {
             if (empty($blank_item_text)) {
@@ -959,14 +959,14 @@ 
             } else {
                 $blank_item_text = Security::remove_XSS($blank_item_text);
             }
-            $html .= self::tag('option', '-- ' . $blank_item_text . ' --', array('value' => '-1'));
+            $html .= self::tag('option', '-- '.$blank_item_text.' --', array('value' => '-1'));
         }
         if ($values) {
             foreach ($values as $key => $value) {
                 if (is_array($value) && isset($value['name'])) {
                     $value = $value['name'];
                 }
-                $html .= '<option value="' . $key . '"';
+                $html .= '<option value="'.$key.'"';
 
                 if (is_array($default)) {
                     foreach ($default as $item) {
@@ -981,7 +981,7 @@ 
                     }
                 }
 
-                $html .= '>' . $value . '</option>';
+                $html .= '>'.$value.'</option>';
             }
         }
         $html .= '</select>';
@@ -1007,7 +1007,7 @@ 
      */
     public static function tabs($header_list, $content_list, $id = 'tabs', $attributes = array(), $ul_attributes = array())
     {
-        if (empty($header_list) || count($header_list) == 0 ) {
+        if (empty($header_list) || count($header_list) == 0) {
             return '';
         }
 
@@ -1044,7 +1044,7 @@ 
 
         $main_div = self::tag('div', $ul.self::tag('div', $divs, ['class' => 'tab-content']), $attributes);
 
-        return $main_div ;
+        return $main_div;
     }
 
     /**
@@ -1092,8 +1092,8 @@ 
      */
     public static function grid_html($div_id)
     {
-        $table  = self::tag('table','', array('id' => $div_id));
-        $table .= self::tag('div','', array('id' => $div_id.'_pager'));
+        $table  = self::tag('table', '', array('id' => $div_id));
+        $table .= self::tag('div', '', array('id' => $div_id.'_pager'));
         return $table;
     }
 
@@ -1154,7 +1154,7 @@ 
         $obj->colNames      = $column_names;
         $obj->colModel      = $column_model;
         $obj->pager         = '#'.$div_id.'_pager';
-        $obj->datatype  = 'json';
+        $obj->datatype = 'json';
         $obj->viewrecords = 'true';
 
         $all_value = 10000000;
@@ -1215,10 +1215,10 @@ 
         // Adding static data.
         if (!empty($data)) {
             $data_var = $div_id.'_data';
-            $json.=' var '.$data_var.' = '.json_encode($data).';';
+            $json .= ' var '.$data_var.' = '.json_encode($data).';';
             $obj->data = $data_var;
             $obj->datatype = 'local';
-            $json.="\n";
+            $json .= "\n";
         }
 
         $obj->end = 'end';
@@ -1232,12 +1232,12 @@ 
         }
 
         // Fixing true/false js values that doesn't need the ""
-        $json_encode = str_replace(':"true"',':true',$json_encode);
+        $json_encode = str_replace(':"true"', ':true', $json_encode);
         // wrap_cell is not a valid jqgrid attributes is a hack to wrap a text
         $json_encode = str_replace('"wrap_cell":true', 'cellattr : function(rowId, value, rowObject, colModel, arrData) { return \'class = "jqgrid_whitespace"\'; }', $json_encode);
-        $json_encode = str_replace(':"false"',':false',$json_encode);
+        $json_encode = str_replace(':"false"', ':false', $json_encode);
         $json_encode = str_replace('"formatter":"action_formatter"', 'formatter:action_formatter', $json_encode);
-        $json_encode = str_replace(array('{"first":"first",','"end":"end"}'), '', $json_encode);
+        $json_encode = str_replace(array('{"first":"first",', '"end":"end"}'), '', $json_encode);
 
         // Creating the jqgrid element.
         $json .= '$("#'.$div_id.'").jqGrid({';
@@ -1252,22 +1252,22 @@ 
             $groups = '';
             foreach ($extra_params['groupHeaders'] as $group) {
                 //{ "startColumnName" : "courses", "numberOfColumns" : 1, "titleText" : "Order Info" },
-                $groups .= '{ "startColumnName" : "' . $group['startColumnName'] . '", "numberOfColumns" : ' . $group['numberOfColumns'] . ', "titleText" : "' . $group['titleText']  . '" },';
+                $groups .= '{ "startColumnName" : "'.$group['startColumnName'].'", "numberOfColumns" : '.$group['numberOfColumns'].', "titleText" : "'.$group['titleText'].'" },';
 
             }
             $json .= '$("#'.$div_id.'").jqGrid("setGroupHeaders", {
                 "useColSpanStyle" : false,
                 "groupHeaders"    : [
-                    ' . $groups . '
+                    ' . $groups.'
                 ]
             });';
         }
 
         $all_text = addslashes(get_lang('All'));
         $json .= '$("'.$obj->pager.' option[value='.$all_value.']").text("'.$all_text.'");';
-        $json.= "\n";
+        $json .= "\n";
         // Adding edit/delete icons.
-        $json.= $formatter;
+        $json .= $formatter;
 
         return $json;
     }
@@ -1298,7 +1298,7 @@ 
         }
 
         if (!empty($rows)) {
-	        foreach($rows as $content) {
+	        foreach ($rows as $content) {
 	            $table->setCellContents($row, $column, $content);
                 $row++;
             }
@@ -1460,7 +1460,7 @@ 
 
         // Show all tool icons where there is something new.
         $return = '&nbsp;';
-        foreach($notifications as $notification) {
+        foreach ($notifications as $notification) {
             $lastDate = date('d/m/Y H:i', convert_sql_date($notification['lastedit_date']));
             $type = $notification['lastedit_type'];
             $label = get_lang('TitleNotification').": ".get_lang($type)." ($lastDate)";
@@ -1503,9 +1503,9 @@ 
             $tbl_session            = Database :: get_main_table(TABLE_MAIN_SESSION);
             $active = false;
             // Request for the name of the general coach
-            $sql ='SELECT tu.lastname, tu.firstname, ts.*
+            $sql = 'SELECT tu.lastname, tu.firstname, ts.*
                     FROM '.$tbl_session.' ts
-                    LEFT JOIN '.$main_user_table .' tu
+                    LEFT JOIN '.$main_user_table.' tu
                     ON ts.id_coach = tu.user_id
                     WHERE ts.id = '.intval($session_id);
             $rs = Database::query($sql);
@@ -1515,7 +1515,7 @@ 
             $session = array();
             $session['title'] = $session_info['name'];
             $session['coach'] = '';
-            $session['dates'] =  '';
+            $session['dates'] = '';
 
             if (
                 (
@@ -1597,8 +1597,8 @@ 
                     );
                 }
 
-                if ( api_get_setting('show_session_coach') === 'true' ) {
-                    $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name(
+                if (api_get_setting('show_session_coach') === 'true') {
+                    $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name(
                         $session_info['firstname'],
                         $session_info['lastname']
                     );
@@ -1650,9 +1650,9 @@ 
 		$percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0;
 
 		if (!empty($percentage)) {
-            $percentage = $percentage*125/100;
+            $percentage = $percentage * 125 / 100;
         }
-		$accesses =  isset($point_info['accesses']) ? $point_info['accesses'] : 0;
+		$accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0;
 
 		$star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']);
 
@@ -1667,19 +1667,19 @@ 
 
 		$labels = array();
 
-		$labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
-		$labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits');
+		$labels[] = $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
+		$labels[] = $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits');
 		if (!empty($number_of_users_who_voted)) {
-			$labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5';
+			$labels[] = get_lang('Average').' '.$point_info['point_average_star'].'/5';
 		}
 
-		$labels[]= $point_info['user_vote']  ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] ';
+		$labels[] = $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote').' [?] ';
 
 		if (!$add_div_wrapper && api_is_anonymous()) {
-			$labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));
+			$labels[] = Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));
 		}
 
-        $html .= Display::div(implode(' | ', $labels) , array('id' =>  'vote_label_'.$id, 'class' => 'vote_label_info'));
+        $html .= Display::div(implode(' | ', $labels), array('id' =>  'vote_label_'.$id, 'class' => 'vote_label_info'));
         $html .= ' '.Display::span(' ', array('id' =>  'vote_label2_'.$id));
 
         if ($add_div_wrapper) {
@@ -1757,8 +1757,8 @@ 
         if (!empty($list)) {
             $html = '<dl class="dl-horizontal">';
             foreach ($list as $item) {
-                $html .= '<dt>' . $item['title'] . '</dt>';
-                $html .= '<dd>' . $item['content'] . '</dd>';
+                $html .= '<dt>'.$item['title'].'</dt>';
+                $html .= '<dd>'.$item['content'].'</dd>';
             }
             $html .= '</dl>';
         }
@@ -1800,7 +1800,7 @@ 
      * @param string $type
      * @return null|string
      */
-    public static function badge($count, $type ="warning")
+    public static function badge($count, $type = "warning")
     {
         $class = '';
 
@@ -1876,7 +1876,7 @@ 
         if (!empty($content)) {
             $html = '<span class="label '.$class.'">';
             $html .= $content;
-            $html .='</span>';
+            $html .= '</span>';
         }
 
         return $html;
@@ -1897,7 +1897,7 @@ 
                     $class = 'class ="active"';
                 }
 
-                if (basename($_SERVER['REQUEST_URI']) == basename($value['url']) ) {
+                if (basename($_SERVER['REQUEST_URI']) == basename($value['url'])) {
                     $class = 'class ="active"';
                 }
                 $html .= "<li $class >";
@@ -2113,7 +2113,7 @@ 
      */
     public static function getVCardUserLink($userId)
     {
-        $vCardUrl = api_get_path(WEB_PATH).'main/social/vcard_export.php?userId='.intval($userId);;
+        $vCardUrl = api_get_path(WEB_PATH).'main/social/vcard_export.php?userId='.intval($userId); ;
 
         return $vCardUrl;
     }
@@ -2131,7 +2131,7 @@ 
     {
         $title = !empty($title) ? '<div class="panel-heading"><h3 class="panel-title">'.$title.'</h3>'.$extra.'</div>' : '';
         $footer = !empty($footer) ? '<div class="panel-footer ">'.$footer.'</div>' : '';
-        $styles = ['primary','success','info','warning','danger'];
+        $styles = ['primary', 'success', 'info', 'warning', 'danger'];
         $style = !in_array($style, $styles) ? 'default' : $style;
 
         return '
@@ -2176,7 +2176,7 @@ 
         $attributes['class'] = isset($attributes['class']) ? "$buttonClass {$attributes['class']}" : $buttonClass;
 
         if (!$includeText) {
-            $text = '<span class="sr-only">' . $text . '</span>';
+            $text = '<span class="sr-only">'.$text.'</span>';
         }
 
         return self::url("$icon $text", $url, $attributes);
@@ -2191,16 +2191,16 @@ 
      */
     public static function toolbarAction($id, $content = array(), $col = 2, $right = true)
     {
-        $columns = 12/$col;
+        $columns = 12 / $col;
         $html = '';
-        $html .= '<div id="' . $id . '" class="actions">';
+        $html .= '<div id="'.$id.'" class="actions">';
         $html .= '<div class="row">';
         if ($col > 4) {
             $html = '<div class="alert alert-warning" role="alert">Action toolbar design does not work when exceeding four columns - check Display::toolbarAction()</div>';
         } else {
-            for ( $i = 0; $i < $col; $i++ ) {
-                $html .= '<div class="col-md-' . $columns . '">';
-                if ( $col == 2 && $i == 1 ) {
+            for ($i = 0; $i < $col; $i++) {
+                $html .= '<div class="col-md-'.$columns.'">';
+                if ($col == 2 && $i == 1) {
                     if ($right === true) {
                         $html .= '<div class="pull-right">';
                         $html .= (isset($content[$i]) ? $content[$i] : '');
@@ -2315,9 +2315,9 @@ 
             $params['class'] = 'panel panel-default';
             $html = null;
             if (!empty($title)) {
-                $html .= '<div class="panel-heading">'.$title.'</div>' . PHP_EOL;
+                $html .= '<div class="panel-heading">'.$title.'</div>'.PHP_EOL;
             }
-            $html.= '<div class="panel-body">'.$content.'</div>' . PHP_EOL;
+            $html .= '<div class="panel-body">'.$content.'</div>'.PHP_EOL;
             $html = Display::div($html, $params);
         }
         return $html;

main/document/slideshow.php

Indentation +279 added lines, -279 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Patrick Cool patrick.cool@UGent.be Ghent University Mai 2004
- * @author Julio Montoya Lots of improvements, cleaning, adding security
- * @author Juan Carlos Raña Trabado herodoto@telefonica.net	January 2008
- * @package chamilo.document
- */
+     * @author Patrick Cool patrick.cool@UGent.be Ghent University Mai 2004
+     * @author Julio Montoya Lots of improvements, cleaning, adding security
+     * @author Juan Carlos Raña Trabado herodoto@telefonica.net	January 2008
+     * @package chamilo.document
+     */
 require_once '../inc/global.inc.php';
 api_protect_course_script();
 
@@ -15,15 +15,15 @@ 
 $slide_id = isset($_GET['slide_id']) ? Security::remove_XSS($_GET['slide_id']) : null;
 
 if (empty($slide_id)) {
-	$edit_slide_id = 1;
+    $edit_slide_id = 1;
 } else {
-	$edit_slide_id = $slide_id;
+    $edit_slide_id = $slide_id;
 }
 
 if ($path != '/') {
-	$folder = $path.'/';
+    $folder = $path.'/';
 } else {
-	$folder = '/';
+    $folder = '/';
 }
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 
@@ -41,15 +41,15 @@ 
 
 // Loading the slides from the session
 if (isset($_SESSION['image_files_only'])) {
-	$image_files_only = $_SESSION['image_files_only'];
+    $image_files_only = $_SESSION['image_files_only'];
 }
 
 // Calculating the current slide, next slide, previous slide and the number of slides
 $slide = null;
 if ($slide_id != 'all') {
-	$slide = $slide_id ? $slide_id : 0;
-	$previous_slide = $slide - 1;
-	$next_slide = $slide + 1;
+    $slide = $slide_id ? $slide_id : 0;
+    $previous_slide = $slide - 1;
+    $next_slide = $slide + 1;
 }
 $total_slides = count($image_files_only);
 ?>
@@ -62,62 +62,62 @@ 
 <?php
 
 if ($slide_id != 'all') {
-	$image = null;
-	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
-	}
-	if (file_exists($image)) {
-		echo '<div class="actions-pagination">';
-
-		// Back forward buttons
-		if ($slide == 0) {
-			$imgp = 'action_prev_na.png';
-			$first = Display::return_icon('action_first_na.png');
-		} else {
-			$imgp = 'action_prev.png';
-			$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
+    $image = null;
+    if (isset($image_files_only[$slide])) {
+        $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+    }
+    if (file_exists($image)) {
+        echo '<div class="actions-pagination">';
+
+        // Back forward buttons
+        if ($slide == 0) {
+            $imgp = 'action_prev_na.png';
+            $first = Display::return_icon('action_first_na.png');
+        } else {
+            $imgp = 'action_prev.png';
+            $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
 			          '.Display::return_icon('action_first.png', get_lang('FirstSlide')).'
 			          </a>';
-		}
+        }
 
-		// First slide
-		echo $first;
+        // First slide
+        echo $first;
 
-		// Previous slide
-		if ($slide > 0) {
-			echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
-		}
+        // Previous slide
+        if ($slide > 0) {
+            echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
+        }
 
         echo Display::return_icon($imgp, get_lang('Previous'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Divider
-		echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
-
-		// Next slide
-		if ($slide < $total_slides - 1) {
-			echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
-		}
-		if ($slide == $total_slides - 1) {
-			$imgn = 'action_next_na.png';
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Divider
+        echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
+
+        // Next slide
+        if ($slide < $total_slides - 1) {
+            echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
+        }
+        if ($slide == $total_slides - 1) {
+            $imgn = 'action_next_na.png';
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
-		} else {
-			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+        } else {
+            $imgn = 'action_next.png';
+            $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
-		}
+        }
         echo Display::return_icon($imgn, get_lang('Next'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Last slide
-		echo $last;
-		echo '</div>';
-	}
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Last slide
+        echo $last;
+        echo '</div>';
+    }
 }
 
 // Exit the slideshow
@@ -126,10 +126,10 @@ 
 
 // Show thumbnails
 if ($slide_id != 'all') {
-	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
+    echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
         Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+    echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
@@ -142,24 +142,24 @@ 
 
 // If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options
 if (isset($_POST['Submit'])) {
-	// We come from slideshowoptions.php
-	//$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
-	$_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
-	if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
-		//echo "resizing";
-		$_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
-		$_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
-	} else {
-		//echo "unsetting the session heighte and width";
-		$_SESSION["image_resizing_width"] = null;
-		$_SESSION["image_resizing_height"] = null;
-	}
+    // We come from slideshowoptions.php
+    //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
+    $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
+    if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
+        //echo "resizing";
+        $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
+        $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
+    } else {
+        //echo "unsetting the session heighte and width";
+        $_SESSION["image_resizing_width"] = null;
+        $_SESSION["image_resizing_height"] = null;
+    }
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
 if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
-	$target_width = $_SESSION["image_resizing_width"];
-	$target_height = $_SESSION["image_resizing_height"];
+    $target_width = $_SESSION["image_resizing_width"];
+    $target_height = $_SESSION["image_resizing_height"];
 }
 
 /*	THUMBNAIL VIEW */
@@ -169,59 +169,59 @@ 
 $html = '';
 if ($slide_id == 'all') {
 
-	// Config for make thumbnails
+    // Config for make thumbnails
     $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
-	$max_thumbnail_width     = 250;
-	$max_thumbnail_height    = 250;
-	$png_compression	     = 0; // 0(none)-9
-	$jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
+    $max_thumbnail_width     = 250;
+    $max_thumbnail_height    = 250;
+    $png_compression	     = 0; // 0(none)-9
+    $jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
 
-	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
+    $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
-	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
-	$thumbnail_height_frame = $max_thumbnail_height;
+    //Other parameters only for show tumbnails
+    $row_items 			     = 4;//only in slideshow.php
+    $number_image 			 = 7;//num icons cols to show
+    $thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
+    $thumbnail_height_frame = $max_thumbnail_height;
 
-	// Create the template_thumbnails folder (if no exist)
+    // Create the template_thumbnails folder (if no exist)
 
-	if (!file_exists($directory_thumbnails)) {
-		@mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
+    if (!file_exists($directory_thumbnails)) {
+        @mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
     }
 
-	// check files and thumbnails
-	if (is_array($image_files_only)) {
+    // check files and thumbnails
+    if (is_array($image_files_only)) {
 
-		foreach ($image_files_only as $one_image_file) {
-			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+        foreach ($image_files_only as $one_image_file) {
+            $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
+            $image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
 
-			if (file_exists($image)) {
-				//check thumbnail
-				$imagetype = explode(".", $image);
+            if (file_exists($image)) {
+                //check thumbnail
+                $imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+                $imagetype = strtolower($imagetype[count($imagetype)-1]);
 
-				if (in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+                if (in_array($imagetype,$allowed_thumbnail_types)) {
+                    if (!file_exists($image_thumbnail)){
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
-						$original_image_size = api_getimagesize($image);
-
-						switch($imagetype) {
-							case 'gif':
-								$source_img = imagecreatefromgif($image);
-								break;
-							case 'jpg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'jpeg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'png':
-								$source_img = imagecreatefrompng($image);
-								break;
-						}
+                        $original_image_size = api_getimagesize($image);
+
+                        switch($imagetype) {
+                            case 'gif':
+                                $source_img = imagecreatefromgif($image);
+                                break;
+                            case 'jpg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'jpeg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'png':
+                                $source_img = imagecreatefrompng($image);
+                                break;
+                        }
 
                         $new_thumbnail_size = api_calculate_image_size(
                             $original_image_size['width'],
@@ -229,33 +229,33 @@ 
                             $max_thumbnail_width,
                             $max_thumbnail_height
                         );
-						if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
-						}
-
-						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
-
-						// preserve transparency
-						if ($imagetype == "png"){
-							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
-							imagefill($crop, 0, 0, $color);
-						}
-
-						if ($imagetype == "gif") {
-							$transindex = imagecolortransparent($source_img);
+                        if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
+                            $new_thumbnail_size['width']=$original_image_size['width'];
+                            $new_thumbnail_size['height']=$original_image_size['height'];
+                        }
+
+                        $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
+
+                        // preserve transparency
+                        if ($imagetype == "png"){
+                            imagesavealpha($crop, true);
+                            $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+                            imagefill($crop, 0, 0, $color);
+                        }
+
+                        if ($imagetype == "gif") {
+                            $transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
-							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
-								 $transcol = imagecolorsforindex($source_img, $transindex);
-								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
-								 imagefill($crop, 0, 0, $transindex);
-								 imagecolortransparent($crop, $transindex);
-							 }
-						}
-
-						//resampled image
+                                //GIF89a for transparent and anim (first clip), either GIF87a
+                                if ($transindex >= 0 && $transindex < $palletsize){
+                                    $transcol = imagecolorsforindex($source_img, $transindex);
+                                    $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
+                                    imagefill($crop, 0, 0, $transindex);
+                                    imagecolortransparent($crop, $transindex);
+                                }
+                        }
+
+                        //resampled image
                         imagecopyresampled(
                             $crop,
                             $source_img,
@@ -269,69 +269,69 @@ 
                             $original_image_size['height']
                         );
 
-						switch ($imagetype) {
-							case 'gif':
-								imagegif($crop,$image_thumbnail);
-								break;
-							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
-								break;
-						}
-
-						//clean memory
-						imagedestroy($crop);
-					}//end !exist thumbnail
-
-					//show thumbnail and link
-
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
-					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
-				} else {
-					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+                        switch ($imagetype) {
+                            case 'gif':
+                                imagegif($crop,$image_thumbnail);
+                                break;
+                            case 'jpg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'jpeg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'png':
+                                imagepng($crop,$image_thumbnail,$png_compression);
+                                break;
+                        }
+
+                        //clean memory
+                        imagedestroy($crop);
+                    }//end !exist thumbnail
+
+                    //show thumbnail and link
+
+                    $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
+                    $image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
+                } else {
+                    //if images aren't support by gd (not gif, jpg, jpeg, png)
+                    if ($imagetype=="bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
-						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
-							$image_height = $thumbnail_size['height'];
-							$image_width  = $thumbnail_size['width'];
-						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
-						}
-					} else {
-						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
-					}
-
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
-					$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
-
-				}//end allowed image types
-			}//end if exist file image
-		}//end foreach
-	}//end image files only
-
-	// Creating the table
-	$html_table = '';
-
-	$i = 0;
-	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
-	$p = 0;
+                        $original_image_size = getimagesize($image);
+                        if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
+                            $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+                            $image_height = $thumbnail_size['height'];
+                            $image_width  = $thumbnail_size['width'];
+                        } else {
+                            $image_height=$original_image_size[0];
+                            $image_width=$original_image_size[1];
+                        }
+                    } else {
+                        //example for svg files,...
+                        $image_width=$max_thumbnail_width;
+                        $image_height=$max_thumbnail_height;
+                    }
+
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
+                    $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
+
+                }//end allowed image types
+            }//end if exist file image
+        }//end foreach
+    }//end image files only
+
+    // Creating the table
+    $html_table = '';
+
+    $i = 0;
+    $count_image = count($image_tag);
+    $number_iteration = ceil($count_image/$number_image);
+    $p = 0;
     $html = '';
     $html .= '<div class="gallery">';
-	for ($k = 0; $k < $number_iteration; $k++) {
-		for ($i = 0; $i < $number_image; $i++) {
-			if (isset($image_tag[$p])) {
+    for ($k = 0; $k < $number_iteration; $k++) {
+        for ($i = 0; $i < $number_image; $i++) {
+            if (isset($image_tag[$p])) {
                             $html .= '<div class="col-xs-6 col-sm-3 col-md-2">';
                             $html .= '<div class="canvas-one">';
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
@@ -343,10 +343,10 @@ 
                             $html .= '</a>';
                             $html .= '</div>';
                             $html .= '</div>';
-			}
-			$p++;
-		}
-	}
+            }
+            $p++;
+        }
+    }
     $html .= '</div>';
 
 }//end slide==all
@@ -357,45 +357,45 @@ 
 // This is for viewing all the images in the slideshow one at a time.
 
 if ($slide_id != 'all' && !empty($image_files_only)) {
-	if (file_exists($image) && is_file($image)) {
-		$image_height_width = resize_image($image, $target_width, $target_height);
-
-		$image_height = $image_height_width[0];
-		$image_width = $image_height_width[1];
-
-		$height_width_tags = null;
-		if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
-			$height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
-		}
-
-		// This is done really quickly and should be cleaned up a little bit using the API functions
-		$tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
-		if ($path == '/') {
-			$pathpart = '/';
-		} else {
-			$pathpart = $path.'/';
-		}
-		$sql = "SELECT * FROM $tbl_documents
+    if (file_exists($image) && is_file($image)) {
+        $image_height_width = resize_image($image, $target_width, $target_height);
+
+        $image_height = $image_height_width[0];
+        $image_width = $image_height_width[1];
+
+        $height_width_tags = null;
+        if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
+            $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
+        }
+
+        // This is done really quickly and should be cleaned up a little bit using the API functions
+        $tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
+        if ($path == '/') {
+            $pathpart = '/';
+        } else {
+            $pathpart = $path.'/';
+        }
+        $sql = "SELECT * FROM $tbl_documents
 		        WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
-
-		echo '<table align="center" border="0" cellspacing="10">';
-		echo '<tr>';
-		echo '<td id="td_image" align="center">';
-		if ($slide < $total_slides - 1 && $slide_id != 'all') {
-			echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
-		} else {
-			echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
-		}
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        echo '<table align="center" border="0" cellspacing="10">';
+        echo '<tr>';
+        echo '<td id="td_image" align="center">';
+        if ($slide < $total_slides - 1 && $slide_id != 'all') {
+            echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
+        } else {
+            echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
+        }
         if ($path == '/') {
-        	$path = '';
+            $path = '';
         }
 
-		list($width, $height) = getimagesize($image);
-		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
-		?>
+        list($width, $height) = getimagesize($image);
+        // Auto resize
+        if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+        ?>
 
 		<script type="text/javascript">
 			var initial_width='<?php echo $width; ?>';
@@ -448,30 +448,30 @@ 
 
 		</script>
     <?php
-		} else {
-			echo "<img src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
-		}
-
-		echo '</a>';
-		echo '</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>';
-		echo $row['comment'];
-		echo '</td>';
+        } else {
+            echo "<img src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
+        }
+
+        echo '</a>';
+        echo '</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>';
+        echo $row['comment'];
+        echo '</td>';
 
         echo '<tr>';
         echo '<td style="padding:10px;" align="center">';
         echo Display::tag('h3', $row['title']);
         echo '</td>';
         echo '</tr>';
-		echo '</tr>';
-		echo '</table>';
+        echo '</tr>';
+        echo '</table>';
 
-		echo '<table align="center" border="0">';
-		if (api_is_allowed_to_edit(null, true)) {
-			$aux = explode('.', htmlspecialchars($image_files_only[$slide]));
-			$ext = $aux[count($aux) - 1];
+        echo '<table align="center" border="0">';
+        if (api_is_allowed_to_edit(null, true)) {
+            $aux = explode('.', htmlspecialchars($image_files_only[$slide]));
+            $ext = $aux[count($aux) - 1];
 
             if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
                 $resize_info = get_lang('Resizing').'<br />';
@@ -483,8 +483,8 @@ 
                 $resize_height = get_lang('Auto');
             } else {
                 $resize_info = get_lang('NoResizing').'<br />';
-				$resize_width = '';
-				$resize_height = '';
+                $resize_width = '';
+                $resize_height = '';
             }
 
             echo '<tr>';
@@ -492,25 +492,25 @@ 
             echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$row['id'].'&origin=slideshow&origin_opt='.$edit_slide_id.'&">
 			      <img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="'.get_lang('Modify').'" /></a><br />';
 
-			echo $image_files_only[$slide].' <br />';
-			echo $width.' x '.$height.' <br />';
-			echo round((filesize($image)/1024), 2).' KB';
-			echo ' - '.$ext;
-			echo '</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td align="center">';
-			echo $resize_info;
-			echo $resize_width;
-			echo $resize_height;
-			echo '</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-
-	} else {
-		Display::display_warning_message(get_lang('FileNotFound'));
-	}
+            echo $image_files_only[$slide].' <br />';
+            echo $width.' x '.$height.' <br />';
+            echo round((filesize($image)/1024), 2).' KB';
+            echo ' - '.$ext;
+            echo '</td>';
+            echo '</tr>';
+            echo '<tr>';
+            echo '<td align="center">';
+            echo $resize_info;
+            echo $resize_width;
+            echo $resize_height;
+            echo '</td>';
+            echo '</tr>';
+        }
+        echo '</table>';
+
+    } else {
+        Display::display_warning_message(get_lang('FileNotFound'));
+    }
 } else {
     if ($slide_id != 'all') {
         Display::display_warning_message(get_lang('NoDataAvailable'));

Spacing +41 added lines, -41 removed lines

@@ -64,7 +64,7 @@ 
 if ($slide_id != 'all') {
 	$image = null;
 	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+		$image = $sys_course_path.$_course['path'].'/document'.$folder.$image_files_only[$slide];
 	}
 	if (file_exists($image)) {
 		echo '<div class="actions-pagination">';
@@ -105,7 +105,7 @@ 
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
 		} else {
 			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+			$last = '<a href="slideshow.php?slide_id='.($total_slides - 1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
 		}
@@ -122,18 +122,18 @@ 
 
 // Exit the slideshow
 echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 
 // Show thumbnails
 if ($slide_id != 'all') {
 	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-        Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('thumbnails.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+	echo Display::return_icon('thumbnails_na.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-    Display::return_icon('settings.png', get_lang('SetSlideshowOptions'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('settings.png', get_lang('SetSlideshowOptions'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</div>';
 echo '<br />';
@@ -157,7 +157,7 @@ 
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
-if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
+if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == "resizing") {
 	$target_width = $_SESSION["image_resizing_width"];
 	$target_height = $_SESSION["image_resizing_height"];
 }
@@ -165,7 +165,7 @@ 
 /*	THUMBNAIL VIEW */
 
 // This is for viewing all the images in the slideshow as thumbnails.
-$image_tag = array ();
+$image_tag = array();
 $html = '';
 if ($slide_id == 'all') {
 
@@ -174,14 +174,14 @@ 
 	$max_thumbnail_width     = 250;
 	$max_thumbnail_height    = 250;
 	$png_compression	     = 0; // 0(none)-9
-	$jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
+	$jpg_quality = 75; // from 0 to 100 (default is 75). More quality less compression
 
 	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
 	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
+	$row_items = 4; //only in slideshow.php
+	$number_image = 7; //num icons cols to show
+	$thumbnail_width_frame = $max_thumbnail_width; //optional $max_thumbnail_width+x
 	$thumbnail_height_frame = $max_thumbnail_height;
 
 	// Create the template_thumbnails folder (if no exist)
@@ -195,20 +195,20 @@ 
 
 		foreach ($image_files_only as $one_image_file) {
 			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+			$image_thumbnail = $directory_thumbnails.'.'.$one_image_file;
 
 			if (file_exists($image)) {
 				//check thumbnail
 				$imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+				$imagetype = strtolower($imagetype[count($imagetype) - 1]);
 
-				if (in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+				if (in_array($imagetype, $allowed_thumbnail_types)) {
+					if (!file_exists($image_thumbnail)) {
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
 						$original_image_size = api_getimagesize($image);
 
-						switch($imagetype) {
+						switch ($imagetype) {
 							case 'gif':
 								$source_img = imagecreatefromgif($image);
 								break;
@@ -229,17 +229,17 @@ 
                             $max_thumbnail_width,
                             $max_thumbnail_height
                         );
-						if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
+						if ($max_thumbnail_width > $original_image_size['width'] && $max_thumbnail_height > $original_image_size['height']) {
+							$new_thumbnail_size['width'] = $original_image_size['width'];
+							$new_thumbnail_size['height'] = $original_image_size['height'];
 						}
 
 						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
 
 						// preserve transparency
-						if ($imagetype == "png"){
+						if ($imagetype == "png") {
 							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+							$color = imagecolorallocatealpha($crop, 0x00, 0x00, 0x00, 127);
 							imagefill($crop, 0, 0, $color);
 						}
 
@@ -247,7 +247,7 @@ 
 							$transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
 							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
+							 if ($transindex >= 0 && $transindex < $palletsize) {
 								 $transcol = imagecolorsforindex($source_img, $transindex);
 								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
 								 imagefill($crop, 0, 0, $transindex);
@@ -271,16 +271,16 @@ 
 
 						switch ($imagetype) {
 							case 'gif':
-								imagegif($crop,$image_thumbnail);
+								imagegif($crop, $image_thumbnail);
 								break;
 							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
+								imagejpeg($crop, $image_thumbnail, $jpg_quality);
 								break;
 							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
+								imagejpeg($crop, $image_thumbnail, $jpg_quality);
 								break;
 							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
+								imagepng($crop, $image_thumbnail, $png_compression);
 								break;
 						}
 
@@ -290,26 +290,26 @@ 
 
 					//show thumbnail and link
 
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+					$one_image_thumbnail_file = '.thumbs/.'.$one_image_file; //get path thumbnail
 					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
 					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
 				} else {
 					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+					if ($imagetype == "bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
 						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+						if ($max_thumbnail_width < $original_image_size[0] || $max_thumbnail_height < $original_image_size[1]) {
+							$thumbnail_size = api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height); //don't use resize_image because doesn't run with bmp files
 							$image_height = $thumbnail_size['height'];
 							$image_width  = $thumbnail_size['width'];
 						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
+							$image_height = $original_image_size[0];
+							$image_width = $original_image_size[1];
 						}
 					} else {
 						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
+						$image_width = $max_thumbnail_width;
+						$image_height = $max_thumbnail_height;
 					}
 
 					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
@@ -325,7 +325,7 @@ 
 
 	$i = 0;
 	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
+	$number_iteration = ceil($count_image / $number_image);
 	$p = 0;
     $html = '';
     $html .= '<div class="gallery">';
@@ -337,7 +337,7 @@ 
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
                             $html .= '<div class="frame">';
                             $html .= '<div class="photo">';
-                            $html .=  $image_tag[$p];
+                            $html .= $image_tag[$p];
                             $html .= '</div>';
                             $html .= '</div>';
                             $html .= '</a>';
@@ -394,7 +394,7 @@ 
 
 		list($width, $height) = getimagesize($image);
 		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+		if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == 'resizing') {
 		?>
 
 		<script type="text/javascript">
@@ -411,7 +411,7 @@ 
 				start_height=initial_height;
 			}
 
-			document.write('<img id="image"  src="<?php echo  'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'"  border="0"  alt="<?php echo $image_files_only[$slide] ;?>">');
+			document.write('<img id="image"  src="<?php echo  'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'"  border="0"  alt="<?php echo $image_files_only[$slide]; ?>">');
 
 			function resizeImage() {
 
@@ -477,7 +477,7 @@ 
                 $resize_info = get_lang('Resizing').'<br />';
                 $resize_width = $_SESSION["image_resizing_width"].' x ';
                 $resize_height = $_SESSION['image_resizing_height'];
-            } elseif (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] != 'noresizing'){
+            } elseif (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] != 'noresizing') {
                 $resize_info = get_lang('Resizing').'<br />';
                 $resize_width = get_lang('Auto').' x ';
                 $resize_height = get_lang('Auto');
@@ -494,7 +494,7 @@ 
 
 			echo $image_files_only[$slide].' <br />';
 			echo $width.' x '.$height.' <br />';
-			echo round((filesize($image)/1024), 2).' KB';
+			echo round((filesize($image) / 1024), 2).' KB';
 			echo ' - '.$ext;
 			echo '</td>';
 			echo '</tr>';

main/document/create_paint.php

Indentation +13 added lines, -13 removed lines

@@ -50,26 +50,26 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
@@ -97,7 +97,7 @@ 
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
+    DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
 ) {
     api_not_allowed(true);
 }
@@ -114,7 +114,7 @@ 
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
-	$interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
+    $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
     foreach ($document_data['parents'] as $document_sub_data) {
         $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
@@ -147,17 +147,17 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
+        @file_put_contents($path_and_file, $crossdomain);
+    }
     $credentials = "true";
 } else {
     $credentials = "false";

Spacing +15 added lines, -15 removed lines

@@ -129,27 +129,27 @@
 
 // pixlr
 // max size 1 Mb ??
-$title = urlencode(utf8_encode(get_lang('NewImage')));//TODO:check
+$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check
 //
 $image = Display::returnIconPath('canvas1024x768.png');
 //
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-$langpixlr  = api_get_language_isocode();
+$langpixlr = api_get_language_isocode();
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
-
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
-$_SESSION['exit_pixlr']=$document_data['path'];
-$referrer="Chamilo";
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
-$target=$target_path;
-$locktarget="true";
-$locktitle="false";
-
-if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
+
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
+$_SESSION['exit_pixlr'] = $document_data['path'];
+$referrer = "Chamilo";
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
+$target = $target_path;
+$locktarget = "true";
+$locktitle = "false";
+
+if ($_SERVER['HTTP_HOST'] == "localhost") {
+	$path_and_file = api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
 	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+		$crossdomain = '<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />