@@ -3529,7 +3537,6 @@ class DocumentManager
}
$return .= '
';
-
if ($add_move_button) {
$return .= '
';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), [], ICON_SIZE_TINY);
@@ -3576,22 +3583,7 @@ class DocumentManager
return null;
}
- //trad some titles
- /*
- if ($key == 'images') {
- $key = get_lang('Images');
- } elseif ($key == 'gallery') {
- $key = get_lang('Gallery');
- } elseif ($key == 'flash') {
- $key = get_lang('Flash');
- } elseif ($key == 'audio') {
- $key = get_lang('Audio');
- } elseif ($key == 'video') {
- $key = get_lang('Video');
- }*/
-
$onclick = '';
-
// if in LP, hidden folder are displayed in grey
$folder_class_hidden = '';
if ($lp_id) {
@@ -4143,12 +4135,7 @@ class DocumentManager
$formatTypesList = [];
$formatTypes = ['text', 'spreadsheet', 'presentation', 'drawing'];
foreach ($formatTypes as $formatType) {
- if (
- in_array(
- $extension,
- self::getJodconverterExtensionList($mode, $formatType)
- )
- ) {
+ if (in_array($extension, self::getJodconverterExtensionList($mode, $formatType))) {
$formatTypesList[] = $formatType;
}
}
@@ -5722,12 +5709,12 @@ class DocumentManager
/**
* Creates the row of edit icons for a file/folder
- *
- * @param string $curdirpath current path (cfr open folder)
- * @param string $type (file/folder)
- * @param string $path dbase path of file/folder
+ * @param array $document_data
+ * @param int $id
+ * @param bool $is_template
+ * @param int $is_read_only
* @param int $visibility (1/0)
- * @param int $id dbase id of the document
+ *
* @return string html img tags with hyperlinks
*/
public static function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, $visibility)
@@ -5978,7 +5965,7 @@ class DocumentManager
$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.'"';
+ WHERE c_id = '.$course_id.' AND path LIKE BINARY "'.$tmp_path.'"';
$rs = Database::query($sql);
$tmp_title = '/'.Database::result($rs, 0, 0);
$path_displayed .= $tmp_title;
@@ -6028,15 +6015,15 @@ class DocumentManager
/**
* Checks whether the user is into any user shared folder
* @param string $path
- * @param int $current_session_id
+ * @param int $sessionId
* @return bool Return true when user is in any user shared folder
*/
- public static function is_any_user_shared_folder($path, $current_session_id)
+ public static function is_any_user_shared_folder($path, $sessionId)
{
$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_'.$sessionId.'/sf_user_')) {
return true;
} else {
return false;
@@ -6121,16 +6108,16 @@ class DocumentManager
* Checks whether the user is into his shared folder or into a subfolder
* @param int $user_id
* @param string $path
- * @param int $current_session_id
+ * @param int $sessionId
* @return bool Return true when user is in his user shared folder or into a subfolder
*/
- public static function is_my_shared_folder($user_id, $path, $current_session_id)
+ public static function is_my_shared_folder($user_id, $path, $sessionId)
{
$clean_path = Security::remove_XSS($path).'/';
//for security does not remove the last slash
$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_'.$sessionId.'\/sf_user_'.$user_id.'\//';
if (preg_match($main_user_shared_folder, $clean_path)) {
return true;
@@ -6172,7 +6159,7 @@ class DocumentManager
/*
//TODO: make a admin switch to strict mode
- 1. global default $allowed_extensions only: 'htm', 'html', 'xhtml', 'gif', 'jpg', 'jpeg', 'png', 'bmp', 'txt', 'log'
+ 1. global default $allowed_extensions
if (in_array($file_extension, $allowed_extensions)) { // Assignment + a logical check.
return true;
}
@@ -6180,7 +6167,8 @@ class DocumentManager
3. check plugins: quicktime, mediaplayer, vlc, acrobat, flash, java
*/
- if (!($result = in_array($file_extension, $allowed_extensions))) { // Assignment + a logical check.
+ if (!($result = in_array($file_extension, $allowed_extensions))) {
+ // Assignment + a logical check.
return false;
}
@@ -6469,7 +6457,9 @@ class DocumentManager
$new_path = Database::escape_string($new_path);
$query = "UPDATE $dbTable SET
path = CONCAT('".$new_path."', SUBSTRING(path, LENGTH('".$old_path."')+1) )
- WHERE c_id = $course_id AND (path LIKE BINARY '".$old_path."' OR path LIKE BINARY '".$old_path."/%')";
+ WHERE
+ c_id = $course_id AND
+ (path LIKE BINARY '".$old_path."' OR path LIKE BINARY '".$old_path."/%')";
Database::query($query);
break;
}