@@ -23,26 +23,26 @@ discard block |
||
23 | 23 | $groupId = api_get_group_id(); |
24 | 24 | |
25 | 25 | if (api_get_setting('enabled_text2audio') == 'false') { |
26 | - api_not_allowed(true); |
|
26 | + api_not_allowed(true); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | $document_data = DocumentManager::get_document_data_by_id( |
30 | - $_REQUEST['id'], |
|
31 | - api_get_course_id() |
|
30 | + $_REQUEST['id'], |
|
31 | + api_get_course_id() |
|
32 | 32 | ); |
33 | 33 | if (empty($document_data)) { |
34 | 34 | if (api_is_in_group()) { |
35 | - $group_properties = GroupManager::get_group_properties( |
|
36 | - $groupId |
|
37 | - ); |
|
38 | - $document_id = DocumentManager::get_document_id( |
|
39 | - api_get_course_info(), |
|
40 | - $group_properties['directory'] |
|
41 | - ); |
|
42 | - $document_data = DocumentManager::get_document_data_by_id( |
|
43 | - $document_id, |
|
44 | - api_get_course_id() |
|
45 | - ); |
|
35 | + $group_properties = GroupManager::get_group_properties( |
|
36 | + $groupId |
|
37 | + ); |
|
38 | + $document_id = DocumentManager::get_document_id( |
|
39 | + api_get_course_info(), |
|
40 | + $group_properties['directory'] |
|
41 | + ); |
|
42 | + $document_data = DocumentManager::get_document_data_by_id( |
|
43 | + $document_id, |
|
44 | + api_get_course_id() |
|
45 | + ); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | $document_id = $document_data['id']; |
@@ -55,53 +55,53 @@ discard block |
||
55 | 55 | // Please, do not modify this dirname formatting |
56 | 56 | |
57 | 57 | if (strstr($dir, '..')) { |
58 | - $dir = '/'; |
|
58 | + $dir = '/'; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | if ($dir[0] == '.') { |
62 | - $dir = substr($dir, 1); |
|
62 | + $dir = substr($dir, 1); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | if ($dir[0] != '/') { |
66 | - $dir = '/'.$dir; |
|
66 | + $dir = '/'.$dir; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | if ($dir[strlen($dir) - 1] != '/') { |
70 | - $dir .= '/'; |
|
70 | + $dir .= '/'; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
74 | 74 | |
75 | 75 | if (!is_dir($filepath)) { |
76 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
77 | - $dir = '/'; |
|
76 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
77 | + $dir = '/'; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | //groups //TODO: clean |
81 | 81 | if (!empty($groupId)) { |
82 | - $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
83 | - $group = GroupManager :: get_group_properties($groupId); |
|
84 | - $path = explode('/', $dir); |
|
85 | - if ('/'.$path[1] != $group['directory']) { |
|
86 | - api_not_allowed(true); |
|
87 | - } |
|
82 | + $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
83 | + $group = GroupManager :: get_group_properties($groupId); |
|
84 | + $path = explode('/', $dir); |
|
85 | + if ('/'.$path[1] != $group['directory']) { |
|
86 | + api_not_allowed(true); |
|
87 | + } |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | $interbreadcrumb[] = array ("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
91 | 91 | |
92 | 92 | if (!$is_allowed_in_course) { |
93 | - api_not_allowed(true); |
|
93 | + api_not_allowed(true); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | |
97 | 97 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
98 | - DocumentManager::is_my_shared_folder( |
|
99 | - api_get_user_id(), |
|
100 | - Security::remove_XSS($dir), |
|
101 | - api_get_session_id() |
|
102 | - )) |
|
98 | + DocumentManager::is_my_shared_folder( |
|
99 | + api_get_user_id(), |
|
100 | + Security::remove_XSS($dir), |
|
101 | + api_get_session_id() |
|
102 | + )) |
|
103 | 103 | ) { |
104 | - api_not_allowed(true); |
|
104 | + api_not_allowed(true); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | |
111 | 111 | $display_dir = $dir; |
112 | 112 | if (isset ($group)) { |
113 | - $display_dir = explode('/', $dir); |
|
114 | - unset ($display_dir[0]); |
|
115 | - unset ($display_dir[1]); |
|
116 | - $display_dir = implode('/', $display_dir); |
|
113 | + $display_dir = explode('/', $dir); |
|
114 | + unset ($display_dir[0]); |
|
115 | + unset ($display_dir[1]); |
|
116 | + $display_dir = implode('/', $display_dir); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | // Interbreadcrumb for the current directory root path |
@@ -123,22 +123,22 @@ discard block |
||
123 | 123 | |
124 | 124 | $dir_acum = ''; |
125 | 125 | for ($i = 0; $i < $array_len; $i++) { |
126 | - $url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i]; |
|
127 | - //Max char 80 |
|
128 | - $url_to_who = cut($dir_array[$i],80); |
|
129 | - $interbreadcrumb[] = array('url' => $url_dir, 'name' => $url_to_who); |
|
130 | - $dir_acum .= $dir_array[$i].'/'; |
|
126 | + $url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i]; |
|
127 | + //Max char 80 |
|
128 | + $url_to_who = cut($dir_array[$i],80); |
|
129 | + $interbreadcrumb[] = array('url' => $url_dir, 'name' => $url_to_who); |
|
130 | + $dir_acum .= $dir_array[$i].'/'; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | Display :: display_header($nameTools, 'Doc'); |
134 | 134 | |
135 | 135 | echo '<div class="actions">'; |
136 | 136 | echo '<a href="document.php?id='.$document_id.'">'. |
137 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
137 | + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
138 | 138 | echo '<a href="create_audio.php?'.api_get_cidreq().'&id='.$document_id.'&dt2a=google">'. |
139 | - Display::return_icon('google.png',get_lang('GoogleAudio'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
139 | + Display::return_icon('google.png',get_lang('GoogleAudio'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
140 | 140 | echo '<a href="create_audio.php?'.api_get_cidreq().'&id='.$document_id.'&dt2a=pediaphon">'. |
141 | - Display::return_icon('pediaphon.png', get_lang('Pediaphon'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
141 | + Display::return_icon('pediaphon.png', get_lang('Pediaphon'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
142 | 142 | echo '</div>'; |
143 | 143 | |
144 | 144 | ?> |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | <?php |
192 | 192 | |
193 | 193 | if (isset($_POST['text2voice_mode']) && $_POST['text2voice_mode'] == 'google') { |
194 | - downloadMP3_google($filepath, $dir); |
|
194 | + downloadMP3_google($filepath, $dir); |
|
195 | 195 | } elseif (isset($_POST['text2voice_mode']) && $_POST['text2voice_mode'] == 'pediaphon') { |
196 | - downloadMP3_pediaphon($filepath, $dir); |
|
196 | + downloadMP3_pediaphon($filepath, $dir); |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); |
@@ -204,65 +204,65 @@ discard block |
||
204 | 204 | $selected_language = null; |
205 | 205 | |
206 | 206 | while ($row = Database::fetch_array($result_select)) { |
207 | - $options[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')'; |
|
208 | - if (in_array($row['isocode'], array('de', 'en', 'es', 'fr'))){ |
|
209 | - $options_pedia[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')'; |
|
210 | - } |
|
207 | + $options[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')'; |
|
208 | + if (in_array($row['isocode'], array('de', 'en', 'es', 'fr'))){ |
|
209 | + $options_pedia[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')'; |
|
210 | + } |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | $icon = Display::return_icon('text2audio.png', get_lang('HelpText2Audio'),'',ICON_SIZE_MEDIUM); |
214 | 214 | echo '<div class="page-header"><h2>'.$icon.get_lang('HelpText2Audio').'</h2></div>'; |
215 | 215 | |
216 | 216 | if (Security::remove_XSS($_GET['dt2a']) == 'google') { |
217 | - $selected_language = api_get_language_isocode();//lang default is the course language |
|
218 | - echo '<div>'; |
|
219 | - $form = new FormValidator('form1', 'post', null, '', array('id' => 'form1')); |
|
220 | - $form->addElement('hidden', 'text2voice_mode', 'google'); |
|
221 | - $form->addElement('hidden', 'id', $document_id); |
|
222 | - $form->addElement('text', 'title', get_lang('Title')); |
|
223 | - $form->addElement('select', 'lang', get_lang('Language'), $options); |
|
224 | - $form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_google')); |
|
225 | - //echo Display :: return_icon('info3.gif', get_lang('HelpGoogleAudio'), array('align' => 'absmiddle', 'hspace' => '3px'), false); |
|
226 | - $form->addButtonSave(get_lang('SaveMP3')); |
|
227 | - $defaults = array(); |
|
228 | - $defaults['lang'] = $selected_language; |
|
229 | - $form->setDefaults($defaults); |
|
230 | - $form->display(); |
|
231 | - |
|
232 | - echo '</div>'; |
|
217 | + $selected_language = api_get_language_isocode();//lang default is the course language |
|
218 | + echo '<div>'; |
|
219 | + $form = new FormValidator('form1', 'post', null, '', array('id' => 'form1')); |
|
220 | + $form->addElement('hidden', 'text2voice_mode', 'google'); |
|
221 | + $form->addElement('hidden', 'id', $document_id); |
|
222 | + $form->addElement('text', 'title', get_lang('Title')); |
|
223 | + $form->addElement('select', 'lang', get_lang('Language'), $options); |
|
224 | + $form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_google')); |
|
225 | + //echo Display :: return_icon('info3.gif', get_lang('HelpGoogleAudio'), array('align' => 'absmiddle', 'hspace' => '3px'), false); |
|
226 | + $form->addButtonSave(get_lang('SaveMP3')); |
|
227 | + $defaults = array(); |
|
228 | + $defaults['lang'] = $selected_language; |
|
229 | + $form->setDefaults($defaults); |
|
230 | + $form->display(); |
|
231 | + |
|
232 | + echo '</div>'; |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | if (Security::remove_XSS($_GET['dt2a']) == 'pediaphon') { |
236 | - //lang default is a default message |
|
237 | - $selected_language = "defaultmessage"; |
|
238 | - $options_pedia['defaultmessage'] =get_lang('FirstSelectALanguage'); |
|
239 | - $options['defaultmessage'] =get_lang('FirstSelectALanguage'); |
|
240 | - echo '<div>'; |
|
241 | - |
|
242 | - $form = new FormValidator('form2', 'post', null, '', array('id' => 'form2')); |
|
243 | - $form->addElement('hidden', 'text2voice_mode','pediaphon'); |
|
244 | - $form->addElement('hidden', 'id', $document_id); |
|
245 | - $form->addElement('text', 'title', get_lang('Title')); |
|
246 | - $form->addElement('select', 'lang', get_lang('Language'), $options_pedia, array('onclick' => 'update_voices(this.selectedIndex);')); |
|
247 | - $form->addElement('select', 'voices', get_lang('Voice'), array(get_lang('FirstSelectALanguage')), array()); |
|
248 | - $speed_options = array(); |
|
249 | - $speed_options['1'] = get_lang('Normal'); |
|
250 | - $speed_options['0.75'] = get_lang('GoFaster'); |
|
251 | - $speed_options['0.8'] = get_lang('Fast'); |
|
252 | - $speed_options['1.2'] = get_lang('Slow'); |
|
253 | - $speed_options['1.6'] = get_lang('SlowDown'); |
|
254 | - |
|
255 | - $form->addElement('select', 'speed', get_lang('Speed'), $speed_options, array()); |
|
256 | - $form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_pediaphon')); |
|
257 | - //echo Display :: return_icon('info3.gif', get_lang('HelpPediaphon'), array('align' => 'absmiddle', 'hspace' => '3px'), false); |
|
258 | - $form->addButtonSave(get_lang('SaveMP3')); |
|
259 | - $defaults = array(); |
|
260 | - $defaults['lang'] = $selected_language; |
|
261 | - $form->setDefaults($defaults); |
|
262 | - $form->display(); |
|
263 | - echo '</div>'; |
|
264 | - |
|
265 | - ?> |
|
236 | + //lang default is a default message |
|
237 | + $selected_language = "defaultmessage"; |
|
238 | + $options_pedia['defaultmessage'] =get_lang('FirstSelectALanguage'); |
|
239 | + $options['defaultmessage'] =get_lang('FirstSelectALanguage'); |
|
240 | + echo '<div>'; |
|
241 | + |
|
242 | + $form = new FormValidator('form2', 'post', null, '', array('id' => 'form2')); |
|
243 | + $form->addElement('hidden', 'text2voice_mode','pediaphon'); |
|
244 | + $form->addElement('hidden', 'id', $document_id); |
|
245 | + $form->addElement('text', 'title', get_lang('Title')); |
|
246 | + $form->addElement('select', 'lang', get_lang('Language'), $options_pedia, array('onclick' => 'update_voices(this.selectedIndex);')); |
|
247 | + $form->addElement('select', 'voices', get_lang('Voice'), array(get_lang('FirstSelectALanguage')), array()); |
|
248 | + $speed_options = array(); |
|
249 | + $speed_options['1'] = get_lang('Normal'); |
|
250 | + $speed_options['0.75'] = get_lang('GoFaster'); |
|
251 | + $speed_options['0.8'] = get_lang('Fast'); |
|
252 | + $speed_options['1.2'] = get_lang('Slow'); |
|
253 | + $speed_options['1.6'] = get_lang('SlowDown'); |
|
254 | + |
|
255 | + $form->addElement('select', 'speed', get_lang('Speed'), $speed_options, array()); |
|
256 | + $form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_pediaphon')); |
|
257 | + //echo Display :: return_icon('info3.gif', get_lang('HelpPediaphon'), array('align' => 'absmiddle', 'hspace' => '3px'), false); |
|
258 | + $form->addButtonSave(get_lang('SaveMP3')); |
|
259 | + $defaults = array(); |
|
260 | + $defaults['lang'] = $selected_language; |
|
261 | + $form->setDefaults($defaults); |
|
262 | + $form->display(); |
|
263 | + echo '</div>'; |
|
264 | + |
|
265 | + ?> |
|
266 | 266 | |
267 | 267 | <!-- javascript form name form2 update voices --> |
268 | 268 | <script type="text/javascript"> |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | }//end pediaphon |
293 | 293 | |
294 | 294 | //vozMe services |
295 | - //disabled for a time |
|
295 | + //disabled for a time |
|
296 | 296 | /* |
297 | 297 | echo '<div> </div><input type="checkbox" value="1" name="checktext2voice" onclick="javascript: if(this.checked){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/> <img src="../img/file_sound.gif" title="'.get_lang('HelpvozMe').'" alt="'.get_lang('vozMe').'"/> '.get_lang('vozMe').''; |
298 | 298 | echo ' <span id="msg_error3" style="display:none;color:red"></span>'; |
@@ -352,43 +352,43 @@ discard block |
||
352 | 352 | { |
353 | 353 | $location='create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=google'; |
354 | 354 | |
355 | - //security |
|
356 | - if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { |
|
357 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
358 | - return; |
|
359 | - } |
|
355 | + //security |
|
356 | + if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { |
|
357 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
358 | + return; |
|
359 | + } |
|
360 | 360 | |
361 | - $_course = api_get_course_info(); |
|
362 | - $_user = api_get_user_info(); |
|
361 | + $_course = api_get_course_info(); |
|
362 | + $_user = api_get_user_info(); |
|
363 | 363 | |
364 | - $clean_title=trim($_POST['title']); |
|
365 | - $clean_text=trim($_POST['text']); |
|
366 | - if(empty($clean_title) || empty($clean_text)){ |
|
367 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
368 | - return; |
|
369 | - } |
|
370 | - $clean_title = Security::remove_XSS($clean_title); |
|
371 | - $clean_title = Database::escape_string($clean_title); |
|
372 | - $clean_title = str_replace(' ', '_', $clean_title);//compound file names |
|
373 | - |
|
374 | - $clean_text = Security::remove_XSS($clean_text); |
|
375 | - $clean_lang = Security::remove_XSS($_POST['lang']); |
|
376 | - |
|
377 | - $extension='mp3'; |
|
378 | - $audio_filename=$clean_title.'.'.$extension; |
|
379 | - $audio_title = str_replace('_',' ',$clean_title); |
|
380 | - |
|
381 | - //prevent duplicates |
|
382 | - if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){ |
|
383 | - $i = 1; |
|
384 | - while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++; |
|
385 | - $audio_filename = $clean_title . '_' . $i . '.'.$extension; |
|
386 | - $audio_title = $clean_title . '_' . $i . '.'.$extension; |
|
387 | - $audio_title = str_replace('_',' ',$audio_title); |
|
388 | - } |
|
364 | + $clean_title=trim($_POST['title']); |
|
365 | + $clean_text=trim($_POST['text']); |
|
366 | + if(empty($clean_title) || empty($clean_text)){ |
|
367 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
368 | + return; |
|
369 | + } |
|
370 | + $clean_title = Security::remove_XSS($clean_title); |
|
371 | + $clean_title = Database::escape_string($clean_title); |
|
372 | + $clean_title = str_replace(' ', '_', $clean_title);//compound file names |
|
373 | + |
|
374 | + $clean_text = Security::remove_XSS($clean_text); |
|
375 | + $clean_lang = Security::remove_XSS($_POST['lang']); |
|
376 | + |
|
377 | + $extension='mp3'; |
|
378 | + $audio_filename=$clean_title.'.'.$extension; |
|
379 | + $audio_title = str_replace('_',' ',$clean_title); |
|
380 | + |
|
381 | + //prevent duplicates |
|
382 | + if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){ |
|
383 | + $i = 1; |
|
384 | + while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++; |
|
385 | + $audio_filename = $clean_title . '_' . $i . '.'.$extension; |
|
386 | + $audio_title = $clean_title . '_' . $i . '.'.$extension; |
|
387 | + $audio_title = str_replace('_',' ',$audio_title); |
|
388 | + } |
|
389 | 389 | |
390 | - $documentPath = $filepath.'/'.$audio_filename; |
|
391 | - /* |
|
390 | + $documentPath = $filepath.'/'.$audio_filename; |
|
391 | + /* |
|
392 | 392 | |
393 | 393 | //prev for a fine unicode, borrowed from main api TODO:clean |
394 | 394 | // Safe replacements for some non-letter characters (whitout blank spaces) |
@@ -403,52 +403,52 @@ discard block |
||
403 | 403 | $filename = api_transliterate($filename, 'x', $encoding); |
404 | 404 | // Replacing remaining dangerous non-letter characters. |
405 | 405 | $clean_text = str_replace($search, $replace, $filename);*/ |
406 | - $clean_text = api_replace_dangerous_char($clean_text); |
|
406 | + $clean_text = api_replace_dangerous_char($clean_text); |
|
407 | 407 | |
408 | - // adding the file |
|
409 | - // add new file to disk |
|
408 | + // adding the file |
|
409 | + // add new file to disk |
|
410 | 410 | |
411 | - $proxySettings = api_get_configuration_value('proxy_settings'); |
|
412 | - $url = "http://translate.google.com/translate_tts?tl=".$clean_lang."&q=".urlencode($clean_text).""; |
|
411 | + $proxySettings = api_get_configuration_value('proxy_settings'); |
|
412 | + $url = "http://translate.google.com/translate_tts?tl=".$clean_lang."&q=".urlencode($clean_text).""; |
|
413 | 413 | |
414 | - if (empty($proxySettings)) { |
|
415 | - $content = file_get_contents($url); |
|
416 | - } else { |
|
417 | - $context = stream_context_create($proxySettings); |
|
418 | - $content = file_get_contents($url, false, $context); |
|
419 | - } |
|
414 | + if (empty($proxySettings)) { |
|
415 | + $content = file_get_contents($url); |
|
416 | + } else { |
|
417 | + $context = stream_context_create($proxySettings); |
|
418 | + $content = file_get_contents($url, false, $context); |
|
419 | + } |
|
420 | 420 | |
421 | 421 | file_put_contents( |
422 | 422 | $documentPath, |
423 | 423 | $content |
424 | 424 | ); |
425 | 425 | |
426 | - // add document to database |
|
427 | - $current_session_id = api_get_session_id(); |
|
428 | - $groupId = api_get_group_id(); |
|
429 | - $relativeUrlPath=$dir; |
|
430 | - $doc_id = add_document( |
|
431 | - $_course, |
|
432 | - $relativeUrlPath.$audio_filename, |
|
433 | - 'file', |
|
434 | - filesize($documentPath), |
|
435 | - $audio_title |
|
436 | - ); |
|
437 | - api_item_property_update( |
|
438 | - $_course, |
|
439 | - TOOL_DOCUMENT, |
|
440 | - $doc_id, |
|
441 | - 'DocumentAdded', |
|
442 | - $_user['user_id'], |
|
443 | - $groupId, |
|
444 | - null, |
|
445 | - null, |
|
446 | - null, |
|
447 | - $current_session_id |
|
448 | - ); |
|
449 | - Display::display_confirmation_message(get_lang('DocumentCreated')); |
|
450 | - //return to location |
|
451 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
426 | + // add document to database |
|
427 | + $current_session_id = api_get_session_id(); |
|
428 | + $groupId = api_get_group_id(); |
|
429 | + $relativeUrlPath=$dir; |
|
430 | + $doc_id = add_document( |
|
431 | + $_course, |
|
432 | + $relativeUrlPath.$audio_filename, |
|
433 | + 'file', |
|
434 | + filesize($documentPath), |
|
435 | + $audio_title |
|
436 | + ); |
|
437 | + api_item_property_update( |
|
438 | + $_course, |
|
439 | + TOOL_DOCUMENT, |
|
440 | + $doc_id, |
|
441 | + 'DocumentAdded', |
|
442 | + $_user['user_id'], |
|
443 | + $groupId, |
|
444 | + null, |
|
445 | + null, |
|
446 | + null, |
|
447 | + $current_session_id |
|
448 | + ); |
|
449 | + Display::display_confirmation_message(get_lang('DocumentCreated')); |
|
450 | + //return to location |
|
451 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
452 | 452 | } |
453 | 453 | |
454 | 454 | /** |
@@ -461,45 +461,45 @@ discard block |
||
461 | 461 | */ |
462 | 462 | function downloadMP3_pediaphon($filepath, $dir) |
463 | 463 | { |
464 | - $location='create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=pediaphon'; |
|
465 | - //security |
|
466 | - if(!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { |
|
467 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
468 | - return; |
|
469 | - } |
|
470 | - $_course = api_get_course_info(); |
|
471 | - $_user = api_get_user_info(); |
|
472 | - $clean_title=trim($_POST['title']); |
|
473 | - $clean_title= Database::escape_string($clean_title); |
|
474 | - $clean_text=trim($_POST['text']); |
|
475 | - $clean_voices=Security::remove_XSS($_POST['voices']); |
|
476 | - if(empty($clean_title) || empty($clean_text) || empty($clean_voices)){ |
|
477 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
478 | - return; |
|
479 | - } |
|
480 | - $clean_title = Security::remove_XSS($clean_title); |
|
481 | - $clean_title = Database::escape_string($clean_title); |
|
482 | - $clean_title = str_replace(' ', '_', $clean_title);//compound file names |
|
483 | - $clean_text = Security::remove_XSS($clean_text); |
|
484 | - $clean_lang = Security::remove_XSS($_POST['lang']); |
|
485 | - $clean_speed = Security::remove_XSS($_POST['speed']); |
|
486 | - |
|
487 | - $extension='mp3'; |
|
488 | - $audio_filename=$clean_title.'.'.$extension; |
|
489 | - $audio_title = str_replace('_',' ',$clean_title); |
|
490 | - |
|
491 | - //prevent duplicates |
|
492 | - if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){ |
|
493 | - $i = 1; |
|
494 | - while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++; |
|
495 | - $audio_filename = $clean_title . '_' . $i . '.'.$extension; |
|
496 | - $audio_title = $clean_title . '_' . $i . '.'.$extension; |
|
497 | - $audio_title = str_replace('_',' ',$audio_title); |
|
498 | - } |
|
464 | + $location='create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=pediaphon'; |
|
465 | + //security |
|
466 | + if(!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { |
|
467 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
468 | + return; |
|
469 | + } |
|
470 | + $_course = api_get_course_info(); |
|
471 | + $_user = api_get_user_info(); |
|
472 | + $clean_title=trim($_POST['title']); |
|
473 | + $clean_title= Database::escape_string($clean_title); |
|
474 | + $clean_text=trim($_POST['text']); |
|
475 | + $clean_voices=Security::remove_XSS($_POST['voices']); |
|
476 | + if(empty($clean_title) || empty($clean_text) || empty($clean_voices)){ |
|
477 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
478 | + return; |
|
479 | + } |
|
480 | + $clean_title = Security::remove_XSS($clean_title); |
|
481 | + $clean_title = Database::escape_string($clean_title); |
|
482 | + $clean_title = str_replace(' ', '_', $clean_title);//compound file names |
|
483 | + $clean_text = Security::remove_XSS($clean_text); |
|
484 | + $clean_lang = Security::remove_XSS($_POST['lang']); |
|
485 | + $clean_speed = Security::remove_XSS($_POST['speed']); |
|
486 | + |
|
487 | + $extension='mp3'; |
|
488 | + $audio_filename=$clean_title.'.'.$extension; |
|
489 | + $audio_title = str_replace('_',' ',$clean_title); |
|
490 | + |
|
491 | + //prevent duplicates |
|
492 | + if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){ |
|
493 | + $i = 1; |
|
494 | + while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++; |
|
495 | + $audio_filename = $clean_title . '_' . $i . '.'.$extension; |
|
496 | + $audio_title = $clean_title . '_' . $i . '.'.$extension; |
|
497 | + $audio_title = str_replace('_',' ',$audio_title); |
|
498 | + } |
|
499 | 499 | |
500 | - $documentPath = $filepath.'/'.$audio_filename; |
|
500 | + $documentPath = $filepath.'/'.$audio_filename; |
|
501 | 501 | |
502 | - /*//prev for a fine unicode, borrowed from main api TODO:clean |
|
502 | + /*//prev for a fine unicode, borrowed from main api TODO:clean |
|
503 | 503 | // Safe replacements for some non-letter characters (whitout blank spaces) |
504 | 504 | $search = array("\0", "\t", "\n", "\r", "\x0B", '/', "\\", '"', "'", '?', '*', '>', '<', '|', ':', '$', '(', ')', '^', '[', ']', '#', '+', '&', '%'); |
505 | 505 | $replace = array('', '_', '_', '_', '_', '-', '-', '-', '_', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-'); |
@@ -512,48 +512,48 @@ discard block |
||
512 | 512 | $filename = api_transliterate($filename, 'x', $encoding); |
513 | 513 | // Replacing remaining dangerous non-letter characters. |
514 | 514 | $clean_text = str_replace($search, $replace, $filename);*/ |
515 | - $clean_text = api_replace_dangerous_char($clean_text); |
|
515 | + $clean_text = api_replace_dangerous_char($clean_text); |
|
516 | 516 | |
517 | - //adding the file |
|
517 | + //adding the file |
|
518 | 518 | |
519 | - if ($clean_lang=='de') { |
|
520 | - $url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice.cgi'; |
|
521 | - $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/(.*)\.mp3\"/'; |
|
522 | - } else { |
|
523 | - $url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_'.$clean_lang.'.cgi';//en, es, fr |
|
524 | - $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/'.$clean_lang.'\/(.*)\.mp3\"/'; |
|
525 | - } |
|
519 | + if ($clean_lang=='de') { |
|
520 | + $url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice.cgi'; |
|
521 | + $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/(.*)\.mp3\"/'; |
|
522 | + } else { |
|
523 | + $url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_'.$clean_lang.'.cgi';//en, es, fr |
|
524 | + $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/'.$clean_lang.'\/(.*)\.mp3\"/'; |
|
525 | + } |
|
526 | 526 | |
527 | - $data="stimme=".$clean_voices."&inputtext=".$clean_text."&speed=".$clean_speed."&go=speak"; |
|
528 | - $opts = array('http' => |
|
529 | - array( |
|
530 | - 'method' => 'POST', |
|
531 | - 'header' =>"Content-Type: application/x-www-form-urlencoded\r\n", |
|
532 | - "Content-Length: " . strlen($data) . "\r\n", |
|
533 | - 'content' => $data |
|
534 | - ) |
|
535 | - ); |
|
536 | - $context = stream_context_create($opts); |
|
537 | - // Download the whole HTML page |
|
538 | - $previous_returntext2voice = file_get_contents($url_pediaphon,false,$context); |
|
539 | - |
|
540 | - //extract the audio file path |
|
541 | - $search_source = preg_match($find_t2v, $previous_returntext2voice, $hits); |
|
542 | - $souce_end = substr($hits[0], 0, -1); |
|
543 | - //download file |
|
544 | - $returntext2voice = file_get_contents($souce_end); |
|
545 | - //save file |
|
546 | - $f = @file_put_contents($documentPath, $returntext2voice); |
|
547 | - if ($f === false && !empty($php_errormsg)) { |
|
527 | + $data="stimme=".$clean_voices."&inputtext=".$clean_text."&speed=".$clean_speed."&go=speak"; |
|
528 | + $opts = array('http' => |
|
529 | + array( |
|
530 | + 'method' => 'POST', |
|
531 | + 'header' =>"Content-Type: application/x-www-form-urlencoded\r\n", |
|
532 | + "Content-Length: " . strlen($data) . "\r\n", |
|
533 | + 'content' => $data |
|
534 | + ) |
|
535 | + ); |
|
536 | + $context = stream_context_create($opts); |
|
537 | + // Download the whole HTML page |
|
538 | + $previous_returntext2voice = file_get_contents($url_pediaphon,false,$context); |
|
539 | + |
|
540 | + //extract the audio file path |
|
541 | + $search_source = preg_match($find_t2v, $previous_returntext2voice, $hits); |
|
542 | + $souce_end = substr($hits[0], 0, -1); |
|
543 | + //download file |
|
544 | + $returntext2voice = file_get_contents($souce_end); |
|
545 | + //save file |
|
546 | + $f = @file_put_contents($documentPath, $returntext2voice); |
|
547 | + if ($f === false && !empty($php_errormsg)) { |
|
548 | 548 | error_log($php_errormsg); |
549 | 549 | } |
550 | - //add document to database |
|
551 | - $current_session_id = api_get_session_id(); |
|
552 | - $groupId = api_get_group_id(); |
|
553 | - $relativeUrlPath=$dir; |
|
554 | - $doc_id = add_document($_course, $relativeUrlPath.$audio_filename, 'file', filesize($documentPath), $audio_title); |
|
555 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
550 | + //add document to database |
|
551 | + $current_session_id = api_get_session_id(); |
|
552 | + $groupId = api_get_group_id(); |
|
553 | + $relativeUrlPath=$dir; |
|
554 | + $doc_id = add_document($_course, $relativeUrlPath.$audio_filename, 'file', filesize($documentPath), $audio_title); |
|
555 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
556 | 556 | Display::display_confirmation_message(get_lang('DocumentCreated')); |
557 | - //return to location |
|
558 | - echo '<script>window.location.href="'.$location.'"</script>'; |
|
557 | + //return to location |
|
558 | + echo '<script>window.location.href="'.$location.'"</script>'; |
|
559 | 559 | } |
@@ -46,49 +46,49 @@ discard block |
||
46 | 46 | // Please, do not modify this dirname formatting |
47 | 47 | |
48 | 48 | if (strstr($dir, '..')) { |
49 | - $dir = '/'; |
|
49 | + $dir = '/'; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | if ($dir[0] == '.') { |
53 | - $dir = substr($dir, 1); |
|
53 | + $dir = substr($dir, 1); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | if ($dir[0] != '/') { |
57 | - $dir = '/'.$dir; |
|
57 | + $dir = '/'.$dir; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | if ($dir[strlen($dir) - 1] != '/') { |
61 | - $dir .= '/'; |
|
61 | + $dir .= '/'; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
65 | 65 | |
66 | 66 | if (!is_dir($filepath)) { |
67 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
68 | - $dir = '/'; |
|
67 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
68 | + $dir = '/'; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | $groupId = api_get_group_id(); |
72 | 72 | |
73 | 73 | if (!empty($groupId)) { |
74 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
75 | - $noPHP_SELF = true; |
|
76 | - $group = GroupManager :: get_group_properties($groupId); |
|
77 | - $path = explode('/', $dir); |
|
78 | - if ('/'.$path[1] != $group['directory']) { |
|
79 | - api_not_allowed(true); |
|
80 | - } |
|
74 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
75 | + $noPHP_SELF = true; |
|
76 | + $group = GroupManager :: get_group_properties($groupId); |
|
77 | + $path = explode('/', $dir); |
|
78 | + if ('/'.$path[1] != $group['directory']) { |
|
79 | + api_not_allowed(true); |
|
80 | + } |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | $interbreadcrumb[] = array ("url" => "./document.php?".api_get_cidreq(), "name" => get_lang('Documents')); |
84 | 84 | |
85 | 85 | if (!$is_allowed_in_course) { |
86 | - api_not_allowed(true); |
|
86 | + api_not_allowed(true); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
90 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) { |
|
91 | - api_not_allowed(true); |
|
90 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) { |
|
91 | + api_not_allowed(true); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | |
@@ -96,10 +96,10 @@ discard block |
||
96 | 96 | Event::event_access_tool(TOOL_DOCUMENT); |
97 | 97 | $display_dir = $dir; |
98 | 98 | if (isset ($group)) { |
99 | - $display_dir = explode('/', $dir); |
|
100 | - unset ($display_dir[0]); |
|
101 | - unset ($display_dir[1]); |
|
102 | - $display_dir = implode('/', $display_dir); |
|
99 | + $display_dir = explode('/', $dir); |
|
100 | + unset ($display_dir[0]); |
|
101 | + unset ($display_dir[1]); |
|
102 | + $display_dir = implode('/', $display_dir); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | // Interbreadcrumb for the current directory root path |
@@ -124,13 +124,13 @@ discard block |
||
124 | 124 | |
125 | 125 | if (api_browser_support('svg')) { |
126 | 126 | |
127 | - //automatic loading the course language |
|
128 | - $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
129 | - $langsvgedit = api_get_language_isocode(); |
|
130 | - $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
131 | - $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
132 | - $svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit; |
|
133 | - ?> |
|
127 | + //automatic loading the course language |
|
128 | + $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
129 | + $langsvgedit = api_get_language_isocode(); |
|
130 | + $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
131 | + $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
132 | + $svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit; |
|
133 | + ?> |
|
134 | 134 | <script> |
135 | 135 | 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>'); |
136 | 136 | function resizeIframe() { |
@@ -148,10 +148,10 @@ discard block |
||
148 | 148 | |
149 | 149 | <?php |
150 | 150 | echo '<noscript>'; |
151 | - 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>'; |
|
152 | - echo '</noscript>'; |
|
151 | + 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>'; |
|
152 | + echo '</noscript>'; |
|
153 | 153 | } else { |
154 | - Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
154 | + Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | Display :: display_footer(); |
@@ -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'); |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Functions and main code for the download folder feature |
|
5 | - * |
|
6 | - * @package chamilo.document |
|
7 | - */ |
|
4 | + * Functions and main code for the download folder feature |
|
5 | + * |
|
6 | + * @package chamilo.document |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | use ChamiloSession as Session; |
10 | 10 |
@@ -1,34 +1,34 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * This file allows creating new svg and png documents with an online editor. |
|
5 | - * |
|
6 | - * @package chamilo.document |
|
7 | - * |
|
8 | - * @author Juan Carlos Raña Trabado |
|
9 | - * @since 30/january/2011 |
|
4 | + * This file allows creating new svg and png documents with an online editor. |
|
5 | + * |
|
6 | + * @package chamilo.document |
|
7 | + * |
|
8 | + * @author Juan Carlos Raña Trabado |
|
9 | + * @since 30/january/2011 |
|
10 | 10 | */ |
11 | 11 | /** |
12 | - * Code |
|
13 | - */ |
|
12 | + * Code |
|
13 | + */ |
|
14 | 14 | require_once '../inc/global.inc.php'; |
15 | 15 | |
16 | 16 | api_protect_course_script(); |
17 | 17 | api_block_anonymous_users(); |
18 | 18 | |
19 | 19 | if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) { |
20 | - api_not_allowed(); |
|
21 | - die(); |
|
20 | + api_not_allowed(); |
|
21 | + die(); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) { |
25 | - api_not_allowed(); |
|
26 | - die(); |
|
25 | + api_not_allowed(); |
|
26 | + die(); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){ |
30 | - api_not_allowed(); |
|
31 | - die(); |
|
30 | + api_not_allowed(); |
|
31 | + die(); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | //pixlr return |
@@ -72,22 +72,22 @@ discard block |
||
72 | 72 | $filename = disable_dangerous_file($filename); |
73 | 73 | |
74 | 74 | if (strlen(trim($filename))==0) { |
75 | - echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please |
|
76 | - exit; |
|
75 | + echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please |
|
76 | + exit; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | //check file_get_contents |
80 | 80 | if ($contents === false) { |
81 | - echo "I cannot read: ".$urlcontents; |
|
81 | + echo "I cannot read: ".$urlcontents; |
|
82 | 82 | exit; |
83 | 83 | } |
84 | 84 | |
85 | 85 | // Extension security |
86 | 86 | if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){ |
87 | - die(); |
|
87 | + die(); |
|
88 | 88 | } |
89 | 89 | if($extension=='pxd') { |
90 | - echo "pxd file type does not supported";// not secure because check security headers and finfo() return Content-Type = application/octet-stream |
|
90 | + echo "pxd file type does not supported";// not secure because check security headers and finfo() return Content-Type = application/octet-stream |
|
91 | 91 | exit; |
92 | 92 | } |
93 | 93 | |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | $headers = get_headers($urlcontents, 1); |
96 | 96 | $content_type = explode("/", $headers['Content-Type']); |
97 | 97 | if ($content_type[0] != "image") { |
98 | - echo "Invalid file type"; |
|
99 | - exit; |
|
98 | + echo "Invalid file type"; |
|
99 | + exit; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | //Verify that the file is an image. Fileinfo method |
@@ -114,49 +114,49 @@ discard block |
||
114 | 114 | $title = $title.'.'.$extension; |
115 | 115 | |
116 | 116 | if($currentTool=='document/createpaint'){ |
117 | - //check save as and prevent rewrite an older file with same name |
|
118 | - if (0 != $groupId){ |
|
117 | + //check save as and prevent rewrite an older file with same name |
|
118 | + if (0 != $groupId){ |
|
119 | 119 | $group_properties = GroupManager :: get_group_properties($groupId); |
120 | 120 | $groupPath = $group_properties['directory']; |
121 | - } else { |
|
122 | - $groupPath =''; |
|
123 | - } |
|
124 | - |
|
125 | - if (file_exists($saveDir.'/'.$filename.'.'.$extension)){ |
|
126 | - $i = 1; |
|
127 | - while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++; |
|
128 | - $paintFileName = $filename . '_' . $i . '.'.$extension; |
|
129 | - $title = $filename . '_' . $i . '.'.$extension; |
|
130 | - } |
|
131 | - |
|
132 | - // |
|
133 | - $documentPath = $saveDir.'/'.$paintFileName; |
|
134 | - //add new document to disk |
|
135 | - file_put_contents( $documentPath, $contents ); |
|
136 | - //add document to database |
|
137 | - $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
|
138 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
121 | + } else { |
|
122 | + $groupPath =''; |
|
123 | + } |
|
124 | + |
|
125 | + if (file_exists($saveDir.'/'.$filename.'.'.$extension)){ |
|
126 | + $i = 1; |
|
127 | + while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++; |
|
128 | + $paintFileName = $filename . '_' . $i . '.'.$extension; |
|
129 | + $title = $filename . '_' . $i . '.'.$extension; |
|
130 | + } |
|
131 | + |
|
132 | + // |
|
133 | + $documentPath = $saveDir.'/'.$paintFileName; |
|
134 | + //add new document to disk |
|
135 | + file_put_contents( $documentPath, $contents ); |
|
136 | + //add document to database |
|
137 | + $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
|
138 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
139 | 139 | |
140 | 140 | }elseif($currentTool=='document/editpaint'){ |
141 | 141 | |
142 | - $documentPath = $saveDir.'/'.$paintFileName; |
|
143 | - //add new document to disk |
|
144 | - file_put_contents( $documentPath, $contents ); |
|
145 | - |
|
146 | - //check path |
|
147 | - if(!isset($_SESSION['paint_file'])){ |
|
148 | - api_not_allowed(); |
|
149 | - die(); |
|
150 | - } |
|
151 | - if($_SESSION['paint_file']==$paintFileName){ |
|
152 | - $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName); |
|
153 | - update_existing_document($_course, $document_id, filesize($documentPath), null); |
|
154 | - api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
155 | - }else{ |
|
156 | - //add a new document |
|
157 | - $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
|
158 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
159 | - } |
|
142 | + $documentPath = $saveDir.'/'.$paintFileName; |
|
143 | + //add new document to disk |
|
144 | + file_put_contents( $documentPath, $contents ); |
|
145 | + |
|
146 | + //check path |
|
147 | + if(!isset($_SESSION['paint_file'])){ |
|
148 | + api_not_allowed(); |
|
149 | + die(); |
|
150 | + } |
|
151 | + if($_SESSION['paint_file']==$paintFileName){ |
|
152 | + $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName); |
|
153 | + update_existing_document($_course, $document_id, filesize($documentPath), null); |
|
154 | + api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
155 | + }else{ |
|
156 | + //add a new document |
|
157 | + $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
|
158 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
159 | + } |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | unset($_SESSION['temp_realpath_image']); |
172 | 172 | |
173 | 173 | if (!isset($_SESSION['exit_pixlr'])) { |
174 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
175 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
176 | - api_not_allowed(true); |
|
174 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
175 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
176 | + api_not_allowed(true); |
|
177 | 177 | } else { |
178 | - echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
179 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
180 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
181 | - unset($_SESSION['exit_pixlr']); |
|
178 | + echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
179 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
180 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
181 | + unset($_SESSION['exit_pixlr']); |
|
182 | 182 | } |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * This file allows creating new html documents with an online WYSIWYG html editor. |
|
5 | - * |
|
6 | - * @package chamilo.document |
|
7 | - */ |
|
4 | + * This file allows creating new html documents with an online WYSIWYG html editor. |
|
5 | + * |
|
6 | + * @package chamilo.document |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | require_once '../inc/global.inc.php'; |
10 | 10 | |
@@ -77,13 +77,13 @@ discard block |
||
77 | 77 | $is_certificate_mode = false; |
78 | 78 | |
79 | 79 | if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') { |
80 | - $is_certificate_mode = true; |
|
80 | + $is_certificate_mode = true; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | if ($is_certificate_mode) { |
84 | - $nameTools = get_lang('CreateCertificate'); |
|
84 | + $nameTools = get_lang('CreateCertificate'); |
|
85 | 85 | } else { |
86 | - $nameTools = get_lang('CreateDocument'); |
|
86 | + $nameTools = get_lang('CreateDocument'); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /* Constants and variables */ |
@@ -136,26 +136,26 @@ discard block |
||
136 | 136 | |
137 | 137 | // Please, do not modify this dirname formatting |
138 | 138 | if (strstr($dir, '..')) { |
139 | - $dir = '/'; |
|
139 | + $dir = '/'; |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | if ($dir[0] == '.') { |
143 | - $dir = substr($dir, 1); |
|
143 | + $dir = substr($dir, 1); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | if ($dir[0] != '/') { |
147 | - $dir = '/'.$dir; |
|
147 | + $dir = '/'.$dir; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | if ($dir[strlen($dir) - 1] != '/') { |
151 | - $dir .= '/'; |
|
151 | + $dir .= '/'; |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | if ($is_certificate_mode) { |
155 | - $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
156 | - $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
157 | - $folder_id = $document_data['id']; |
|
158 | - $dir = '/certificates/'; |
|
155 | + $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
156 | + $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
157 | + $folder_id = $document_data['id']; |
|
158 | + $dir = '/certificates/'; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | $doc_tree = explode('/', $dir); |
@@ -166,16 +166,16 @@ discard block |
||
166 | 166 | |
167 | 167 | // Level correction for group documents. |
168 | 168 | if (!empty($group_properties['directory'])) { |
169 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
169 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | $relative_url = ''; |
173 | 173 | for ($i = 0; $i < ($count_dir); $i++) { |
174 | - $relative_url .= '../'; |
|
174 | + $relative_url .= '../'; |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | if ($relative_url== '') { |
178 | - $relative_url = '/'; |
|
178 | + $relative_url = '/'; |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
@@ -187,11 +187,11 @@ discard block |
||
187 | 187 | 'cols-size' => [2, 10, 0], |
188 | 188 | 'FullPage' => true, |
189 | 189 | 'InDocument' => true, |
190 | - 'CreateDocumentDir' => $relative_url, |
|
191 | - 'CreateDocumentWebDir' => (empty($group_properties['directory'])) |
|
192 | - ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/' |
|
193 | - : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/', |
|
194 | - 'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir |
|
190 | + 'CreateDocumentDir' => $relative_url, |
|
191 | + 'CreateDocumentWebDir' => (empty($group_properties['directory'])) |
|
192 | + ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/' |
|
193 | + : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/', |
|
194 | + 'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir |
|
195 | 195 | ); |
196 | 196 | |
197 | 197 | if ($is_certificate_mode) { |
@@ -203,36 +203,36 @@ discard block |
||
203 | 203 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
204 | 204 | |
205 | 205 | if (!is_dir($filepath)) { |
206 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
207 | - $dir = '/'; |
|
206 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
207 | + $dir = '/'; |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | $to_group_id = 0; |
211 | 211 | |
212 | 212 | if (!$is_certificate_mode) { |
213 | - if (api_is_in_group()) { |
|
214 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
215 | - $noPHP_SELF = true; |
|
216 | - $to_group_id = api_get_group_id(); |
|
217 | - $path = explode('/', $dir); |
|
218 | - if ('/'.$path[1] != $group_properties['directory']) { |
|
219 | - api_not_allowed(true); |
|
220 | - } |
|
221 | - } |
|
222 | - $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
213 | + if (api_is_in_group()) { |
|
214 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
215 | + $noPHP_SELF = true; |
|
216 | + $to_group_id = api_get_group_id(); |
|
217 | + $path = explode('/', $dir); |
|
218 | + if ('/'.$path[1] != $group_properties['directory']) { |
|
219 | + api_not_allowed(true); |
|
220 | + } |
|
221 | + } |
|
222 | + $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
223 | 223 | } else { |
224 | - $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
224 | + $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | if (!$is_allowed_in_course) { |
228 | - api_not_allowed(true); |
|
228 | + api_not_allowed(true); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | if (!($is_allowed_to_edit || |
232 | 232 | $_SESSION['group_member_with_upload_rights'] || |
233 | 233 | DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id())) |
234 | 234 | ) { |
235 | - api_not_allowed(true); |
|
235 | + api_not_allowed(true); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /* Header */ |
@@ -240,10 +240,10 @@ discard block |
||
240 | 240 | |
241 | 241 | $display_dir = $dir; |
242 | 242 | if (isset($group_properties)) { |
243 | - $display_dir = explode('/', $dir); |
|
244 | - unset($display_dir[0]); |
|
245 | - unset($display_dir[1]); |
|
246 | - $display_dir = implode('/', $display_dir); |
|
243 | + $display_dir = explode('/', $dir); |
|
244 | + unset($display_dir[0]); |
|
245 | + unset($display_dir[1]); |
|
246 | + $display_dir = implode('/', $display_dir); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null; |
@@ -260,9 +260,9 @@ discard block |
||
260 | 260 | $form->addElement('header', $nameTools); |
261 | 261 | |
262 | 262 | if ($is_certificate_mode) {//added condition for certicate in gradebook |
263 | - $form->addElement('hidden','certificate','true',array('id'=>'certificate')); |
|
264 | - if (isset($_GET['selectcat'])) { |
|
265 | - $form->addElement('hidden','selectcat', $select_cat); |
|
263 | + $form->addElement('hidden','certificate','true',array('id'=>'certificate')); |
|
264 | + if (isset($_GET['selectcat'])) { |
|
265 | + $form->addElement('hidden','selectcat', $select_cat); |
|
266 | 266 | } |
267 | 267 | } |
268 | 268 | |
@@ -297,12 +297,12 @@ discard block |
||
297 | 297 | if ($is_certificate_mode) { |
298 | 298 | $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
299 | 299 | } else { |
300 | - $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
|
300 | + $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | // Show read-only box only in groups |
304 | 304 | if (!empty($groupId)) { |
305 | - $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
305 | + $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
306 | 306 | } |
307 | 307 | $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); |
308 | 308 | $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists'); |
@@ -317,14 +317,14 @@ discard block |
||
317 | 317 | // new document created |
318 | 318 | |
319 | 319 | if (!$is_certificate_mode && |
320 | - !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id) |
|
320 | + !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id) |
|
321 | 321 | ) { |
322 | - $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
|
322 | + $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
|
323 | 323 | |
324 | - //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory'))); |
|
324 | + //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory'))); |
|
325 | 325 | $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) ); |
326 | - // Following two conditions copied from document.inc.php::build_directory_selector() |
|
327 | - $folder_titles = array(); |
|
326 | + // Following two conditions copied from document.inc.php::build_directory_selector() |
|
327 | + $folder_titles = array(); |
|
328 | 328 | |
329 | 329 | if (is_array($folders)) { |
330 | 330 | $escaped_folders = array(); |
@@ -362,22 +362,22 @@ discard block |
||
362 | 362 | } |
363 | 363 | } |
364 | 364 | |
365 | - if (empty($group_dir)) { |
|
366 | - $parent_select -> addOption(get_lang('HomeDirectory'), '/'); |
|
367 | - if (is_array($folders)) { |
|
368 | - foreach ($folders as & $folder) { |
|
369 | - //Hide some folders |
|
370 | - if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { |
|
365 | + if (empty($group_dir)) { |
|
366 | + $parent_select -> addOption(get_lang('HomeDirectory'), '/'); |
|
367 | + if (is_array($folders)) { |
|
368 | + foreach ($folders as & $folder) { |
|
369 | + //Hide some folders |
|
370 | + if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { |
|
371 | 371 | continue; |
372 | - } |
|
373 | - //Admin setting for Hide/Show the folders of all users |
|
374 | - if (api_get_setting('show_users_folders') == 'false' && |
|
372 | + } |
|
373 | + //Admin setting for Hide/Show the folders of all users |
|
374 | + if (api_get_setting('show_users_folders') == 'false' && |
|
375 | 375 | (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_')) |
376 | 376 | ){ |
377 | - continue; |
|
378 | - } |
|
379 | - //Admin setting for Hide/Show Default folders to all users |
|
380 | - if (api_get_setting('show_default_folders') == 'false' && |
|
377 | + continue; |
|
378 | + } |
|
379 | + //Admin setting for Hide/Show Default folders to all users |
|
380 | + if (api_get_setting('show_default_folders') == 'false' && |
|
381 | 381 | ( |
382 | 382 | $folder == '/images' || |
383 | 383 | $folder == '/flash' || |
@@ -387,80 +387,80 @@ discard block |
||
387 | 387 | $folder == '/video/flv' |
388 | 388 | ) |
389 | 389 | ){ |
390 | - continue; |
|
391 | - } |
|
392 | - //Admin setting for Hide/Show chat history folder |
|
393 | - if (api_get_setting('show_chat_folder') == 'false' && |
|
390 | + continue; |
|
391 | + } |
|
392 | + //Admin setting for Hide/Show chat history folder |
|
393 | + if (api_get_setting('show_chat_folder') == 'false' && |
|
394 | 394 | $folder=='/chat_files' |
395 | 395 | ){ |
396 | - continue; |
|
397 | - } |
|
396 | + continue; |
|
397 | + } |
|
398 | 398 | |
399 | - $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; |
|
400 | - $path_parts = explode('/', $folder); |
|
401 | - $folder_titles[$folder] = cut($folder_titles[$folder], 80); |
|
399 | + $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; |
|
400 | + $path_parts = explode('/', $folder); |
|
401 | + $folder_titles[$folder] = cut($folder_titles[$folder], 80); |
|
402 | 402 | $space_counter =count($path_parts) - 2; |
403 | 403 | if ($space_counter > 0) { |
404 | 404 | $label = str_repeat(' ', $space_counter).' — '.$folder_titles[$folder]; |
405 | 405 | } else { |
406 | 406 | $label = ' — '.$folder_titles[$folder]; |
407 | 407 | } |
408 | - $parent_select -> addOption($label, $folder); |
|
409 | - if ($selected != '') { |
|
410 | - $parent_select->setSelected($folder); |
|
411 | - } |
|
412 | - } |
|
413 | - } |
|
414 | - } else { |
|
415 | - foreach ($folders as & $folder) { |
|
416 | - $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : ''; |
|
417 | - $label = $folder_titles[$folder]; |
|
418 | - if ($folder == $group_dir) { |
|
419 | - $label = '/ ('.get_lang('HomeDirectory').')'; |
|
420 | - } else { |
|
421 | - $path_parts = explode('/', str_replace($group_dir, '', $folder)); |
|
422 | - $label = cut($label, 80); |
|
423 | - $label = str_repeat(' ', count($path_parts) - 2).' — '.$label; |
|
424 | - } |
|
425 | - $parent_select -> addOption($label, $folder); |
|
426 | - if ($selected != '') { |
|
427 | - $parent_select->setSelected($folder); |
|
428 | - } |
|
429 | - } |
|
430 | - } |
|
408 | + $parent_select -> addOption($label, $folder); |
|
409 | + if ($selected != '') { |
|
410 | + $parent_select->setSelected($folder); |
|
411 | + } |
|
412 | + } |
|
413 | + } |
|
414 | + } else { |
|
415 | + foreach ($folders as & $folder) { |
|
416 | + $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : ''; |
|
417 | + $label = $folder_titles[$folder]; |
|
418 | + if ($folder == $group_dir) { |
|
419 | + $label = '/ ('.get_lang('HomeDirectory').')'; |
|
420 | + } else { |
|
421 | + $path_parts = explode('/', str_replace($group_dir, '', $folder)); |
|
422 | + $label = cut($label, 80); |
|
423 | + $label = str_repeat(' ', count($path_parts) - 2).' — '.$label; |
|
424 | + } |
|
425 | + $parent_select -> addOption($label, $folder); |
|
426 | + if ($selected != '') { |
|
427 | + $parent_select->setSelected($folder); |
|
428 | + } |
|
429 | + } |
|
430 | + } |
|
431 | 431 | } |
432 | 432 | |
433 | 433 | $form->addHidden('dirValue', ''); |
434 | 434 | |
435 | 435 | if ($is_certificate_mode) { |
436 | - $form->addButtonCreate(get_lang('CreateCertificate')); |
|
436 | + $form->addButtonCreate(get_lang('CreateCertificate')); |
|
437 | 437 | } else { |
438 | - $form->addButtonCreate(get_lang('CreateDoc')); |
|
438 | + $form->addButtonCreate(get_lang('CreateDoc')); |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | $form->setDefaults($defaults); |
442 | 442 | |
443 | 443 | // If form validates -> save the new document |
444 | 444 | if ($form->validate()) { |
445 | - $values = $form->exportValues(); |
|
446 | - $readonly = isset($values['readonly']) ? 1 : 0; |
|
447 | - $values['title'] = trim($values['title']); |
|
445 | + $values = $form->exportValues(); |
|
446 | + $readonly = isset($values['readonly']) ? 1 : 0; |
|
447 | + $values['title'] = trim($values['title']); |
|
448 | 448 | |
449 | 449 | if (!empty($values['dirValue'])) { |
450 | 450 | $dir = $values['dirValue']; |
451 | 451 | } |
452 | 452 | |
453 | 453 | if ($dir[strlen($dir) - 1] != '/') { |
454 | - $dir .= '/'; |
|
455 | - } |
|
454 | + $dir .= '/'; |
|
455 | + } |
|
456 | 456 | $filepath = $filepath.$dir; |
457 | 457 | |
458 | 458 | // Setting the filename |
459 | - $filename = $values['title']; |
|
460 | - $filename = addslashes(trim($filename)); |
|
461 | - $filename = Security::remove_XSS($filename); |
|
462 | - $filename = api_replace_dangerous_char($filename); |
|
463 | - $filename = disable_dangerous_file($filename); |
|
459 | + $filename = $values['title']; |
|
460 | + $filename = addslashes(trim($filename)); |
|
461 | + $filename = Security::remove_XSS($filename); |
|
462 | + $filename = api_replace_dangerous_char($filename); |
|
463 | + $filename = disable_dangerous_file($filename); |
|
464 | 464 | $filename .= DocumentManager::getDocumentSuffix( |
465 | 465 | $_course, |
466 | 466 | api_get_session_id(), |
@@ -468,14 +468,14 @@ discard block |
||
468 | 468 | ); |
469 | 469 | |
470 | 470 | // Setting the title |
471 | - $title = $values['title']; |
|
471 | + $title = $values['title']; |
|
472 | 472 | |
473 | 473 | // Setting the extension |
474 | - $extension = 'html'; |
|
474 | + $extension = 'html'; |
|
475 | 475 | |
476 | - $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY); |
|
476 | + $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY); |
|
477 | 477 | |
478 | - /*if (strpos($content, '/css/frames.css') == false) { |
|
478 | + /*if (strpos($content, '/css/frames.css') == false) { |
|
479 | 479 | $content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content); |
480 | 480 | }*/ |
481 | 481 | |
@@ -488,12 +488,12 @@ discard block |
||
488 | 488 | exit; |
489 | 489 | } |
490 | 490 | |
491 | - if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) { |
|
492 | - $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content); |
|
491 | + if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) { |
|
492 | + $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content); |
|
493 | 493 | |
494 | - fputs($fp, $content); |
|
495 | - fclose($fp); |
|
496 | - chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files()); |
|
494 | + fputs($fp, $content); |
|
495 | + fclose($fp); |
|
496 | + chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files()); |
|
497 | 497 | |
498 | 498 | /* |
499 | 499 | if (!is_dir($filepath.'css')) { |
@@ -511,8 +511,8 @@ discard block |
||
511 | 511 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id); |
512 | 512 | }*/ |
513 | 513 | |
514 | - $file_size = filesize($filepath.$filename.'.'.$extension); |
|
515 | - $save_file_path = $dir.$filename.'.'.$extension; |
|
514 | + $file_size = filesize($filepath.$filename.'.'.$extension); |
|
515 | + $save_file_path = $dir.$filename.'.'.$extension; |
|
516 | 516 | |
517 | 517 | $document_id = add_document( |
518 | 518 | $_course, |
@@ -524,8 +524,8 @@ discard block |
||
524 | 524 | $readonly |
525 | 525 | ); |
526 | 526 | |
527 | - if ($document_id) { |
|
528 | - api_item_property_update( |
|
527 | + if ($document_id) { |
|
528 | + api_item_property_update( |
|
529 | 529 | $_course, |
530 | 530 | TOOL_DOCUMENT, |
531 | 531 | $document_id, |
@@ -537,13 +537,13 @@ discard block |
||
537 | 537 | null, |
538 | 538 | $current_session_id |
539 | 539 | ); |
540 | - // Update parent folders |
|
541 | - item_property_update_on_folder($_course, $dir, $userId); |
|
542 | - $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : ''; |
|
543 | - $new_title = isset($_POST['title']) ? trim($_POST['title']) : ''; |
|
540 | + // Update parent folders |
|
541 | + item_property_update_on_folder($_course, $dir, $userId); |
|
542 | + $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : ''; |
|
543 | + $new_title = isset($_POST['title']) ? trim($_POST['title']) : ''; |
|
544 | 544 | $new_title = htmlspecialchars($new_title); |
545 | - if ($new_comment || $new_title) { |
|
546 | - $ct = ''; |
|
545 | + if ($new_comment || $new_title) { |
|
546 | + $ct = ''; |
|
547 | 547 | $params = []; |
548 | 548 | if ($new_comment) { |
549 | 549 | $params['comment'] = $new_comment; |
@@ -558,38 +558,38 @@ discard block |
||
558 | 558 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
559 | 559 | ); |
560 | 560 | } |
561 | - } |
|
562 | - $dir= substr($dir,0,-1); |
|
563 | - $selectcat = ''; |
|
564 | - if (isset($_REQUEST['selectcat'])) |
|
565 | - $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
566 | - $certificate_condition = ''; |
|
567 | - if ($is_certificate_mode) { |
|
568 | - $df = DocumentManager::get_default_certificate_id($_course['code']); |
|
561 | + } |
|
562 | + $dir= substr($dir,0,-1); |
|
563 | + $selectcat = ''; |
|
564 | + if (isset($_REQUEST['selectcat'])) |
|
565 | + $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
566 | + $certificate_condition = ''; |
|
567 | + if ($is_certificate_mode) { |
|
568 | + $df = DocumentManager::get_default_certificate_id($_course['code']); |
|
569 | 569 | if (!isset($df)) { |
570 | 570 | DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id); |
571 | - } |
|
572 | - $certificate_condition = '&certificate=true&curdirpath=/certificates'; |
|
573 | - } |
|
574 | - |
|
575 | - header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition); |
|
576 | - exit(); |
|
577 | - } else { |
|
578 | - Display :: display_header($nameTools, 'Doc'); |
|
579 | - Display :: display_error_message(get_lang('Impossible')); |
|
580 | - Display :: display_footer(); |
|
581 | - } |
|
582 | - } else { |
|
583 | - Display :: display_header($nameTools, 'Doc'); |
|
584 | - Display :: display_error_message(get_lang('Impossible')); |
|
585 | - Display :: display_footer(); |
|
586 | - } |
|
571 | + } |
|
572 | + $certificate_condition = '&certificate=true&curdirpath=/certificates'; |
|
573 | + } |
|
574 | + |
|
575 | + header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition); |
|
576 | + exit(); |
|
577 | + } else { |
|
578 | + Display :: display_header($nameTools, 'Doc'); |
|
579 | + Display :: display_error_message(get_lang('Impossible')); |
|
580 | + Display :: display_footer(); |
|
581 | + } |
|
582 | + } else { |
|
583 | + Display :: display_header($nameTools, 'Doc'); |
|
584 | + Display :: display_error_message(get_lang('Impossible')); |
|
585 | + Display :: display_footer(); |
|
586 | + } |
|
587 | 587 | } else { |
588 | - // Copied from document.php |
|
589 | - $dir_array = explode('/', $dir); |
|
590 | - $array_len = count($dir_array); |
|
588 | + // Copied from document.php |
|
589 | + $dir_array = explode('/', $dir); |
|
590 | + $array_len = count($dir_array); |
|
591 | 591 | |
592 | - // Breadcrumb for the current directory root path |
|
592 | + // Breadcrumb for the current directory root path |
|
593 | 593 | if (!empty($document_data)) { |
594 | 594 | if (empty($document_data['parents'])) { |
595 | 595 | $interbreadcrumb[] = array( |
@@ -606,31 +606,31 @@ discard block |
||
606 | 606 | } |
607 | 607 | } |
608 | 608 | |
609 | - Display :: display_header($nameTools, "Doc"); |
|
610 | - // actions |
|
609 | + Display :: display_header($nameTools, "Doc"); |
|
610 | + // actions |
|
611 | 611 | |
612 | - // link back to the documents overview |
|
613 | - if ($is_certificate_mode) { |
|
614 | - $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
612 | + // link back to the documents overview |
|
613 | + if ($is_certificate_mode) { |
|
614 | + $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
615 | 615 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
616 | 616 | } else { |
617 | - $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'. |
|
617 | + $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'. |
|
618 | 618 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
619 | 619 | } |
620 | 620 | |
621 | 621 | echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => '')); |
622 | 622 | |
623 | 623 | |
624 | - if ($is_certificate_mode) { |
|
625 | - $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id()); |
|
624 | + if ($is_certificate_mode) { |
|
625 | + $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id()); |
|
626 | 626 | |
627 | - $str_info = ''; |
|
628 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
629 | - $str_info.=$info_value.'<br/>'; |
|
630 | - } |
|
631 | - $create_certificate = get_lang('CreateCertificateWithTags'); |
|
632 | - Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); |
|
633 | - } |
|
627 | + $str_info = ''; |
|
628 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
629 | + $str_info.=$info_value.'<br/>'; |
|
630 | + } |
|
631 | + $create_certificate = get_lang('CreateCertificateWithTags'); |
|
632 | + Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); |
|
633 | + } |
|
634 | 634 | // HTML-editor |
635 | 635 | echo '<div class="row" style="overflow:hidden"> |
636 | 636 | <div id="template_col" class="col-md-2"> |
@@ -647,5 +647,5 @@ discard block |
||
647 | 647 | '.$form->returnForm().' |
648 | 648 | </div> |
649 | 649 | </div>'; |
650 | - Display :: display_footer(); |
|
650 | + Display :: display_footer(); |
|
651 | 651 | } |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * @author jmontoya |
|
5 | - * |
|
6 | - * @package chamilo.document |
|
7 | - */ |
|
4 | + * @author jmontoya |
|
5 | + * |
|
6 | + * @package chamilo.document |
|
7 | + */ |
|
8 | 8 | require_once '../inc/global.inc.php'; |
9 | 9 | |
10 | 10 | // Protection |
@@ -91,16 +91,16 @@ discard block |
||
91 | 91 | $pathinfo = pathinfo($header_file); |
92 | 92 | |
93 | 93 | if ($pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true'){ |
94 | - echo '<div align="center">'; |
|
95 | - echo '<br/>'; |
|
96 | - echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >'; |
|
97 | - echo '<param name="SoundFileURL" value="'.$file_url_web.'" />'; |
|
98 | - echo '<param name="ShowSaveButton" value="false" />'; |
|
99 | - echo '<param name="ShowTime" value="true" />'; |
|
100 | - echo '<param name="ShowRecordButton" value="false" />'; |
|
101 | - echo '</applet>'; |
|
102 | - echo '</div>'; |
|
94 | + echo '<div align="center">'; |
|
95 | + echo '<br/>'; |
|
96 | + echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >'; |
|
97 | + echo '<param name="SoundFileURL" value="'.$file_url_web.'" />'; |
|
98 | + echo '<param name="ShowSaveButton" value="false" />'; |
|
99 | + echo '<param name="ShowTime" value="true" />'; |
|
100 | + echo '<param name="ShowRecordButton" value="false" />'; |
|
101 | + echo '</applet>'; |
|
102 | + echo '</div>'; |
|
103 | 103 | } else { |
104 | - if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';} |
|
105 | - echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&rand='.mt_rand(1, 1000).'"></iframe>'; |
|
104 | + if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';} |
|
105 | + echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&rand='.mt_rand(1, 1000).'"></iframe>'; |
|
106 | 106 | } |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * @author Patrick Cool [email protected] Ghent University Mai 2004 |
|
5 | - * @author Julio Montoya Lots of improvements, cleaning, adding security |
|
6 | - * @author Juan Carlos Raña Trabado [email protected] January 2008 |
|
7 | - * @package chamilo.document |
|
8 | - */ |
|
4 | + * @author Patrick Cool [email protected] Ghent University Mai 2004 |
|
5 | + * @author Julio Montoya Lots of improvements, cleaning, adding security |
|
6 | + * @author Juan Carlos Raña Trabado [email protected] January 2008 |
|
7 | + * @package chamilo.document |
|
8 | + */ |
|
9 | 9 | require_once '../inc/global.inc.php'; |
10 | 10 | api_protect_course_script(); |
11 | 11 | |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | $slide_id = isset($_GET['slide_id']) ? Security::remove_XSS($_GET['slide_id']) : null; |
16 | 16 | |
17 | 17 | if (empty($slide_id)) { |
18 | - $edit_slide_id = 1; |
|
18 | + $edit_slide_id = 1; |
|
19 | 19 | } else { |
20 | - $edit_slide_id = $slide_id; |
|
20 | + $edit_slide_id = $slide_id; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | if ($path != '/') { |
24 | - $folder = $path.'/'; |
|
24 | + $folder = $path.'/'; |
|
25 | 25 | } else { |
26 | - $folder = '/'; |
|
26 | + $folder = '/'; |
|
27 | 27 | } |
28 | 28 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
29 | 29 | |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | |
42 | 42 | // Loading the slides from the session |
43 | 43 | if (isset($_SESSION['image_files_only'])) { |
44 | - $image_files_only = $_SESSION['image_files_only']; |
|
44 | + $image_files_only = $_SESSION['image_files_only']; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | // Calculating the current slide, next slide, previous slide and the number of slides |
48 | 48 | $slide = null; |
49 | 49 | if ($slide_id != 'all') { |
50 | - $slide = $slide_id ? $slide_id : 0; |
|
51 | - $previous_slide = $slide - 1; |
|
52 | - $next_slide = $slide + 1; |
|
50 | + $slide = $slide_id ? $slide_id : 0; |
|
51 | + $previous_slide = $slide - 1; |
|
52 | + $next_slide = $slide + 1; |
|
53 | 53 | } |
54 | 54 | $total_slides = count($image_files_only); |
55 | 55 | ?> |
@@ -62,58 +62,58 @@ discard block |
||
62 | 62 | <?php |
63 | 63 | |
64 | 64 | if ($slide_id != 'all') { |
65 | - $image = null; |
|
66 | - if (isset($image_files_only[$slide])) { |
|
67 | - $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide]; |
|
68 | - } |
|
69 | - if (file_exists($image)) { |
|
70 | - echo '<div class="actions-pagination">'; |
|
71 | - |
|
72 | - // Back forward buttons |
|
73 | - if ($slide == 0) { |
|
74 | - $imgp = 'action_prev_na.png'; |
|
75 | - $first = '<img src="'.api_get_path(WEB_IMG_PATH).'action_first_na.png">'; |
|
76 | - } else { |
|
77 | - $imgp = 'action_prev.png'; |
|
78 | - $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'"> |
|
65 | + $image = null; |
|
66 | + if (isset($image_files_only[$slide])) { |
|
67 | + $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide]; |
|
68 | + } |
|
69 | + if (file_exists($image)) { |
|
70 | + echo '<div class="actions-pagination">'; |
|
71 | + |
|
72 | + // Back forward buttons |
|
73 | + if ($slide == 0) { |
|
74 | + $imgp = 'action_prev_na.png'; |
|
75 | + $first = '<img src="'.api_get_path(WEB_IMG_PATH).'action_first_na.png">'; |
|
76 | + } else { |
|
77 | + $imgp = 'action_prev.png'; |
|
78 | + $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'"> |
|
79 | 79 | <img src="'.api_get_path(WEB_IMG_PATH).'action_first.png" title="'.get_lang('FirstSlide').'" alt="'.get_lang('FirstSlide').'"></a>'; |
80 | - } |
|
81 | - |
|
82 | - // First slide |
|
83 | - echo $first; |
|
84 | - |
|
85 | - // Previous slide |
|
86 | - if ($slide > 0) { |
|
87 | - echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">'; |
|
88 | - } |
|
89 | - echo '<img src="'.api_get_path(WEB_IMG_PATH).$imgp.'" title="'.get_lang('Previous').'" alt="'.get_lang('Previous').'">'; |
|
90 | - if ($slide > 0) { |
|
91 | - echo '</a>'; |
|
92 | - } |
|
93 | - |
|
94 | - // Divider |
|
95 | - echo ' [ '.$next_slide.'/'.$total_slides.' ] '; |
|
96 | - |
|
97 | - // Next slide |
|
98 | - if ($slide < $total_slides - 1) { |
|
99 | - echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">'; |
|
100 | - } |
|
101 | - if ($slide == $total_slides - 1) { |
|
102 | - $imgn = 'action_next_na.png'; |
|
103 | - $last = '<img src="'.api_get_path(WEB_IMG_PATH).'action_last_na.png" title="'.get_lang('LastSlide').'" alt="'.get_lang('LastSlide').'">'; |
|
104 | - } else { |
|
105 | - $imgn = 'action_next.png'; |
|
106 | - $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'action_last.png" title="'.get_lang('LastSlide').'" alt="'.get_lang('LastSlide').'"></a>'; |
|
107 | - } |
|
108 | - echo '<img src="'.api_get_path(WEB_IMG_PATH).$imgn.'" title="'.get_lang('Next').'" alt="'.get_lang('Next').'">'; |
|
109 | - if ($slide > 0) { |
|
110 | - echo '</a>'; |
|
111 | - } |
|
112 | - |
|
113 | - // Last slide |
|
114 | - echo $last; |
|
115 | - echo '</div>'; |
|
116 | - } |
|
80 | + } |
|
81 | + |
|
82 | + // First slide |
|
83 | + echo $first; |
|
84 | + |
|
85 | + // Previous slide |
|
86 | + if ($slide > 0) { |
|
87 | + echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">'; |
|
88 | + } |
|
89 | + echo '<img src="'.api_get_path(WEB_IMG_PATH).$imgp.'" title="'.get_lang('Previous').'" alt="'.get_lang('Previous').'">'; |
|
90 | + if ($slide > 0) { |
|
91 | + echo '</a>'; |
|
92 | + } |
|
93 | + |
|
94 | + // Divider |
|
95 | + echo ' [ '.$next_slide.'/'.$total_slides.' ] '; |
|
96 | + |
|
97 | + // Next slide |
|
98 | + if ($slide < $total_slides - 1) { |
|
99 | + echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">'; |
|
100 | + } |
|
101 | + if ($slide == $total_slides - 1) { |
|
102 | + $imgn = 'action_next_na.png'; |
|
103 | + $last = '<img src="'.api_get_path(WEB_IMG_PATH).'action_last_na.png" title="'.get_lang('LastSlide').'" alt="'.get_lang('LastSlide').'">'; |
|
104 | + } else { |
|
105 | + $imgn = 'action_next.png'; |
|
106 | + $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'action_last.png" title="'.get_lang('LastSlide').'" alt="'.get_lang('LastSlide').'"></a>'; |
|
107 | + } |
|
108 | + echo '<img src="'.api_get_path(WEB_IMG_PATH).$imgn.'" title="'.get_lang('Next').'" alt="'.get_lang('Next').'">'; |
|
109 | + if ($slide > 0) { |
|
110 | + echo '</a>'; |
|
111 | + } |
|
112 | + |
|
113 | + // Last slide |
|
114 | + echo $last; |
|
115 | + echo '</div>'; |
|
116 | + } |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | // Exit the slideshow |
@@ -122,10 +122,10 @@ discard block |
||
122 | 122 | |
123 | 123 | // Show thumbnails |
124 | 124 | if ($slide_id != 'all') { |
125 | - echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'. |
|
125 | + echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'. |
|
126 | 126 | Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>'; |
127 | 127 | } else { |
128 | - echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM); |
|
128 | + echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM); |
|
129 | 129 | } |
130 | 130 | // Slideshow options |
131 | 131 | echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'. |
@@ -141,24 +141,24 @@ discard block |
||
141 | 141 | |
142 | 142 | // If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options |
143 | 143 | if (isset($_POST['Submit'])) { |
144 | - // We come from slideshowoptions.php |
|
145 | - //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']); |
|
146 | - $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']); |
|
147 | - if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') { |
|
148 | - //echo "resizing"; |
|
149 | - $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']); |
|
150 | - $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']); |
|
151 | - } else { |
|
152 | - //echo "unsetting the session heighte and width"; |
|
153 | - $_SESSION["image_resizing_width"] = null; |
|
154 | - $_SESSION["image_resizing_height"] = null; |
|
155 | - } |
|
144 | + // We come from slideshowoptions.php |
|
145 | + //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']); |
|
146 | + $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']); |
|
147 | + if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') { |
|
148 | + //echo "resizing"; |
|
149 | + $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']); |
|
150 | + $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']); |
|
151 | + } else { |
|
152 | + //echo "unsetting the session heighte and width"; |
|
153 | + $_SESSION["image_resizing_width"] = null; |
|
154 | + $_SESSION["image_resizing_height"] = null; |
|
155 | + } |
|
156 | 156 | } |
157 | 157 | $target_width = $target_height = null; |
158 | 158 | // The target height and width depends if we choose resizing or no resizing |
159 | 159 | if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == "resizing") { |
160 | - $target_width = $_SESSION["image_resizing_width"]; |
|
161 | - $target_height = $_SESSION["image_resizing_height"]; |
|
160 | + $target_width = $_SESSION["image_resizing_width"]; |
|
161 | + $target_height = $_SESSION["image_resizing_height"]; |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | /* THUMBNAIL VIEW */ |
@@ -167,59 +167,59 @@ discard block |
||
167 | 167 | $image_tag = array (); |
168 | 168 | if ($slide_id == 'all') { |
169 | 169 | |
170 | - // Config for make thumbnails |
|
170 | + // Config for make thumbnails |
|
171 | 171 | $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png'); |
172 | - $max_thumbnail_width = 100; |
|
173 | - $max_thumbnail_height = 100; |
|
174 | - $png_compression = 0;//0(none)-9 |
|
175 | - $jpg_quality = 75;//from 0 to 100 (default is 75). More quality less compression |
|
172 | + $max_thumbnail_width = 100; |
|
173 | + $max_thumbnail_height = 100; |
|
174 | + $png_compression = 0;//0(none)-9 |
|
175 | + $jpg_quality = 75;//from 0 to 100 (default is 75). More quality less compression |
|
176 | 176 | |
177 | - $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/'; |
|
177 | + $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/'; |
|
178 | 178 | |
179 | - //Other parameters only for show tumbnails |
|
180 | - $row_items = 4;//only in slideshow.php |
|
181 | - $number_image = 7;//num icons cols to show |
|
182 | - $thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x |
|
183 | - $thumbnail_height_frame=$max_thumbnail_height; |
|
179 | + //Other parameters only for show tumbnails |
|
180 | + $row_items = 4;//only in slideshow.php |
|
181 | + $number_image = 7;//num icons cols to show |
|
182 | + $thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x |
|
183 | + $thumbnail_height_frame=$max_thumbnail_height; |
|
184 | 184 | |
185 | - // Create the template_thumbnails folder (if no exist) |
|
185 | + // Create the template_thumbnails folder (if no exist) |
|
186 | 186 | |
187 | - if (!file_exists($directory_thumbnails)) { |
|
188 | - @mkdir($directory_thumbnails, api_get_permissions_for_new_directories()); |
|
187 | + if (!file_exists($directory_thumbnails)) { |
|
188 | + @mkdir($directory_thumbnails, api_get_permissions_for_new_directories()); |
|
189 | 189 | } |
190 | 190 | |
191 | - // check files and thumbnails |
|
192 | - if (is_array($image_files_only)) { |
|
191 | + // check files and thumbnails |
|
192 | + if (is_array($image_files_only)) { |
|
193 | 193 | |
194 | - foreach ($image_files_only as $one_image_file) { |
|
195 | - $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file; |
|
196 | - $image_thumbnail= $directory_thumbnails.'.'.$one_image_file; |
|
194 | + foreach ($image_files_only as $one_image_file) { |
|
195 | + $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file; |
|
196 | + $image_thumbnail= $directory_thumbnails.'.'.$one_image_file; |
|
197 | 197 | |
198 | - if (file_exists($image)) { |
|
199 | - //check thumbnail |
|
200 | - $imagetype = explode(".", $image); |
|
198 | + if (file_exists($image)) { |
|
199 | + //check thumbnail |
|
200 | + $imagetype = explode(".", $image); |
|
201 | 201 | //or check $imagetype = image_type_to_extension(exif_imagetype($image), false); |
202 | - $imagetype = strtolower($imagetype[count($imagetype)-1]); |
|
202 | + $imagetype = strtolower($imagetype[count($imagetype)-1]); |
|
203 | 203 | |
204 | - if(in_array($imagetype,$allowed_thumbnail_types)) { |
|
205 | - if (!file_exists($image_thumbnail)){ |
|
204 | + if(in_array($imagetype,$allowed_thumbnail_types)) { |
|
205 | + if (!file_exists($image_thumbnail)){ |
|
206 | 206 | //run each once we view thumbnails is too heavy, then need move into !file_exists($image_thumbnail, and only run when haven't the thumbnail |
207 | - $original_image_size = api_getimagesize($image); |
|
208 | - |
|
209 | - switch($imagetype) { |
|
210 | - case 'gif': |
|
211 | - $source_img = imagecreatefromgif($image); |
|
212 | - break; |
|
213 | - case 'jpg': |
|
214 | - $source_img = imagecreatefromjpeg($image); |
|
215 | - break; |
|
216 | - case 'jpeg': |
|
217 | - $source_img = imagecreatefromjpeg($image); |
|
218 | - break; |
|
219 | - case 'png': |
|
220 | - $source_img = imagecreatefrompng($image); |
|
221 | - break; |
|
222 | - } |
|
207 | + $original_image_size = api_getimagesize($image); |
|
208 | + |
|
209 | + switch($imagetype) { |
|
210 | + case 'gif': |
|
211 | + $source_img = imagecreatefromgif($image); |
|
212 | + break; |
|
213 | + case 'jpg': |
|
214 | + $source_img = imagecreatefromjpeg($image); |
|
215 | + break; |
|
216 | + case 'jpeg': |
|
217 | + $source_img = imagecreatefromjpeg($image); |
|
218 | + break; |
|
219 | + case 'png': |
|
220 | + $source_img = imagecreatefrompng($image); |
|
221 | + break; |
|
222 | + } |
|
223 | 223 | |
224 | 224 | $new_thumbnail_size = api_calculate_image_size( |
225 | 225 | $original_image_size['width'], |
@@ -228,33 +228,33 @@ discard block |
||
228 | 228 | $max_thumbnail_height |
229 | 229 | ); |
230 | 230 | |
231 | - if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){ |
|
232 | - $new_thumbnail_size['width']=$original_image_size['width']; |
|
233 | - $new_thumbnail_size['height']=$original_image_size['height']; |
|
234 | - } |
|
231 | + if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){ |
|
232 | + $new_thumbnail_size['width']=$original_image_size['width']; |
|
233 | + $new_thumbnail_size['height']=$original_image_size['height']; |
|
234 | + } |
|
235 | 235 | |
236 | - $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']); |
|
236 | + $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']); |
|
237 | 237 | |
238 | - // preserve transparency |
|
239 | - if($imagetype == "png"){ |
|
240 | - imagesavealpha($crop, true); |
|
241 | - $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127); |
|
242 | - imagefill($crop, 0, 0, $color); |
|
243 | - } |
|
238 | + // preserve transparency |
|
239 | + if($imagetype == "png"){ |
|
240 | + imagesavealpha($crop, true); |
|
241 | + $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127); |
|
242 | + imagefill($crop, 0, 0, $color); |
|
243 | + } |
|
244 | 244 | |
245 | - if ($imagetype == "gif") { |
|
246 | - $transindex = imagecolortransparent($source_img); |
|
245 | + if ($imagetype == "gif") { |
|
246 | + $transindex = imagecolortransparent($source_img); |
|
247 | 247 | $palletsize = imagecolorstotal($source_img); |
248 | - //GIF89a for transparent and anim (first clip), either GIF87a |
|
249 | - if ($transindex >= 0 && $transindex < $palletsize){ |
|
250 | - $transcol = imagecolorsforindex($source_img, $transindex); |
|
251 | - $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127); |
|
252 | - imagefill($crop, 0, 0, $transindex); |
|
253 | - imagecolortransparent($crop, $transindex); |
|
254 | - } |
|
255 | - } |
|
256 | - |
|
257 | - //resampled image |
|
248 | + //GIF89a for transparent and anim (first clip), either GIF87a |
|
249 | + if ($transindex >= 0 && $transindex < $palletsize){ |
|
250 | + $transcol = imagecolorsforindex($source_img, $transindex); |
|
251 | + $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127); |
|
252 | + imagefill($crop, 0, 0, $transindex); |
|
253 | + imagecolortransparent($crop, $transindex); |
|
254 | + } |
|
255 | + } |
|
256 | + |
|
257 | + //resampled image |
|
258 | 258 | imagecopyresampled( |
259 | 259 | $crop, |
260 | 260 | $source_img, |
@@ -268,77 +268,77 @@ discard block |
||
268 | 268 | $original_image_size['height'] |
269 | 269 | ); |
270 | 270 | |
271 | - switch ($imagetype) { |
|
272 | - case 'gif': |
|
273 | - imagegif($crop,$image_thumbnail); |
|
274 | - break; |
|
275 | - case 'jpg': |
|
276 | - imagejpeg($crop,$image_thumbnail,$jpg_quality); |
|
277 | - break; |
|
278 | - case 'jpeg': |
|
279 | - imagejpeg($crop,$image_thumbnail,$jpg_quality); |
|
280 | - break; |
|
281 | - case 'png': |
|
282 | - imagepng($crop,$image_thumbnail,$png_compression); |
|
283 | - break; |
|
284 | - } |
|
285 | - |
|
286 | - //clean memory |
|
287 | - imagedestroy($crop); |
|
288 | - }//end !exist thumbnail |
|
289 | - |
|
290 | - //show thumbnail and link |
|
291 | - |
|
292 | - $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail |
|
293 | - $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file; |
|
294 | - $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">'; |
|
295 | - } else { |
|
296 | - //if images aren't support by gd (not gif, jpg, jpeg, png) |
|
297 | - if ($imagetype=="bmp") { |
|
271 | + switch ($imagetype) { |
|
272 | + case 'gif': |
|
273 | + imagegif($crop,$image_thumbnail); |
|
274 | + break; |
|
275 | + case 'jpg': |
|
276 | + imagejpeg($crop,$image_thumbnail,$jpg_quality); |
|
277 | + break; |
|
278 | + case 'jpeg': |
|
279 | + imagejpeg($crop,$image_thumbnail,$jpg_quality); |
|
280 | + break; |
|
281 | + case 'png': |
|
282 | + imagepng($crop,$image_thumbnail,$png_compression); |
|
283 | + break; |
|
284 | + } |
|
285 | + |
|
286 | + //clean memory |
|
287 | + imagedestroy($crop); |
|
288 | + }//end !exist thumbnail |
|
289 | + |
|
290 | + //show thumbnail and link |
|
291 | + |
|
292 | + $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail |
|
293 | + $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file; |
|
294 | + $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">'; |
|
295 | + } else { |
|
296 | + //if images aren't support by gd (not gif, jpg, jpeg, png) |
|
297 | + if ($imagetype=="bmp") { |
|
298 | 298 | // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy |
299 | - $original_image_size = getimagesize($image); |
|
300 | - if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){ |
|
301 | - $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files |
|
302 | - $image_height = $thumbnail_size['height']; |
|
303 | - $image_width = $thumbnail_size['width']; |
|
304 | - } else { |
|
305 | - $image_height=$original_image_size[0]; |
|
306 | - $image_width=$original_image_size[1]; |
|
307 | - } |
|
308 | - } else { |
|
309 | - //example for svg files,... |
|
310 | - $image_width=$max_thumbnail_width; |
|
311 | - $image_height=$max_thumbnail_height; |
|
312 | - } |
|
313 | - |
|
314 | - $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file; |
|
315 | - $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">'; |
|
316 | - |
|
317 | - }//end allowed image types |
|
318 | - }//end if exist file image |
|
319 | - }//end foreach |
|
320 | - }//end image files only |
|
321 | - |
|
322 | - // Creating the table |
|
323 | - $html_table = ''; |
|
324 | - |
|
325 | - $i = 0; |
|
326 | - $count_image = count($image_tag); |
|
327 | - $number_iteration = ceil($count_image/$number_image); |
|
328 | - $p = 0; |
|
299 | + $original_image_size = getimagesize($image); |
|
300 | + if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){ |
|
301 | + $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files |
|
302 | + $image_height = $thumbnail_size['height']; |
|
303 | + $image_width = $thumbnail_size['width']; |
|
304 | + } else { |
|
305 | + $image_height=$original_image_size[0]; |
|
306 | + $image_width=$original_image_size[1]; |
|
307 | + } |
|
308 | + } else { |
|
309 | + //example for svg files,... |
|
310 | + $image_width=$max_thumbnail_width; |
|
311 | + $image_height=$max_thumbnail_height; |
|
312 | + } |
|
313 | + |
|
314 | + $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file; |
|
315 | + $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">'; |
|
316 | + |
|
317 | + }//end allowed image types |
|
318 | + }//end if exist file image |
|
319 | + }//end foreach |
|
320 | + }//end image files only |
|
321 | + |
|
322 | + // Creating the table |
|
323 | + $html_table = ''; |
|
324 | + |
|
325 | + $i = 0; |
|
326 | + $count_image = count($image_tag); |
|
327 | + $number_iteration = ceil($count_image/$number_image); |
|
328 | + $p = 0; |
|
329 | 329 | echo '<ul class="thumbnails">'; |
330 | - for ($k = 0; $k < $number_iteration; $k++) { |
|
331 | - for ($i = 0; $i < $number_image; $i++) { |
|
332 | - if (isset($image_tag[$p])) { |
|
333 | - echo '<li class="col-md-4"> |
|
330 | + for ($k = 0; $k < $number_iteration; $k++) { |
|
331 | + for ($i = 0; $i < $number_image; $i++) { |
|
332 | + if (isset($image_tag[$p])) { |
|
333 | + echo '<li class="col-md-4"> |
|
334 | 334 | <div class="thumbnail">'; |
335 | - echo '<a href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">'.$image_tag[$p].'</a>'; |
|
336 | - echo '</div>'; |
|
335 | + echo '<a href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">'.$image_tag[$p].'</a>'; |
|
336 | + echo '</div>'; |
|
337 | 337 | echo '</li>'; |
338 | - } |
|
339 | - $p++; |
|
340 | - } |
|
341 | - } |
|
338 | + } |
|
339 | + $p++; |
|
340 | + } |
|
341 | + } |
|
342 | 342 | echo '</ul>'; |
343 | 343 | |
344 | 344 | }//end slide==all |
@@ -349,45 +349,45 @@ discard block |
||
349 | 349 | // This is for viewing all the images in the slideshow one at a time. |
350 | 350 | |
351 | 351 | if ($slide_id != 'all' && !empty($image_files_only)) { |
352 | - if (file_exists($image) && is_file($image)) { |
|
353 | - $image_height_width = resize_image($image, $target_width, $target_height); |
|
354 | - |
|
355 | - $image_height = $image_height_width[0]; |
|
356 | - $image_width = $image_height_width[1]; |
|
357 | - |
|
358 | - $height_width_tags = null; |
|
359 | - if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') { |
|
360 | - $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"'; |
|
361 | - } |
|
362 | - |
|
363 | - // This is done really quickly and should be cleaned up a little bit using the API functions |
|
364 | - $tbl_documents = Database::get_course_table(TABLE_DOCUMENT); |
|
365 | - if ($path == '/') { |
|
366 | - $pathpart = '/'; |
|
367 | - } else { |
|
368 | - $pathpart = $path.'/'; |
|
369 | - } |
|
370 | - $sql = "SELECT * FROM $tbl_documents |
|
352 | + if (file_exists($image) && is_file($image)) { |
|
353 | + $image_height_width = resize_image($image, $target_width, $target_height); |
|
354 | + |
|
355 | + $image_height = $image_height_width[0]; |
|
356 | + $image_width = $image_height_width[1]; |
|
357 | + |
|
358 | + $height_width_tags = null; |
|
359 | + if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') { |
|
360 | + $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"'; |
|
361 | + } |
|
362 | + |
|
363 | + // This is done really quickly and should be cleaned up a little bit using the API functions |
|
364 | + $tbl_documents = Database::get_course_table(TABLE_DOCUMENT); |
|
365 | + if ($path == '/') { |
|
366 | + $pathpart = '/'; |
|
367 | + } else { |
|
368 | + $pathpart = $path.'/'; |
|
369 | + } |
|
370 | + $sql = "SELECT * FROM $tbl_documents |
|
371 | 371 | WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'"; |
372 | - $result = Database::query($sql); |
|
373 | - $row = Database::fetch_array($result); |
|
374 | - |
|
375 | - echo '<table align="center" border="0" cellspacing="10">'; |
|
376 | - echo '<tr>'; |
|
377 | - echo '<td id="td_image" align="center">'; |
|
378 | - if ($slide < $total_slides - 1 && $slide_id != 'all') { |
|
379 | - echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>"; |
|
380 | - } else { |
|
381 | - echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>"; |
|
382 | - } |
|
372 | + $result = Database::query($sql); |
|
373 | + $row = Database::fetch_array($result); |
|
374 | + |
|
375 | + echo '<table align="center" border="0" cellspacing="10">'; |
|
376 | + echo '<tr>'; |
|
377 | + echo '<td id="td_image" align="center">'; |
|
378 | + if ($slide < $total_slides - 1 && $slide_id != 'all') { |
|
379 | + echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>"; |
|
380 | + } else { |
|
381 | + echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>"; |
|
382 | + } |
|
383 | 383 | if ($path == '/') { |
384 | - $path = ''; |
|
384 | + $path = ''; |
|
385 | 385 | } |
386 | 386 | |
387 | - list($width, $height) = getimagesize($image); |
|
388 | - // Auto resize |
|
389 | - if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == 'resizing') { |
|
390 | - ?> |
|
387 | + list($width, $height) = getimagesize($image); |
|
388 | + // Auto resize |
|
389 | + if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == 'resizing') { |
|
390 | + ?> |
|
391 | 391 | |
392 | 392 | <script type="text/javascript"> |
393 | 393 | var initial_width='<?php echo $width; ?>'; |
@@ -440,30 +440,30 @@ discard block |
||
440 | 440 | |
441 | 441 | </script> |
442 | 442 | <?php |
443 | - } else { |
|
444 | - echo "<img src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">"; |
|
445 | - } |
|
446 | - |
|
447 | - echo '</a>'; |
|
448 | - echo '</td>'; |
|
449 | - echo '</tr>'; |
|
450 | - echo '<tr>'; |
|
451 | - echo '<td>'; |
|
452 | - echo $row['comment']; |
|
453 | - echo '</td>'; |
|
443 | + } else { |
|
444 | + echo "<img src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">"; |
|
445 | + } |
|
446 | + |
|
447 | + echo '</a>'; |
|
448 | + echo '</td>'; |
|
449 | + echo '</tr>'; |
|
450 | + echo '<tr>'; |
|
451 | + echo '<td>'; |
|
452 | + echo $row['comment']; |
|
453 | + echo '</td>'; |
|
454 | 454 | |
455 | 455 | echo '<tr>'; |
456 | 456 | echo '<td style="padding:10px;" align="center">'; |
457 | 457 | echo Display::tag('h3', $row['title']); |
458 | 458 | echo '</td>'; |
459 | 459 | echo '</tr>'; |
460 | - echo '</tr>'; |
|
461 | - echo '</table>'; |
|
460 | + echo '</tr>'; |
|
461 | + echo '</table>'; |
|
462 | 462 | |
463 | - echo '<table align="center" border="0">'; |
|
464 | - if (api_is_allowed_to_edit(null, true)) { |
|
465 | - $aux = explode('.', htmlspecialchars($image_files_only[$slide])); |
|
466 | - $ext = $aux[count($aux) - 1]; |
|
463 | + echo '<table align="center" border="0">'; |
|
464 | + if (api_is_allowed_to_edit(null, true)) { |
|
465 | + $aux = explode('.', htmlspecialchars($image_files_only[$slide])); |
|
466 | + $ext = $aux[count($aux) - 1]; |
|
467 | 467 | |
468 | 468 | if ($_SESSION['image_resizing'] == 'resizing') { |
469 | 469 | $resize_info = get_lang('Resizing').'<br />'; |
@@ -482,25 +482,25 @@ discard block |
||
482 | 482 | echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$row['id'].'&origin=slideshow&origin_opt='.$edit_slide_id.'&"> |
483 | 483 | <img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="'.get_lang('Modify').'" /></a><br />'; |
484 | 484 | |
485 | - echo $image_files_only[$slide].' <br />'; |
|
486 | - echo $width.' x '.$height.' <br />'; |
|
487 | - echo round((filesize($image)/1024), 2).' KB'; |
|
488 | - echo ' - '.$ext; |
|
489 | - echo '</td>'; |
|
490 | - echo '</tr>'; |
|
491 | - echo '<tr>'; |
|
492 | - echo '<td align="center">'; |
|
493 | - echo $resize_info; |
|
494 | - echo $resize_widht; |
|
495 | - echo $resize_height; |
|
496 | - echo '</td>'; |
|
497 | - echo '</tr>'; |
|
498 | - } |
|
499 | - echo '</table>'; |
|
500 | - |
|
501 | - } else { |
|
502 | - Display::display_warning_message(get_lang('FileNotFound')); |
|
503 | - } |
|
485 | + echo $image_files_only[$slide].' <br />'; |
|
486 | + echo $width.' x '.$height.' <br />'; |
|
487 | + echo round((filesize($image)/1024), 2).' KB'; |
|
488 | + echo ' - '.$ext; |
|
489 | + echo '</td>'; |
|
490 | + echo '</tr>'; |
|
491 | + echo '<tr>'; |
|
492 | + echo '<td align="center">'; |
|
493 | + echo $resize_info; |
|
494 | + echo $resize_widht; |
|
495 | + echo $resize_height; |
|
496 | + echo '</td>'; |
|
497 | + echo '</tr>'; |
|
498 | + } |
|
499 | + echo '</table>'; |
|
500 | + |
|
501 | + } else { |
|
502 | + Display::display_warning_message(get_lang('FileNotFound')); |
|
503 | + } |
|
504 | 504 | } else { |
505 | 505 | if ($slide_id != 'all') { |
506 | 506 | Display::display_warning_message(get_lang('NoDataAvailable')); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if ($image_resizing == 'noresizing' || $image_resizing == '') { |
78 | 78 | echo ' checked'; |
79 | 79 | } |
80 | - ?>> |
|
80 | + ?>> |
|
81 | 81 | </label> |
82 | 82 | <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?> |
83 | 83 | </div> |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | if ($image_resizing == 'resizing_auto' || $image_resizing == '') { |
88 | 88 | echo ' checked'; |
89 | 89 | } |
90 | - ?>> |
|
90 | + ?>> |
|
91 | 91 | </label> |
92 | 92 | <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?> |
93 | 93 | </div> |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $width = $_SESSION['image_resizing_width']; |
100 | 100 | $height = $_SESSION['image_resizing_height']; |
101 | 101 | } |
102 | - ?>> |
|
102 | + ?>> |
|
103 | 103 | </label> |
104 | 104 | <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?> |
105 | 105 | </div> |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label> |
108 | 108 | <div class="col-sm-3"> |
109 | 109 | <input class="form-control" name="width" type="text" id="width" <?php |
110 | - if ($image_resizing == 'resizing') { |
|
111 | - echo ' value="'.$width.'"'; |
|
112 | - echo ' class="enabled_input"'; |
|
110 | + if ($image_resizing == 'resizing') { |
|
111 | + echo ' value="'.$width.'"'; |
|
112 | + echo ' class="enabled_input"'; |
|
113 | 113 | } else { |
114 | 114 | echo ' class="disabled_input"'; |
115 | 115 | } |
116 | - ?> > |
|
116 | + ?> > |
|
117 | 117 | </div> |
118 | 118 | <div class="col-sm-8"></div> |
119 | 119 | </div> |
@@ -121,13 +121,13 @@ discard block |
||
121 | 121 | <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label> |
122 | 122 | <div class="col-sm-3"> |
123 | 123 | <input class="form-control" name="height" type="text" id="height" <?php |
124 | - if ($image_resizing == 'resizing') { |
|
125 | - echo ' value="'.$height.'"'; |
|
126 | - echo ' class="enabled_input"'; |
|
127 | - } else { |
|
124 | + if ($image_resizing == 'resizing') { |
|
125 | + echo ' value="'.$height.'"'; |
|
126 | + echo ' class="enabled_input"'; |
|
127 | + } else { |
|
128 | 128 | echo ' class="disabled_input"'; |
129 | 129 | } |
130 | - ?> > |
|
130 | + ?> > |
|
131 | 131 | </div> |
132 | 132 | <div class="col-sm-8"></div> |
133 | 133 | </div> |