@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | //make some vars |
| 35 | 35 | $webcamdir=$dir; |
| 36 | 36 | if($webcamdir=="/"){ |
| 37 | - $webcamdir=""; |
|
| 37 | + $webcamdir=""; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -43,49 +43,49 @@ discard block |
||
| 43 | 43 | // Please, do not modify this dirname formatting |
| 44 | 44 | |
| 45 | 45 | if (strstr($dir, '..')) { |
| 46 | - $dir = '/'; |
|
| 46 | + $dir = '/'; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | if ($dir[0] == '.') { |
| 50 | - $dir = substr($dir, 1); |
|
| 50 | + $dir = substr($dir, 1); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if ($dir[0] != '/') { |
| 54 | - $dir = '/'.$dir; |
|
| 54 | + $dir = '/'.$dir; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | if ($dir[strlen($dir) - 1] != '/') { |
| 58 | - $dir .= '/'; |
|
| 58 | + $dir .= '/'; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
| 62 | 62 | |
| 63 | 63 | if (!is_dir($filepath)) { |
| 64 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 65 | - $dir = '/'; |
|
| 64 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 65 | + $dir = '/'; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $groupId = api_get_group_id(); |
| 69 | 69 | |
| 70 | 70 | if (!empty($groupId)) { |
| 71 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
| 72 | - $noPHP_SELF = true; |
|
| 73 | - $group = GroupManager :: get_group_properties($groupId); |
|
| 74 | - $path = explode('/', $dir); |
|
| 75 | - if ('/'.$path[1] != $group['directory']) { |
|
| 76 | - api_not_allowed(true); |
|
| 77 | - } |
|
| 71 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
| 72 | + $noPHP_SELF = true; |
|
| 73 | + $group = GroupManager :: get_group_properties($groupId); |
|
| 74 | + $path = explode('/', $dir); |
|
| 75 | + if ('/'.$path[1] != $group['directory']) { |
|
| 76 | + api_not_allowed(true); |
|
| 77 | + } |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | $interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
| 81 | 81 | |
| 82 | 82 | if (!$is_allowed_in_course) { |
| 83 | - api_not_allowed(true); |
|
| 83 | + api_not_allowed(true); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
| 87 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
| 88 | - api_not_allowed(true); |
|
| 87 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
| 88 | + api_not_allowed(true); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /* Header */ |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | $display_dir = $dir; |
| 95 | 95 | if (isset ($group)) { |
| 96 | - $display_dir = explode('/', $dir); |
|
| 97 | - unset ($display_dir[0]); |
|
| 98 | - unset ($display_dir[1]); |
|
| 99 | - $display_dir = implode('/', $display_dir); |
|
| 96 | + $display_dir = explode('/', $dir); |
|
| 97 | + unset ($display_dir[0]); |
|
| 98 | + unset ($display_dir[1]); |
|
| 99 | + $display_dir = implode('/', $display_dir); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | // Interbreadcrumb for the current directory root path |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | Display :: display_header($nameTools, 'Doc'); |
| 122 | 122 | echo '<div class="actions">'; |
| 123 | 123 | echo '<a href="document.php?id='.$document_id.'">'. |
| 124 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 124 | + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | 125 | echo '</div>'; |
| 126 | 126 | ?> |
| 127 | 127 | |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | $dir = $document_data['path']; |
| 33 | 33 | |
| 34 | 34 | //make some vars |
| 35 | -$webcamdir=$dir; |
|
| 36 | -if($webcamdir=="/"){ |
|
| 37 | - $webcamdir=""; |
|
| 35 | +$webcamdir = $dir; |
|
| 36 | +if ($webcamdir == "/") { |
|
| 37 | + $webcamdir = ""; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $groupId = api_get_group_id(); |
| 69 | 69 | |
| 70 | 70 | if (!empty($groupId)) { |
| 71 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
| 71 | + $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
| 72 | 72 | $noPHP_SELF = true; |
| 73 | 73 | $group = GroupManager :: get_group_properties($groupId); |
| 74 | 74 | $path = explode('/', $dir); |
@@ -77,14 +77,14 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | -$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
| 80 | +$interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
| 81 | 81 | |
| 82 | 82 | if (!$is_allowed_in_course) { |
| 83 | 83 | api_not_allowed(true); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
| 87 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
| 87 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) { |
|
| 88 | 88 | api_not_allowed(true); |
| 89 | 89 | } |
| 90 | 90 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | // Interbreadcrumb for the current directory root path |
| 103 | 103 | $counter = 0; |
| 104 | 104 | if (isset($document_data['parents'])) { |
| 105 | - foreach($document_data['parents'] as $document_sub_data) { |
|
| 105 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
| 106 | 106 | //fixing double group folder in breadcrumb |
| 107 | 107 | if (api_get_group_id()) { |
| 108 | 108 | if ($counter == 0) { |
@@ -116,12 +116,12 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | //make some vars |
| 119 | -$webcamuserid=api_get_user_id(); |
|
| 119 | +$webcamuserid = api_get_user_id(); |
|
| 120 | 120 | |
| 121 | 121 | Display :: display_header($nameTools, 'Doc'); |
| 122 | 122 | echo '<div class="actions">'; |
| 123 | 123 | echo '<a href="document.php?id='.$document_id.'">'. |
| 124 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 124 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | 125 | echo '</div>'; |
| 126 | 126 | ?> |
| 127 | 127 | |
@@ -87,10 +87,11 @@ |
||
| 87 | 87 | |
| 88 | 88 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
| 89 | 89 | |
| 90 | -if (!$is_certificate_mode) |
|
| 90 | +if (!$is_certificate_mode) { |
|
| 91 | 91 | $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents')); |
| 92 | -else |
|
| 92 | +} else { |
|
| 93 | 93 | $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
| 94 | +} |
|
| 94 | 95 | |
| 95 | 96 | // Interbreadcrumb for the current directory root path |
| 96 | 97 | if (empty($document_data['parents'])) { |
@@ -59,44 +59,44 @@ discard block |
||
| 59 | 59 | /* Please, do not modify this dirname formatting */ |
| 60 | 60 | |
| 61 | 61 | if (strstr($dir, '..')) { |
| 62 | - $dir = '/'; |
|
| 62 | + $dir = '/'; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | if ($dir[0] == '.') { |
| 66 | - $dir = substr($dir, 1); |
|
| 66 | + $dir = substr($dir, 1); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | if ($dir[0] != '/') { |
| 70 | - $dir = '/'.$dir; |
|
| 70 | + $dir = '/'.$dir; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | if ($dir[strlen($dir) - 1] != '/') { |
| 74 | - $dir .= '/'; |
|
| 74 | + $dir .= '/'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
| 78 | 78 | |
| 79 | 79 | if (!is_dir($filepath)) { |
| 80 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 81 | - $dir = '/'; |
|
| 80 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 81 | + $dir = '/'; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | //groups //TODO:clean |
| 85 | 85 | if (!empty($group_id)) { |
| 86 | - $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
| 87 | - $group_document = true; |
|
| 88 | - $noPHP_SELF = true; |
|
| 86 | + $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
| 87 | + $group_document = true; |
|
| 88 | + $noPHP_SELF = true; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
| 92 | 92 | |
| 93 | 93 | if (!$is_certificate_mode) |
| 94 | - $interbreadcrumb[] = array( |
|
| 95 | - "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), |
|
| 96 | - "name" => get_lang('Documents') |
|
| 97 | - ); |
|
| 94 | + $interbreadcrumb[] = array( |
|
| 95 | + "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), |
|
| 96 | + "name" => get_lang('Documents') |
|
| 97 | + ); |
|
| 98 | 98 | else |
| 99 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 99 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 100 | 100 | |
| 101 | 101 | // Interbreadcrumb for the current directory root path |
| 102 | 102 | if (empty($document_data['parents'])) { |
@@ -111,28 +111,28 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
| 114 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
| 114 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
| 115 | 115 | |
| 116 | 116 | if (!$is_allowedToEdit) { |
| 117 | - api_not_allowed(true); |
|
| 117 | + api_not_allowed(true); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | Event::event_access_tool(TOOL_DOCUMENT); |
| 121 | 121 | |
| 122 | 122 | Display :: display_header($nameTools, 'Doc'); |
| 123 | 123 | echo '<div class="actions">'; |
| 124 | - echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | - echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 124 | + echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | + echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 126 | 126 | echo '</div>'; |
| 127 | 127 | |
| 128 | 128 | if (api_browser_support('svg')) { |
| 129 | - // Automatic loading the course language |
|
| 130 | - $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
| 131 | - $langsvgedit = api_get_language_isocode(); |
|
| 132 | - $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
| 133 | - $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
| 134 | - $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
| 135 | - ?> |
|
| 129 | + // Automatic loading the course language |
|
| 130 | + $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
| 131 | + $langsvgedit = api_get_language_isocode(); |
|
| 132 | + $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
| 133 | + $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
| 134 | + $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
| 135 | + ?> |
|
| 136 | 136 | <script> |
| 137 | 137 | document.write('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'); |
| 138 | 138 | function resizeIframe() { |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | <?php |
| 152 | 152 | echo '<noscript>'; |
| 153 | - echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
| 154 | - echo '</noscript>'; |
|
| 153 | + echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
| 154 | + echo '</noscript>'; |
|
| 155 | 155 | } else { |
| 156 | - Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
| 156 | + Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
| 157 | 157 | } |
| 158 | 158 | Display::display_footer(); |
@@ -33,10 +33,10 @@ discard block |
||
| 33 | 33 | $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : ''; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | -$dir= str_replace('\\', '/',$dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
| 36 | +$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
| 37 | 37 | |
| 38 | 38 | /* Constants & Variables */ |
| 39 | -$current_session_id=api_get_session_id(); |
|
| 39 | +$current_session_id = api_get_session_id(); |
|
| 40 | 40 | $group_id = api_get_group_id(); |
| 41 | 41 | |
| 42 | 42 | //path for svg-edit save |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $filename = $temp_file[0]; |
| 52 | 52 | $nameTools = get_lang('EditDocument').': '.$filename; |
| 53 | 53 | |
| 54 | -$courseDir = $_course['path'].'/document'; |
|
| 54 | +$courseDir = $_course['path'].'/document'; |
|
| 55 | 55 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
| 56 | 56 | |
| 57 | 57 | /* Other initialization code */ |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | //groups //TODO:clean |
| 85 | 85 | if (!empty($group_id)) { |
| 86 | - $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
| 86 | + $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
| 87 | 87 | $group_document = true; |
| 88 | 88 | $noPHP_SELF = true; |
| 89 | 89 | } |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | "name" => get_lang('Documents') |
| 97 | 97 | ); |
| 98 | 98 | else |
| 99 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 99 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 100 | 100 | |
| 101 | 101 | // Interbreadcrumb for the current directory root path |
| 102 | 102 | if (empty($document_data['parents'])) { |
| 103 | 103 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
| 104 | 104 | } else { |
| 105 | - foreach($document_data['parents'] as $document_sub_data) { |
|
| 105 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
| 106 | 106 | if ($document_data['title'] == $document_sub_data['title']) { |
| 107 | 107 | continue; |
| 108 | 108 | } |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | Display :: display_header($nameTools, 'Doc'); |
| 123 | 123 | echo '<div class="actions">'; |
| 124 | - echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | - echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 124 | + echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 125 | + echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 126 | 126 | echo '</div>'; |
| 127 | 127 | |
| 128 | 128 | if (api_browser_support('svg')) { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | $editorConfig = array( |
| 128 | - 'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' :'DocumentsStudent'), |
|
| 128 | + 'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' : 'DocumentsStudent'), |
|
| 129 | 129 | 'Width' => '100%', |
| 130 | 130 | 'Height' => '400', |
| 131 | 131 | 'cols-size' => [2, 10, 0], |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
|
| 147 | +$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
|
| 148 | 148 | DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
| 149 | 149 | $noPHP_SELF = true; |
| 150 | 150 | |
@@ -168,14 +168,14 @@ discard block |
||
| 168 | 168 | "name" => get_lang('Documents'), |
| 169 | 169 | ); |
| 170 | 170 | } else { |
| 171 | - $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 171 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // Interbreadcrumb for the current directory root path |
| 175 | 175 | if (empty($document_data['parents'])) { |
| 176 | 176 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
| 177 | 177 | } else { |
| 178 | - foreach($document_data['parents'] as $document_sub_data) { |
|
| 178 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
| 179 | 179 | if ($document_data['title'] == $document_sub_data['title']) { |
| 180 | 180 | continue; |
| 181 | 181 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $dir, |
| 360 | 360 | api_get_user_id() |
| 361 | 361 | ); |
| 362 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
| 362 | + header('Location: document.php?id='.$document_data['parent_id'].'&'.api_get_cidreq().($is_certificate_mode ? '&curdirpath=/certificates&selectcat=1' : '')); |
|
| 363 | 363 | exit; |
| 364 | 364 | } else { |
| 365 | 365 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | /* Display user interface */ |
| 403 | 403 | |
| 404 | 404 | // Display the header |
| 405 | -$nameTools = get_lang('EditDocument') . ': '.Security::remove_XSS($document_data['title']); |
|
| 405 | +$nameTools = get_lang('EditDocument').': '.Security::remove_XSS($document_data['title']); |
|
| 406 | 406 | Display::display_header($nameTools, 'Doc'); |
| 407 | 407 | |
| 408 | 408 | $document_info = api_get_item_property_info( |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
| 485 | 485 | |
| 486 | 486 | if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
| 487 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
| 487 | + $checked = & $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
| 488 | 488 | if ($readonly == 1) { |
| 489 | 489 | $checked->setChecked(true); |
| 490 | 490 | } |
@@ -524,14 +524,14 @@ discard block |
||
| 524 | 524 | foreach ($all_information_by_create_certificate[0] as $info_value) { |
| 525 | 525 | $str_info .= $info_value.'<br/>'; |
| 526 | 526 | } |
| 527 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
| 527 | + $create_certificate = get_lang('CreateCertificateWithTags'); |
|
| 528 | 528 | Display::display_normal_message( |
| 529 | 529 | $create_certificate.': <br /><br />'.$str_info, |
| 530 | 530 | false |
| 531 | 531 | ); |
| 532 | 532 | } |
| 533 | 533 | |
| 534 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
| 534 | + if ($extension == 'svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { |
|
| 535 | 535 | Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
| 536 | 536 | } |
| 537 | 537 | echo '<div class="row" style="overflow:hidden"> |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | //return button back to |
| 587 | -function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false) |
|
| 587 | +function show_return($document_id, $path, $call_from_tool = '', $slide_id = 0, $is_certificate_mode = false) |
|
| 588 | 588 | { |
| 589 | 589 | global $parent_id; |
| 590 | 590 | echo '<div class="actions">'; |
@@ -592,26 +592,26 @@ discard block |
||
| 592 | 592 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
| 593 | 593 | |
| 594 | 594 | if ($is_certificate_mode) { |
| 595 | - echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
| 596 | - Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 597 | - } elseif($call_from_tool=='slideshow') { |
|
| 595 | + echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'. |
|
| 596 | + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 597 | + } elseif ($call_from_tool == 'slideshow') { |
|
| 598 | 598 | echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
| 599 | - Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 600 | - } elseif($call_from_tool=='editdraw') { |
|
| 599 | + Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 600 | + } elseif ($call_from_tool == 'editdraw') { |
|
| 601 | 601 | echo '<a href="'.$url.'">'. |
| 602 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 602 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 603 | 603 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
| 604 | - } elseif($call_from_tool=='editodf') { |
|
| 604 | + } elseif ($call_from_tool == 'editodf') { |
|
| 605 | 605 | echo '<a href="'.$url.'">'. |
| 606 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 606 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 607 | 607 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
| 608 | - } elseif($call_from_tool=='editpaint'){ |
|
| 608 | + } elseif ($call_from_tool == 'editpaint') { |
|
| 609 | 609 | echo '<a href="'.$url.'">'. |
| 610 | 610 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
| 611 | 611 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
| 612 | 612 | } else { |
| 613 | 613 | echo '<a href="'.$url.'">'. |
| 614 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 614 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 615 | 615 | } |
| 616 | 616 | echo '</div>'; |
| 617 | 617 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $sessionId = api_get_session_id(); |
| 66 | 66 | |
| 67 | 67 | if (api_is_in_group()) { |
| 68 | - $group_properties = GroupManager::get_group_properties($group_id); |
|
| 68 | + $group_properties = GroupManager::get_group_properties($group_id); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $dir = '/'; |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $_GET['id'], |
| 78 | 78 | api_get_course_id(), |
| 79 | 79 | true, |
| 80 | - 0 |
|
| 80 | + 0 |
|
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | 83 | if (!empty($sessionId) && empty($document_data)) { |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | ); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - $document_id = $document_data['id']; |
|
| 93 | - $file = $document_data['path']; |
|
| 94 | - $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
| 95 | - $dir = dirname($document_data['path']); |
|
| 96 | - $dir_original = $dir; |
|
| 97 | - $doc = basename($file); |
|
| 98 | - $readonly = $document_data['readonly']; |
|
| 92 | + $document_id = $document_data['id']; |
|
| 93 | + $file = $document_data['path']; |
|
| 94 | + $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
| 95 | + $dir = dirname($document_data['path']); |
|
| 96 | + $dir_original = $dir; |
|
| 97 | + $doc = basename($file); |
|
| 98 | + $readonly = $document_data['readonly']; |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | if (empty($document_data)) { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | // Level correction for group documents. |
| 119 | 119 | if (!empty($group_properties['directory'])) { |
| 120 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
| 120 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
| 121 | 121 | } |
| 122 | 122 | $relative_url = ''; |
| 123 | 123 | for ($i = 0; $i < ($count_dir); $i++) { |
@@ -139,13 +139,13 @@ discard block |
||
| 139 | 139 | ); |
| 140 | 140 | |
| 141 | 141 | if ($is_certificate_mode) { |
| 142 | - $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
| 143 | - $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
| 144 | - $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
| 142 | + $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
| 143 | + $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
| 144 | + $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
| 148 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
| 148 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
| 149 | 149 | $noPHP_SELF = true; |
| 150 | 150 | |
| 151 | 151 | /* Other initialization code */ |
@@ -158,8 +158,8 @@ discard block |
||
| 158 | 158 | 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
| 159 | 159 | 'name' => get_lang('GroupSpace'), |
| 160 | 160 | ); |
| 161 | - $group_document = true; |
|
| 162 | - $noPHP_SELF = true; |
|
| 161 | + $group_document = true; |
|
| 162 | + $noPHP_SELF = true; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | if (!$is_certificate_mode) { |
@@ -193,9 +193,9 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | //TODO:check the below code and his funcionality |
| 195 | 195 | if (!api_is_allowed_to_edit()) { |
| 196 | - if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
| 197 | - api_not_allowed(); |
|
| 198 | - } |
|
| 196 | + if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
| 197 | + api_not_allowed(); |
|
| 198 | + } |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /* MAIN TOOL CODE */ |
@@ -203,18 +203,18 @@ discard block |
||
| 203 | 203 | /* Code to change the comment */ |
| 204 | 204 | |
| 205 | 205 | if (isset($_POST['comment'])) { |
| 206 | - // Fixing the path if it is wrong |
|
| 207 | - $comment = trim($_POST['comment']); |
|
| 208 | - $title = trim($_POST['title']); |
|
| 206 | + // Fixing the path if it is wrong |
|
| 207 | + $comment = trim($_POST['comment']); |
|
| 208 | + $title = trim($_POST['title']); |
|
| 209 | 209 | |
| 210 | 210 | // Just in case see BT#3525 |
| 211 | 211 | if (empty($title)) { |
| 212 | - $title = $document_data['title']; |
|
| 213 | - } |
|
| 212 | + $title = $document_data['title']; |
|
| 213 | + } |
|
| 214 | 214 | |
| 215 | - if (empty($title)) { |
|
| 216 | - $title = get_document_title($_POST['filename']); |
|
| 217 | - } |
|
| 215 | + if (empty($title)) { |
|
| 216 | + $title = get_document_title($_POST['filename']); |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | 219 | if (!empty($document_id)) { |
| 220 | 220 | $params = [ |
@@ -226,43 +226,43 @@ discard block |
||
| 226 | 226 | $params, |
| 227 | 227 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
| 228 | 228 | ); |
| 229 | - Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
| 229 | + Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /* WYSIWYG HTML EDITOR - Program Logic */ |
| 234 | 234 | if ($is_allowed_to_edit) { |
| 235 | - if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
| 235 | + if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
| 236 | 236 | |
| 237 | - $filename = stripslashes($_POST['filename']); |
|
| 237 | + $filename = stripslashes($_POST['filename']); |
|
| 238 | 238 | $extension = $_POST['extension']; |
| 239 | - $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
| 240 | - $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
| 239 | + $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
| 240 | + $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
| 241 | 241 | |
| 242 | 242 | if ($dir == '/') { |
| 243 | 243 | $dir = ''; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - $file = $dir.'/'.$filename.'.'.$extension; |
|
| 247 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
| 248 | - $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
| 246 | + $file = $dir.'/'.$filename.'.'.$extension; |
|
| 247 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
| 248 | + $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
| 249 | 249 | |
| 250 | - if (empty($filename)) { |
|
| 250 | + if (empty($filename)) { |
|
| 251 | 251 | Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning')); |
| 252 | - } else { |
|
| 252 | + } else { |
|
| 253 | 253 | |
| 254 | - $file_size = filesize($document_data['absolute_path']); |
|
| 254 | + $file_size = filesize($document_data['absolute_path']); |
|
| 255 | 255 | |
| 256 | - if ($read_only_flag == 0) { |
|
| 257 | - if (!empty($content)) { |
|
| 258 | - if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
| 259 | - // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
| 260 | - $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
| 261 | - fputs($fp, $content); |
|
| 262 | - fclose($fp); |
|
| 256 | + if ($read_only_flag == 0) { |
|
| 257 | + if (!empty($content)) { |
|
| 258 | + if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
| 259 | + // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
| 260 | + $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
| 261 | + fputs($fp, $content); |
|
| 262 | + fclose($fp); |
|
| 263 | 263 | |
| 264 | 264 | $filepath = $document_data['absolute_parent_path']; |
| 265 | - /* |
|
| 265 | + /* |
|
| 266 | 266 | if (!is_dir($filepath.'css')) { |
| 267 | 267 | mkdir($filepath.'css', api_get_permissions_for_new_directories()); |
| 268 | 268 | $doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css'); |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | ); |
| 293 | 293 | }*/ |
| 294 | 294 | |
| 295 | - /*if (!is_file($filepath.'css/frames.css')) { |
|
| 295 | + /*if (!is_file($filepath.'css/frames.css')) { |
|
| 296 | 296 | $platform_theme = api_get_setting('stylesheets'); |
| 297 | 297 | if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) { |
| 298 | 298 | copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css'); |
@@ -330,54 +330,54 @@ discard block |
||
| 330 | 330 | } |
| 331 | 331 | }*/ |
| 332 | 332 | |
| 333 | - // "WHAT'S NEW" notification: update table item_property |
|
| 334 | - $document_id = DocumentManager::get_document_id($_course, $file); |
|
| 335 | - |
|
| 336 | - if ($document_id) { |
|
| 337 | - update_existing_document( |
|
| 338 | - $_course, |
|
| 339 | - $document_id, |
|
| 340 | - $file_size, |
|
| 341 | - $read_only_flag |
|
| 342 | - ); |
|
| 343 | - api_item_property_update( |
|
| 344 | - $_course, |
|
| 345 | - TOOL_DOCUMENT, |
|
| 346 | - $document_id, |
|
| 347 | - 'DocumentUpdated', |
|
| 348 | - api_get_user_id(), |
|
| 349 | - null, |
|
| 350 | - null, |
|
| 351 | - null, |
|
| 352 | - null, |
|
| 353 | - $sessionId |
|
| 354 | - ); |
|
| 355 | - // Update parent folders |
|
| 356 | - item_property_update_on_folder( |
|
| 357 | - $_course, |
|
| 358 | - $dir, |
|
| 359 | - api_get_user_id() |
|
| 360 | - ); |
|
| 361 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
| 362 | - exit; |
|
| 363 | - } else { |
|
| 333 | + // "WHAT'S NEW" notification: update table item_property |
|
| 334 | + $document_id = DocumentManager::get_document_id($_course, $file); |
|
| 335 | + |
|
| 336 | + if ($document_id) { |
|
| 337 | + update_existing_document( |
|
| 338 | + $_course, |
|
| 339 | + $document_id, |
|
| 340 | + $file_size, |
|
| 341 | + $read_only_flag |
|
| 342 | + ); |
|
| 343 | + api_item_property_update( |
|
| 344 | + $_course, |
|
| 345 | + TOOL_DOCUMENT, |
|
| 346 | + $document_id, |
|
| 347 | + 'DocumentUpdated', |
|
| 348 | + api_get_user_id(), |
|
| 349 | + null, |
|
| 350 | + null, |
|
| 351 | + null, |
|
| 352 | + null, |
|
| 353 | + $sessionId |
|
| 354 | + ); |
|
| 355 | + // Update parent folders |
|
| 356 | + item_property_update_on_folder( |
|
| 357 | + $_course, |
|
| 358 | + $dir, |
|
| 359 | + api_get_user_id() |
|
| 360 | + ); |
|
| 361 | + header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
| 362 | + exit; |
|
| 363 | + } else { |
|
| 364 | 364 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
| 365 | - } |
|
| 366 | - } else { |
|
| 365 | + } |
|
| 366 | + } else { |
|
| 367 | 367 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
| 368 | - } |
|
| 369 | - } else { |
|
| 370 | - if ($document_id) { |
|
| 368 | + } |
|
| 369 | + } else { |
|
| 370 | + if ($document_id) { |
|
| 371 | 371 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
| 372 | - } |
|
| 373 | - } |
|
| 374 | - } else { |
|
| 372 | + } |
|
| 373 | + } |
|
| 374 | + } else { |
|
| 375 | 375 | if ($document_id) { |
| 376 | 376 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
| 377 | 377 | } |
| 378 | - } |
|
| 379 | - } |
|
| 380 | - } |
|
| 378 | + } |
|
| 379 | + } |
|
| 380 | + } |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/') |
@@ -431,35 +431,35 @@ discard block |
||
| 431 | 431 | api_get_group_id() |
| 432 | 432 | ) |
| 433 | 433 | ) { |
| 434 | - $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
| 434 | + $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
| 435 | 435 | if ($is_certificate_mode) { |
| 436 | 436 | $action .= '&curdirpath=/certificates&selectcat=1'; |
| 437 | 437 | } |
| 438 | - $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
| 439 | - |
|
| 440 | - // Form title |
|
| 441 | - $form->addElement('header', $nameTools); |
|
| 442 | - $form->addElement('hidden', 'filename'); |
|
| 443 | - $form->addElement('hidden', 'extension'); |
|
| 444 | - $form->addElement('hidden', 'file_path'); |
|
| 445 | - $form->addElement('hidden', 'commentPath'); |
|
| 446 | - $form->addElement('hidden', 'showedit'); |
|
| 447 | - $form->addElement('hidden', 'origin'); |
|
| 448 | - $form->addElement('hidden', 'origin_opt'); |
|
| 438 | + $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
| 439 | + |
|
| 440 | + // Form title |
|
| 441 | + $form->addElement('header', $nameTools); |
|
| 442 | + $form->addElement('hidden', 'filename'); |
|
| 443 | + $form->addElement('hidden', 'extension'); |
|
| 444 | + $form->addElement('hidden', 'file_path'); |
|
| 445 | + $form->addElement('hidden', 'commentPath'); |
|
| 446 | + $form->addElement('hidden', 'showedit'); |
|
| 447 | + $form->addElement('hidden', 'origin'); |
|
| 448 | + $form->addElement('hidden', 'origin_opt'); |
|
| 449 | 449 | $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
| 450 | 450 | |
| 451 | - $defaults['title'] = $document_data['title']; |
|
| 451 | + $defaults['title'] = $document_data['title']; |
|
| 452 | 452 | |
| 453 | - $form->addElement('hidden', 'formSent'); |
|
| 454 | - $defaults['formSent'] = 1; |
|
| 453 | + $form->addElement('hidden', 'formSent'); |
|
| 454 | + $defaults['formSent'] = 1; |
|
| 455 | 455 | |
| 456 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
| 456 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
| 457 | 457 | |
| 458 | - // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
| 459 | - // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
| 460 | - $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
| 458 | + // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
| 459 | + // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
| 460 | + $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
| 461 | 461 | |
| 462 | - // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
| 462 | + // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
| 463 | 463 | |
| 464 | 464 | $showSystemFolders = api_get_course_setting('show_system_folders'); |
| 465 | 465 | $condition = stripos($dir, '/HotPotatoes_files') === false; |
@@ -467,44 +467,44 @@ discard block |
||
| 467 | 467 | $condition = true; |
| 468 | 468 | } |
| 469 | 469 | |
| 470 | - if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
| 471 | - if (empty($readonly) && $readonly == 0) { |
|
| 470 | + if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
| 471 | + if (empty($readonly) && $readonly == 0) { |
|
| 472 | 472 | $form->addHtmlEditor('content', '', true, true, $editorConfig); |
| 473 | - } |
|
| 474 | - } |
|
| 473 | + } |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | - if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
| 477 | - // Updated on field |
|
| 478 | - $last_edit_date = api_get_local_time($last_edit_date); |
|
| 476 | + if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
| 477 | + // Updated on field |
|
| 478 | + $last_edit_date = api_get_local_time($last_edit_date); |
|
| 479 | 479 | $display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>'; |
| 480 | - $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
| 481 | - } |
|
| 480 | + $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
| 483 | + $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
| 484 | 484 | |
| 485 | - if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
| 486 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
| 487 | - if ($readonly == 1) { |
|
| 488 | - $checked->setChecked(true); |
|
| 489 | - } |
|
| 490 | - } |
|
| 485 | + if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
| 486 | + $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
| 487 | + if ($readonly == 1) { |
|
| 488 | + $checked->setChecked(true); |
|
| 489 | + } |
|
| 490 | + } |
|
| 491 | 491 | |
| 492 | - if ($is_certificate_mode) { |
|
| 493 | - $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
| 492 | + if ($is_certificate_mode) { |
|
| 493 | + $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
| 494 | 494 | } else { |
| 495 | - $form->addButtonUpdate(get_lang('SaveDocument')); |
|
| 495 | + $form->addButtonUpdate(get_lang('SaveDocument')); |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | - $defaults['filename'] = $filename; |
|
| 499 | - $defaults['extension'] = $extension; |
|
| 500 | - $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
| 501 | - $defaults['commentPath'] = $file; |
|
| 502 | - $defaults['renameTo'] = $file_name; |
|
| 503 | - $defaults['comment'] = $document_data['comment']; |
|
| 504 | - $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
| 505 | - $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
| 498 | + $defaults['filename'] = $filename; |
|
| 499 | + $defaults['extension'] = $extension; |
|
| 500 | + $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
| 501 | + $defaults['commentPath'] = $file; |
|
| 502 | + $defaults['renameTo'] = $file_name; |
|
| 503 | + $defaults['comment'] = $document_data['comment']; |
|
| 504 | + $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
| 505 | + $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
| 506 | 506 | |
| 507 | - $form->setDefaults($defaults); |
|
| 507 | + $form->setDefaults($defaults); |
|
| 508 | 508 | |
| 509 | 509 | show_return( |
| 510 | 510 | $parent_id, |
@@ -514,25 +514,25 @@ discard block |
||
| 514 | 514 | $is_certificate_mode |
| 515 | 515 | ); |
| 516 | 516 | |
| 517 | - if ($is_certificate_mode) { |
|
| 518 | - $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
| 519 | - api_get_user_id(), |
|
| 520 | - api_get_course_id() |
|
| 521 | - ); |
|
| 522 | - $str_info = ''; |
|
| 523 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
| 524 | - $str_info .= $info_value.'<br/>'; |
|
| 525 | - } |
|
| 526 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
| 527 | - Display::display_normal_message( |
|
| 528 | - $create_certificate.': <br /><br />'.$str_info, |
|
| 529 | - false |
|
| 530 | - ); |
|
| 531 | - } |
|
| 532 | - |
|
| 533 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
| 534 | - Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
| 535 | - } |
|
| 517 | + if ($is_certificate_mode) { |
|
| 518 | + $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
| 519 | + api_get_user_id(), |
|
| 520 | + api_get_course_id() |
|
| 521 | + ); |
|
| 522 | + $str_info = ''; |
|
| 523 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
| 524 | + $str_info .= $info_value.'<br/>'; |
|
| 525 | + } |
|
| 526 | + $create_certificate=get_lang('CreateCertificateWithTags'); |
|
| 527 | + Display::display_normal_message( |
|
| 528 | + $create_certificate.': <br /><br />'.$str_info, |
|
| 529 | + false |
|
| 530 | + ); |
|
| 531 | + } |
|
| 532 | + |
|
| 533 | + if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
| 534 | + Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
| 535 | + } |
|
| 536 | 536 | echo '<div class="row" style="overflow:hidden"> |
| 537 | 537 | <div id="template_col" class="col-md-2"> |
| 538 | 538 | <div class="panel panel-default"> |
@@ -560,57 +560,57 @@ discard block |
||
| 560 | 560 | */ |
| 561 | 561 | function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc) |
| 562 | 562 | { |
| 563 | - $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
| 563 | + $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
| 564 | 564 | $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file |
| 565 | - $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
| 566 | - |
|
| 567 | - if ($rename_to) { |
|
| 568 | - if (isset($dir) && $dir != '') { |
|
| 569 | - $source_file = $dir.$source_file; |
|
| 570 | - $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
| 571 | - } else { |
|
| 572 | - $source_file = '/'.$source_file; |
|
| 573 | - $new_full_file_name = '/'.$rename_to; |
|
| 574 | - } |
|
| 575 | - |
|
| 576 | - update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
| 565 | + $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
| 566 | + |
|
| 567 | + if ($rename_to) { |
|
| 568 | + if (isset($dir) && $dir != '') { |
|
| 569 | + $source_file = $dir.$source_file; |
|
| 570 | + $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
| 571 | + } else { |
|
| 572 | + $source_file = '/'.$source_file; |
|
| 573 | + $new_full_file_name = '/'.$rename_to; |
|
| 574 | + } |
|
| 575 | + |
|
| 576 | + update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
| 577 | 577 | Display::addFlash(Display::return_message(get_lang('fileModified'))); |
| 578 | 578 | |
| 579 | - return true; |
|
| 580 | - } else { |
|
| 579 | + return true; |
|
| 580 | + } else { |
|
| 581 | 581 | Display::addFlash(Display::return_message(get_lang('FileExists'))); |
| 582 | - } |
|
| 582 | + } |
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | //return button back to |
| 586 | 586 | function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false) |
| 587 | 587 | { |
| 588 | 588 | global $parent_id; |
| 589 | - echo '<div class="actions">'; |
|
| 589 | + echo '<div class="actions">'; |
|
| 590 | 590 | |
| 591 | 591 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
| 592 | 592 | |
| 593 | - if ($is_certificate_mode) { |
|
| 594 | - echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
| 593 | + if ($is_certificate_mode) { |
|
| 594 | + echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
| 595 | 595 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 596 | - } elseif($call_from_tool=='slideshow') { |
|
| 597 | - echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
| 596 | + } elseif($call_from_tool=='slideshow') { |
|
| 597 | + echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
| 598 | 598 | Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 599 | - } elseif($call_from_tool=='editdraw') { |
|
| 600 | - echo '<a href="'.$url.'">'. |
|
| 599 | + } elseif($call_from_tool=='editdraw') { |
|
| 600 | + echo '<a href="'.$url.'">'. |
|
| 601 | 601 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 602 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
| 603 | - } elseif($call_from_tool=='editodf') { |
|
| 602 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
| 603 | + } elseif($call_from_tool=='editodf') { |
|
| 604 | 604 | echo '<a href="'.$url.'">'. |
| 605 | 605 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 606 | 606 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
| 607 | 607 | } elseif($call_from_tool=='editpaint'){ |
| 608 | - echo '<a href="'.$url.'">'. |
|
| 608 | + echo '<a href="'.$url.'">'. |
|
| 609 | 609 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
| 610 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
| 611 | - } else { |
|
| 612 | - echo '<a href="'.$url.'">'. |
|
| 610 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
| 611 | + } else { |
|
| 612 | + echo '<a href="'.$url.'">'. |
|
| 613 | 613 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 614 | - } |
|
| 615 | - echo '</div>'; |
|
| 614 | + } |
|
| 615 | + echo '</div>'; |
|
| 616 | 616 | } |
@@ -49,10 +49,10 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | $_user = api_get_user_info(); |
| 51 | 51 | $courseInfo = api_get_course_info(); |
| 52 | -$course_dir = $courseInfo['directory'] . '/document'; |
|
| 52 | +$course_dir = $courseInfo['directory'].'/document'; |
|
| 53 | 53 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
| 54 | -$base_work_dir = $sys_course_path . $course_dir; |
|
| 55 | -$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'] . '/document'; |
|
| 54 | +$base_work_dir = $sys_course_path.$course_dir; |
|
| 55 | +$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'].'/document'; |
|
| 56 | 56 | $document_path = $base_work_dir; |
| 57 | 57 | $usePpt2lp = api_get_setting('service_ppt2lp', 'active') == 'true'; |
| 58 | 58 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $certificateId |
| 231 | 231 | ); |
| 232 | 232 | Display::addFlash(Display::return_message( |
| 233 | - get_lang('DocDeleted') . ': ' . $documentInfo['title'], |
|
| 233 | + get_lang('DocDeleted').': '.$documentInfo['title'], |
|
| 234 | 234 | 'success' |
| 235 | 235 | )); |
| 236 | 236 | } else { |
@@ -419,11 +419,9 @@ discard block |
||
| 419 | 419 | case 'convertToPdf': |
| 420 | 420 | // PDF format as target by default |
| 421 | 421 | $formatTarget = $_REQUEST['formatTarget'] ? |
| 422 | - strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) : |
|
| 423 | - 'pdf'; |
|
| 422 | + strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) : 'pdf'; |
|
| 424 | 423 | $formatType = $_REQUEST['formatType'] ? |
| 425 | - strtolower(Security::remove_XSS($_REQUEST['formatType'])) : |
|
| 426 | - 'text'; |
|
| 424 | + strtolower(Security::remove_XSS($_REQUEST['formatType'])) : 'text'; |
|
| 427 | 425 | // Get the document data from the ID |
| 428 | 426 | $document_info = DocumentManager::get_document_data_by_id( |
| 429 | 427 | $document_id, |
@@ -431,8 +429,8 @@ discard block |
||
| 431 | 429 | true, |
| 432 | 430 | $session_id |
| 433 | 431 | ); |
| 434 | - $file = $sys_course_path . $courseInfo['directory'] . |
|
| 435 | - '/document' . $document_info['path']; |
|
| 432 | + $file = $sys_course_path.$courseInfo['directory']. |
|
| 433 | + '/document'.$document_info['path']; |
|
| 436 | 434 | $fileInfo = pathinfo($file); |
| 437 | 435 | if ($fileInfo['extension'] == $formatTarget) { |
| 438 | 436 | Display::addFlash(Display::return_message( |
@@ -463,9 +461,9 @@ discard block |
||
| 463 | 461 | 'warning' |
| 464 | 462 | )); |
| 465 | 463 | } else { |
| 466 | - $convertedFile = $fileInfo['dirname'] . DIRECTORY_SEPARATOR . |
|
| 467 | - $fileInfo['filename'] . '_from_' . $fileInfo['extension'] . |
|
| 468 | - '.' . $formatTarget; |
|
| 464 | + $convertedFile = $fileInfo['dirname'].DIRECTORY_SEPARATOR. |
|
| 465 | + $fileInfo['filename'].'_from_'.$fileInfo['extension']. |
|
| 466 | + '.'.$formatTarget; |
|
| 469 | 467 | $convertedTitle = $document_info['title']; |
| 470 | 468 | $obj = new OpenofficePresentation(true); |
| 471 | 469 | if (file_exists($convertedFile)) { |
@@ -490,13 +488,13 @@ discard block |
||
| 490 | 488 | $gidReq = Security::remove_XSS($_GET['gidReq']); |
| 491 | 489 | $file_link = Display::url( |
| 492 | 490 | get_lang('SeeFile'), |
| 493 | - api_get_path(WEB_CODE_PATH) . |
|
| 494 | - 'document/showinframes.php?' . 'cidReq=' . $cidReq . |
|
| 495 | - '&id_session=' . $id_session . '&' . |
|
| 496 | - 'gidReq=' . $gidReq . '&id=' . current($result) |
|
| 491 | + api_get_path(WEB_CODE_PATH). |
|
| 492 | + 'document/showinframes.php?'.'cidReq='.$cidReq. |
|
| 493 | + '&id_session='.$id_session.'&'. |
|
| 494 | + 'gidReq='.$gidReq.'&id='.current($result) |
|
| 497 | 495 | ); |
| 498 | 496 | Display::addFlash(Display::return_message( |
| 499 | - get_lang('CopyMade') . ' ' . $file_link, |
|
| 497 | + get_lang('CopyMade').' '.$file_link, |
|
| 500 | 498 | 'confirmation', |
| 501 | 499 | false |
| 502 | 500 | )); |
@@ -653,7 +651,7 @@ discard block |
||
| 653 | 651 | $new_content_html |
| 654 | 652 | ); |
| 655 | 653 | $new_content_html = str_replace( |
| 656 | - SYS_CODE_PATH . 'img/', |
|
| 654 | + SYS_CODE_PATH.'img/', |
|
| 657 | 655 | api_get_path(WEB_IMG_PATH), |
| 658 | 656 | $new_content_html |
| 659 | 657 | ); |
@@ -709,11 +707,11 @@ discard block |
||
| 709 | 707 | $("#convertSelect").change(function() { |
| 710 | 708 | var formatTarget = $(this).val(); |
| 711 | 709 | window.location.href = "'. |
| 712 | - api_get_self() . '?' . api_get_cidreq() . |
|
| 713 | - '&curdirpath=' . $curdirpath . |
|
| 714 | - '&action=convertToPdf&formatTarget=' . |
|
| 715 | - '" + formatTarget + "&id=" + id + "&' . |
|
| 716 | - api_get_cidreq() . '&formatType=" + format; |
|
| 710 | + api_get_self().'?'.api_get_cidreq(). |
|
| 711 | + '&curdirpath='.$curdirpath. |
|
| 712 | + '&action=convertToPdf&formatTarget='. |
|
| 713 | + '" + formatTarget + "&id=" + id + "&'. |
|
| 714 | + api_get_cidreq().'&formatType=" + format; |
|
| 717 | 715 | }); |
| 718 | 716 | $("#convertModal").on("hidden", function(){ |
| 719 | 717 | $("." + format + "FormatType").hide(); |
@@ -1044,7 +1042,7 @@ discard block |
||
| 1044 | 1042 | update_db_info( |
| 1045 | 1043 | 'update', |
| 1046 | 1044 | $document_to_move['path'], |
| 1047 | - $moveTo . '/' . basename($document_to_move['path']) |
|
| 1045 | + $moveTo.'/'.basename($document_to_move['path']) |
|
| 1048 | 1046 | ); |
| 1049 | 1047 | |
| 1050 | 1048 | //update database item property |
@@ -1276,7 +1274,7 @@ discard block |
||
| 1276 | 1274 | |
| 1277 | 1275 | if (!empty($newFolderData)) { |
| 1278 | 1276 | $message = Display::return_message( |
| 1279 | - get_lang('DirCr') . ' ' . $newFolderData['title'], |
|
| 1277 | + get_lang('DirCr').' '.$newFolderData['title'], |
|
| 1280 | 1278 | 'confirmation' |
| 1281 | 1279 | ); |
| 1282 | 1280 | } else { |
@@ -1361,27 +1359,27 @@ discard block |
||
| 1361 | 1359 | |
| 1362 | 1360 | // Create the form that asks for the directory name |
| 1363 | 1361 | $templateForm .= ' |
| 1364 | - <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self() . '?add_as_template=' . $document_id_for_template . '" method="post"> |
|
| 1362 | + <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self().'?add_as_template='.$document_id_for_template.'" method="post"> |
|
| 1365 | 1363 | <fieldset> |
| 1366 | - <legend>' . get_lang('AddAsTemplate') . '</legend> |
|
| 1364 | + <legend>' . get_lang('AddAsTemplate').'</legend> |
|
| 1367 | 1365 | <div class="form-group"> |
| 1368 | - <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName') . '</label> |
|
| 1366 | + <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName').'</label> |
|
| 1369 | 1367 | <div class="col-sm-10"> |
| 1370 | 1368 | <input type="text" class="form-control" id="template_title" name="template_title"> |
| 1371 | 1369 | </div> |
| 1372 | 1370 | </div> |
| 1373 | 1371 | <div class="form-group"> |
| 1374 | - <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage') . '</label> |
|
| 1372 | + <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage').'</label> |
|
| 1375 | 1373 | <div class="col-sm-10"> |
| 1376 | 1374 | <input type="file" name="template_image" id="template_image"> |
| 1377 | 1375 | </div> |
| 1378 | 1376 | </div> |
| 1379 | 1377 | <div class="form-group"> |
| 1380 | 1378 | <div class="col-sm-offset-2 col-sm-10"> |
| 1381 | - <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate') . '</button> |
|
| 1379 | + <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate').'</button> |
|
| 1382 | 1380 | </div> |
| 1383 | 1381 | </div> |
| 1384 | - <input type="hidden" name="curdirpath" value="' . $curdirpath . '" /> |
|
| 1382 | + <input type="hidden" name="curdirpath" value="' . $curdirpath.'" /> |
|
| 1385 | 1383 | </fieldset> |
| 1386 | 1384 | </form> |
| 1387 | 1385 | <hr> |
@@ -2026,18 +2024,18 @@ discard block |
||
| 2026 | 2024 | <div class="modal-dialog"> |
| 2027 | 2025 | <div class="modal-content"> |
| 2028 | 2026 | <div class="modal-header" style="text-align: center;"> |
| 2029 | - <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close') . '"> |
|
| 2027 | + <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close').'"> |
|
| 2030 | 2028 | <span aria-hidden="true">×</span> |
| 2031 | 2029 | </button> |
| 2032 | - <h4 class="modal-title">' . get_lang('Convert') . '</h4> |
|
| 2030 | + <h4 class="modal-title">' . get_lang('Convert').'</h4> |
|
| 2033 | 2031 | </div> |
| 2034 | 2032 | <div class="modal-body"> |
| 2035 | 2033 | <form action="#" class="form-horizontal"> |
| 2036 | 2034 | <div class="form-group"> |
| 2037 | - <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats') . '</label> |
|
| 2035 | + <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats').'</label> |
|
| 2038 | 2036 | <div class="col-sm-8"> |
| 2039 | 2037 | <select id="convertSelect"> |
| 2040 | - <option value="">' . get_lang('Select') . '</option> |
|
| 2038 | + <option value="">' . get_lang('Select').'</option> |
|
| 2041 | 2039 | <option value="pdf"> |
| 2042 | 2040 | PDF - Portable Document File |
| 2043 | 2041 | </option> |
@@ -2056,7 +2054,7 @@ discard block |
||
| 2056 | 2054 | </form> |
| 2057 | 2055 | </div> |
| 2058 | 2056 | <div class="modal-footer"> |
| 2059 | - <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close') . '</button> |
|
| 2057 | + <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close').'</button> |
|
| 2060 | 2058 | </div> |
| 2061 | 2059 | </div> |
| 2062 | 2060 | </div>'; |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url; |
| 28 | 28 | |
| 29 | 29 | if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) { |
| 30 | - $doc_url = ''; |
|
| 30 | + $doc_url = ''; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // Dealing with image included into survey: when users receive a link towards a |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | if (!api_is_allowed_to_edit() && !$is_visible) { |
| 98 | - Display::display_error_message(get_lang('ProtectedDocument'));//api_not_allowed backbutton won't work. |
|
| 98 | + Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work. |
|
| 99 | 99 | exit; // You shouldn't be here anyway. |
| 100 | 100 | } |
| 101 | 101 | // Launch event |
@@ -14,18 +14,18 @@ discard block |
||
| 14 | 14 | parse_str($_SERVER['QUERY_STRING'], $params); |
| 15 | 15 | |
| 16 | 16 | if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
| 17 | - $webcamname = $params['webcamname']; |
|
| 18 | - $webcamdir = $params['webcamdir']; |
|
| 19 | - $webcamuserid = $params['webcamuserid']; |
|
| 17 | + $webcamname = $params['webcamname']; |
|
| 18 | + $webcamdir = $params['webcamdir']; |
|
| 19 | + $webcamuserid = $params['webcamuserid']; |
|
| 20 | 20 | } |
| 21 | 21 | else { |
| 22 | - api_not_allowed(); |
|
| 23 | - die(); |
|
| 22 | + api_not_allowed(); |
|
| 23 | + die(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) { |
| 27 | - api_not_allowed(); |
|
| 28 | - die(); |
|
| 27 | + api_not_allowed(); |
|
| 28 | + die(); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $ext = strtolower($ext[sizeof($ext) - 1]); |
| 43 | 43 | |
| 44 | 44 | if($ext!= 'jpg'){ |
| 45 | - die(); |
|
| 45 | + die(); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | //Do not use here check Fileinfo method because return: text/plain //CHECK THIS BEFORE COMMIT |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | $title_to_save=str_replace('_',' ',$webcamname); |
| 58 | 58 | $webcamname_noex=basename($webcamname, ".jpg"); |
| 59 | 59 | if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
| 60 | - $i = 1; |
|
| 61 | - while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
| 62 | - $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 63 | - $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 64 | - $title_to_save = str_replace('_',' ',$title_to_save); |
|
| 60 | + $i = 1; |
|
| 61 | + while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
| 62 | + $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 63 | + $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 64 | + $title_to_save = str_replace('_',' ',$title_to_save); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | $documentPath = $saveDir.'/'.$webcamname_to_save; |
@@ -70,13 +70,13 @@ discard block |
||
| 70 | 70 | //Change to move_uploaded_file() function instead file_get_contents() to adapt the new lib |
| 71 | 71 | $content = move_uploaded_file($_FILES['webcam']['tmp_name'], $documentPath); |
| 72 | 72 | if (!$content) { |
| 73 | - print "PHP ERROR: Failed to read data\n"; |
|
| 74 | - exit(); |
|
| 73 | + print "PHP ERROR: Failed to read data\n"; |
|
| 74 | + exit(); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | //add document to database |
| 78 | - $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
| 79 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
| 78 | + $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
| 79 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
| 80 | 80 | /// |
| 81 | 81 | $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; |
| 82 | 82 | print get_lang('ClipSent'); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | # Save the audio to a URL-accessible directory for playback. |
| 14 | 14 | parse_str($_SERVER['QUERY_STRING'], $params); |
| 15 | 15 | |
| 16 | -if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
|
| 16 | +if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
|
| 17 | 17 | $webcamname = $params['webcamname']; |
| 18 | 18 | $webcamdir = $params['webcamdir']; |
| 19 | 19 | $webcamuserid = $params['webcamuserid']; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | die(); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | -if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) { |
|
| 26 | +if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) { |
|
| 27 | 27 | api_not_allowed(); |
| 28 | 28 | die(); |
| 29 | 29 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | $ext = explode('.', $webcamname); |
| 42 | 42 | $ext = strtolower($ext[sizeof($ext) - 1]); |
| 43 | 43 | |
| 44 | -if($ext!= 'jpg'){ |
|
| 44 | +if ($ext != 'jpg') { |
|
| 45 | 45 | die(); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -53,15 +53,15 @@ discard block |
||
| 53 | 53 | $groupId = api_get_group_id(); |
| 54 | 54 | |
| 55 | 55 | //Avoid duplicates |
| 56 | -$webcamname_to_save=$webcamname; |
|
| 57 | -$title_to_save=str_replace('_',' ',$webcamname); |
|
| 58 | -$webcamname_noex=basename($webcamname, ".jpg"); |
|
| 59 | -if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
|
| 56 | +$webcamname_to_save = $webcamname; |
|
| 57 | +$title_to_save = str_replace('_', ' ', $webcamname); |
|
| 58 | +$webcamname_noex = basename($webcamname, ".jpg"); |
|
| 59 | +if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) { |
|
| 60 | 60 | $i = 1; |
| 61 | 61 | while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
| 62 | - $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 63 | - $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
| 64 | - $title_to_save = str_replace('_',' ',$title_to_save); |
|
| 62 | + $webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext; |
|
| 63 | + $title_to_save = $webcamname_noex.'_'.$i.'.'.$ext; |
|
| 64 | + $title_to_save = str_replace('_', ' ', $title_to_save); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | $documentPath = $saveDir.'/'.$webcamname_to_save; |
@@ -78,5 +78,5 @@ discard block |
||
| 78 | 78 | $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
| 79 | 79 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
| 80 | 80 | /// |
| 81 | -$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; |
|
| 81 | +$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath; |
|
| 82 | 82 | print get_lang('ClipSent'); |
@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | $webcamname = $params['webcamname']; |
| 18 | 18 | $webcamdir = $params['webcamdir']; |
| 19 | 19 | $webcamuserid = $params['webcamuserid']; |
| 20 | -} |
|
| 21 | -else { |
|
| 20 | +} else { |
|
| 22 | 21 | api_not_allowed(); |
| 23 | 22 | die(); |
| 24 | 23 | } |
@@ -58,7 +57,9 @@ discard block |
||
| 58 | 57 | $webcamname_noex=basename($webcamname, ".jpg"); |
| 59 | 58 | if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
| 60 | 59 | $i = 1; |
| 61 | - while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
| 60 | + while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) { |
|
| 61 | + $i++; |
|
| 62 | + } |
|
| 62 | 63 | $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
| 63 | 64 | $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
| 64 | 65 | $title_to_save = str_replace('_',' ',$title_to_save); |
@@ -93,10 +93,11 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
| 95 | 95 | |
| 96 | -if (!$is_certificate_mode) |
|
| 96 | +if (!$is_certificate_mode) { |
|
| 97 | 97 | $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
| 98 | -else |
|
| 98 | +} else { |
|
| 99 | 99 | $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
| 100 | +} |
|
| 100 | 101 | |
| 101 | 102 | // Interbreadcrumb for the current directory root path |
| 102 | 103 | if (empty($document_data['parents'])) { |
@@ -158,8 +159,7 @@ discard block |
||
| 158 | 159 | @file_put_contents($path_and_file, $crossdomain); |
| 159 | 160 | } |
| 160 | 161 | $credentials="true"; |
| 161 | -} |
|
| 162 | -else { |
|
| 162 | +} else { |
|
| 163 | 163 | $credentials="false"; |
| 164 | 164 | } |
| 165 | 165 | |
@@ -61,44 +61,44 @@ discard block |
||
| 61 | 61 | /* Please, do not modify this dirname formatting */ |
| 62 | 62 | |
| 63 | 63 | if (strstr($dir, '..')) { |
| 64 | - $dir = '/'; |
|
| 64 | + $dir = '/'; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | if ($dir[0] == '.') { |
| 68 | - $dir = substr($dir, 1); |
|
| 68 | + $dir = substr($dir, 1); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | if ($dir[0] != '/') { |
| 72 | - $dir = '/'.$dir; |
|
| 72 | + $dir = '/'.$dir; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if ($dir[strlen($dir) - 1] != '/') { |
| 76 | - $dir .= '/'; |
|
| 76 | + $dir .= '/'; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
| 80 | 80 | |
| 81 | 81 | if (!is_dir($filepath)) { |
| 82 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 83 | - $dir = '/'; |
|
| 82 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
| 83 | + $dir = '/'; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | //groups //TODO:clean |
| 87 | 87 | if (!empty($groupId)) { |
| 88 | - $interbreadcrumb[] = array( |
|
| 89 | - 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
| 90 | - 'name' => get_lang('GroupSpace'), |
|
| 91 | - ); |
|
| 92 | - $group_document = true; |
|
| 93 | - $noPHP_SELF = true; |
|
| 88 | + $interbreadcrumb[] = array( |
|
| 89 | + 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
| 90 | + 'name' => get_lang('GroupSpace'), |
|
| 91 | + ); |
|
| 92 | + $group_document = true; |
|
| 93 | + $noPHP_SELF = true; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
| 97 | 97 | |
| 98 | 98 | if (!$is_certificate_mode) |
| 99 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
| 99 | + $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
| 100 | 100 | else |
| 101 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 101 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 102 | 102 | |
| 103 | 103 | // Interbreadcrumb for the current directory root path |
| 104 | 104 | if (empty($document_data['parents'])) { |
@@ -113,10 +113,10 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
| 116 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
| 116 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
| 117 | 117 | |
| 118 | 118 | if (!$is_allowedToEdit) { |
| 119 | - api_not_allowed(true); |
|
| 119 | + api_not_allowed(true); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | Event::event_access_tool(TOOL_DOCUMENT); |
@@ -148,21 +148,21 @@ discard block |
||
| 148 | 148 | $locktitle="false"; |
| 149 | 149 | |
| 150 | 150 | if ($_SERVER['HTTP_HOST']=="localhost") { |
| 151 | - $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml'; |
|
| 152 | - if (!file_exists($path_and_file)) { |
|
| 153 | - $crossdomain='<?xml version="1.0"?> |
|
| 151 | + $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml'; |
|
| 152 | + if (!file_exists($path_and_file)) { |
|
| 153 | + $crossdomain='<?xml version="1.0"?> |
|
| 154 | 154 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
| 155 | 155 | <cross-domain-policy> |
| 156 | 156 | <allow-access-from domain="cdn.pixlr.com" /> |
| 157 | 157 | <site-control permitted-cross-domain-policies="master-only"/> |
| 158 | 158 | <allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/> |
| 159 | 159 | </cross-domain-policy>';//more open domain="*" |
| 160 | - @file_put_contents($path_and_file, $crossdomain); |
|
| 161 | - } |
|
| 162 | - $credentials="true"; |
|
| 160 | + @file_put_contents($path_and_file, $crossdomain); |
|
| 161 | + } |
|
| 162 | + $credentials="true"; |
|
| 163 | 163 | } |
| 164 | 164 | else { |
| 165 | - $credentials="false"; |
|
| 165 | + $credentials="false"; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | //make temp images |
@@ -175,23 +175,23 @@ discard block |
||
| 175 | 175 | $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
| 176 | 176 | if (!file_exists($htaccess)) { |
| 177 | 177 | |
| 178 | - $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
| 178 | + $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
| 179 | 179 | |
| 180 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
| 181 | - if ($fp) { |
|
| 182 | - fwrite($fp, $htaccess_content); |
|
| 183 | - fclose($fp); |
|
| 184 | - } |
|
| 180 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
| 181 | + if ($fp) { |
|
| 182 | + fwrite($fp, $htaccess_content); |
|
| 183 | + fclose($fp); |
|
| 184 | + } |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
| 188 | 188 | if (!file_exists($html_index)) { |
| 189 | - $html_index_content="<html><head></head><body></body></html>"; |
|
| 190 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
| 191 | - if ($fp) { |
|
| 192 | - fwrite($fp, $html_index_content); |
|
| 193 | - fclose($fp); |
|
| 194 | - } |
|
| 189 | + $html_index_content="<html><head></head><body></body></html>"; |
|
| 190 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
| 191 | + if ($fp) { |
|
| 192 | + fwrite($fp, $html_index_content); |
|
| 193 | + fclose($fp); |
|
| 194 | + } |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | //encript temp name file |
@@ -33,26 +33,26 @@ discard block |
||
| 33 | 33 | $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | -$dir= str_replace('\\', '/', $dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
| 36 | +$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
| 37 | 37 | |
| 38 | 38 | /* Constants & Variables */ |
| 39 | -$current_session_id=api_get_session_id(); |
|
| 39 | +$current_session_id = api_get_session_id(); |
|
| 40 | 40 | //path for pixlr save |
| 41 | -$_SESSION['paint_dir']=Security::remove_XSS($dir); |
|
| 42 | -if($_SESSION['paint_dir']=='/'){ |
|
| 43 | - $_SESSION['paint_dir']=''; |
|
| 41 | +$_SESSION['paint_dir'] = Security::remove_XSS($dir); |
|
| 42 | +if ($_SESSION['paint_dir'] == '/') { |
|
| 43 | + $_SESSION['paint_dir'] = ''; |
|
| 44 | 44 | } |
| 45 | -$_SESSION['paint_file']=basename(Security::remove_XSS($file_path)); |
|
| 45 | +$_SESSION['paint_file'] = basename(Security::remove_XSS($file_path)); |
|
| 46 | 46 | |
| 47 | 47 | $get_file = Security::remove_XSS($file_path); |
| 48 | 48 | |
| 49 | 49 | $file = basename($get_file); |
| 50 | 50 | |
| 51 | -$temp_file = explode(".",$file); |
|
| 52 | -$filename=$temp_file[0]; |
|
| 53 | -$nameTools = get_lang('EditDocument') . ': '.$filename; |
|
| 51 | +$temp_file = explode(".", $file); |
|
| 52 | +$filename = $temp_file[0]; |
|
| 53 | +$nameTools = get_lang('EditDocument').': '.$filename; |
|
| 54 | 54 | |
| 55 | -$courseDir = $_course['path'].'/document'; |
|
| 55 | +$courseDir = $_course['path'].'/document'; |
|
| 56 | 56 | |
| 57 | 57 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
| 58 | 58 | |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
| 97 | 97 | |
| 98 | 98 | if (!$is_certificate_mode) |
| 99 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
| 99 | + $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
| 100 | 100 | else |
| 101 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 101 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
| 102 | 102 | |
| 103 | 103 | // Interbreadcrumb for the current directory root path |
| 104 | 104 | if (empty($document_data['parents'])) { |
| 105 | 105 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
| 106 | 106 | } else { |
| 107 | - foreach($document_data['parents'] as $document_sub_data) { |
|
| 107 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
| 108 | 108 | if ($document_data['title'] == $document_sub_data['title']) { |
| 109 | 109 | continue; |
| 110 | 110 | } |
@@ -124,33 +124,33 @@ discard block |
||
| 124 | 124 | Display :: display_header($nameTools, 'Doc'); |
| 125 | 125 | echo '<div class="actions">'; |
| 126 | 126 | echo '<a href="document.php?id='.$parent_id.'&'.api_get_cidreq().'">'. |
| 127 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 127 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 128 | 128 | echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_get_cidreq().'&origin=editpaint">'. |
| 129 | - Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 129 | + Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 130 | 130 | echo '</div>'; |
| 131 | 131 | |
| 132 | 132 | ///pixlr |
| 133 | -$title=$file;//disk name. No sql name because pixlr return this when save |
|
| 133 | +$title = $file; //disk name. No sql name because pixlr return this when save |
|
| 134 | 134 | $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
| 135 | -$langpixlr = api_get_language_isocode(); |
|
| 135 | +$langpixlr = api_get_language_isocode(); |
|
| 136 | 136 | $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr; |
| 137 | -$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser |
|
| 137 | +$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser |
|
| 138 | 138 | |
| 139 | -$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
| 140 | -$_SESSION['exit_pixlr']= Security::remove_XSS($parent_id); |
|
| 139 | +$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
| 140 | +$_SESSION['exit_pixlr'] = Security::remove_XSS($parent_id); |
|
| 141 | 141 | |
| 142 | -$referrer="Chamilo"; |
|
| 142 | +$referrer = "Chamilo"; |
|
| 143 | 143 | |
| 144 | -$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
| 145 | -$target=$target_path; |
|
| 144 | +$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
| 145 | +$target = $target_path; |
|
| 146 | 146 | |
| 147 | -$locktarget="true"; |
|
| 148 | -$locktitle="false"; |
|
| 147 | +$locktarget = "true"; |
|
| 148 | +$locktitle = "false"; |
|
| 149 | 149 | |
| 150 | -if ($_SERVER['HTTP_HOST']=="localhost") { |
|
| 151 | - $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml'; |
|
| 150 | +if ($_SERVER['HTTP_HOST'] == "localhost") { |
|
| 151 | + $path_and_file = api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml'; |
|
| 152 | 152 | if (!file_exists($path_and_file)) { |
| 153 | - $crossdomain='<?xml version="1.0"?> |
|
| 153 | + $crossdomain = '<?xml version="1.0"?> |
|
| 154 | 154 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
| 155 | 155 | <cross-domain-policy> |
| 156 | 156 | <allow-access-from domain="cdn.pixlr.com" /> |
@@ -159,23 +159,23 @@ discard block |
||
| 159 | 159 | </cross-domain-policy>';//more open domain="*" |
| 160 | 160 | @file_put_contents($path_and_file, $crossdomain); |
| 161 | 161 | } |
| 162 | - $credentials="true"; |
|
| 162 | + $credentials = "true"; |
|
| 163 | 163 | } |
| 164 | 164 | else { |
| 165 | - $credentials="false"; |
|
| 165 | + $credentials = "false"; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | //make temp images |
| 169 | -$temp_folder=api_get_path(SYS_ARCHIVE_PATH).'temp/images'; |
|
| 169 | +$temp_folder = api_get_path(SYS_ARCHIVE_PATH).'temp/images'; |
|
| 170 | 170 | if (!file_exists($temp_folder)) { |
| 171 | - @mkdir($temp_folder, api_get_permissions_for_new_directories(), true);//TODO:check $permissions value, now empty; |
|
| 171 | + @mkdir($temp_folder, api_get_permissions_for_new_directories(), true); //TODO:check $permissions value, now empty; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | //make htaccess with allow from all, and file index.html into temp/images |
| 175 | -$htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
|
| 175 | +$htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
|
| 176 | 176 | if (!file_exists($htaccess)) { |
| 177 | 177 | |
| 178 | - $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
| 178 | + $htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
| 179 | 179 | |
| 180 | 180 | $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
| 181 | 181 | if ($fp) { |
@@ -184,9 +184,9 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | -$html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
|
| 187 | +$html_index = api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
|
| 188 | 188 | if (!file_exists($html_index)) { |
| 189 | - $html_index_content="<html><head></head><body></body></html>"; |
|
| 189 | + $html_index_content = "<html><head></head><body></body></html>"; |
|
| 190 | 190 | $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
| 191 | 191 | if ($fp) { |
| 192 | 192 | fwrite($fp, $html_index_content); |
@@ -195,20 +195,20 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | //encript temp name file |
| 198 | -$name_crip=sha1(uniqid());//encript |
|
| 199 | -$findext= explode(".", $file); |
|
| 200 | -$extension= $findext[count($findext)-1]; |
|
| 201 | -$file_crip=$name_crip.'.'.$extension; |
|
| 198 | +$name_crip = sha1(uniqid()); //encript |
|
| 199 | +$findext = explode(".", $file); |
|
| 200 | +$extension = $findext[count($findext) - 1]; |
|
| 201 | +$file_crip = $name_crip.'.'.$extension; |
|
| 202 | 202 | |
| 203 | 203 | //copy file to temp/images directory |
| 204 | -$from=$filepath.$file; |
|
| 205 | -$to=api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
| 204 | +$from = $filepath.$file; |
|
| 205 | +$to = api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
| 206 | 206 | copy($from, $to); |
| 207 | -$_SESSION['temp_realpath_image']=$to; |
|
| 207 | +$_SESSION['temp_realpath_image'] = $to; |
|
| 208 | 208 | |
| 209 | 209 | //load image to url |
| 210 | -$to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
| 211 | -$image=urlencode($to_url); |
|
| 210 | +$to_url = api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
| 211 | +$image = urlencode($to_url); |
|
| 212 | 212 | $pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; |
| 213 | 213 | |
| 214 | 214 | //make frame an send image |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | // Resetting the images of the slideshow = destroying the slideshow |
| 31 | 31 | if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') { |
| 32 | - $_SESSION['image_files_only'] = null; |
|
| 33 | - unset($image_files_only); |
|
| 32 | + $_SESSION['image_files_only'] = null; |
|
| 33 | + unset($image_files_only); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // We check if there are images in this folder by searching the extensions for .jpg, .gif, .png |
@@ -39,10 +39,10 @@ discard block |
||
| 39 | 39 | $array_to_search = !empty($documentAndFolders) && is_array($documentAndFolders) ? $documentAndFolders : array(); |
| 40 | 40 | |
| 41 | 41 | if (count($array_to_search) > 0) { |
| 42 | - while (list($key) = each($array_to_search)) { |
|
| 43 | - $all_files[] = basename($array_to_search[$key]['path']); |
|
| 44 | - //echo basename($array_to_search[$key]['path']).'<br />'; |
|
| 45 | - } |
|
| 42 | + while (list($key) = each($array_to_search)) { |
|
| 43 | + $all_files[] = basename($array_to_search[$key]['path']); |
|
| 44 | + //echo basename($array_to_search[$key]['path']).'<br />'; |
|
| 45 | + } |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | // Always show gallery. |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $tablename_column = isset($_GET['tablename_column']) ? Security::remove_XSS($_GET['tablename_column']) : 0; |
| 64 | 64 | if ($tablename_column == 0) { |
| 65 | - $tablename_column = 1; |
|
| 65 | + $tablename_column = 1; |
|
| 66 | 66 | } else { |
| 67 | - $tablename_column = intval($tablename_column) - 1; |
|
| 67 | + $tablename_column = intval($tablename_column) - 1; |
|
| 68 | 68 | } |
| 69 | 69 | $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XSS($_GET['tablename_direction']) : 'ASC'; |
| 70 | 70 | |
@@ -98,15 +98,15 @@ discard block |
||
| 98 | 98 | $final_array[] = $file_array[1]; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - return $final_array; |
|
| 101 | + return $final_array; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | function sort_table($a, $b) { |
| 105 | - global $tablename_column; |
|
| 106 | - return strnatcmp($a[$tablename_column], $b[$tablename_column]); |
|
| 105 | + global $tablename_column; |
|
| 106 | + return strnatcmp($a[$tablename_column], $b[$tablename_column]); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | function rsort_table($a, $b) { |
| 110 | - global $tablename_column; |
|
| 111 | - return strnatcmp($b[$tablename_column], $a[$tablename_column]); |
|
| 110 | + global $tablename_column; |
|
| 111 | + return strnatcmp($b[$tablename_column], $a[$tablename_column]); |
|
| 112 | 112 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | * too much things in one file , I decided to put the code for document.php here and to include this |
| 26 | 26 | * file into document.php |
| 27 | 27 | */ |
| 28 | -$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp','.svg'); |
|
| 28 | +$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.svg'); |
|
| 29 | 29 | |
| 30 | 30 | // Resetting the images of the slideshow = destroying the slideshow |
| 31 | 31 | if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | // A student should not be able to download a root shared directory |
| 53 | 53 | if (($path == '/shared_folder' || |
| 54 | - $path == '/shared_folder_session_' . api_get_session_id()) && |
|
| 54 | + $path == '/shared_folder_session_'.api_get_session_id()) && |
|
| 55 | 55 | (!api_is_allowed_to_edit() || !api_is_platform_admin()) |
| 56 | 56 | ) { |
| 57 | 57 | api_not_allowed(true); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | (props.session_id IN ('0', '$sessionId') OR props.session_id IS NULL) AND |
| 150 | 150 | docs.c_id = ".$courseId." "; |
| 151 | 151 | |
| 152 | - $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
| 152 | + $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
| 153 | 153 | |
| 154 | 154 | $result = Database::query($sql); |
| 155 | 155 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $groupCondition |
| 215 | 215 | "; |
| 216 | 216 | |
| 217 | - $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
| 217 | + $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
| 218 | 218 | $result = Database::query($sql); |
| 219 | 219 | |
| 220 | 220 | $files = array(); |
@@ -294,9 +294,9 @@ discard block |
||
| 294 | 294 | // Add all files in our final array to the zipfile |
| 295 | 295 | for ($i = 0; $i < count($files_for_zipfile); $i++) { |
| 296 | 296 | $zip->add( |
| 297 | - $sysCoursePath . $courseInfo['path'] . '/document' . $files_for_zipfile[$i], |
|
| 297 | + $sysCoursePath.$courseInfo['path'].'/document'.$files_for_zipfile[$i], |
|
| 298 | 298 | PCLZIP_OPT_REMOVE_PATH, |
| 299 | - $sysCoursePath . $courseInfo['path'] . '/document' . $remove_dir, |
|
| 299 | + $sysCoursePath.$courseInfo['path'].'/document'.$remove_dir, |
|
| 300 | 300 | PCLZIP_CB_PRE_ADD, |
| 301 | 301 | 'fixDocumentNameCallback' |
| 302 | 302 | ); |
@@ -212,7 +212,7 @@ |
||
| 212 | 212 | * @param array $arr1 first array |
| 213 | 213 | * @param array $arr2 second array |
| 214 | 214 | * |
| 215 | - * @return array difference between the two arrays |
|
| 215 | + * @return string difference between the two arrays |
|
| 216 | 216 | */ |
| 217 | 217 | function diff($arr1, $arr2) |
| 218 | 218 | { |