@@ -22,7 +22,7 @@ |
||
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | 24 | while($row = Database::fetch_array($res)) { |
25 | - $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
25 | + $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | - $res2 = Database::query($sql2); |
|
27 | + $res2 = Database::query($sql2); |
|
28 | 28 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | $tuserfv = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); |
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | -while($row = Database::fetch_array($res)) { |
|
24 | +while ($row = Database::fetch_array($res)) { |
|
25 | 25 | $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | 27 | $res2 = Database::query($sql2); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $event = $agenda->get_event($id); |
44 | 44 | |
45 | 45 | if (!empty($event)) { |
46 | - define('ICAL_LANG',api_get_language_isocode()); |
|
46 | + define('ICAL_LANG',api_get_language_isocode()); |
|
47 | 47 | |
48 | 48 | $ical = new vcalendar(); |
49 | 49 | $ical->setConfig('unique_id',api_get_path(WEB_PATH)); |
@@ -129,6 +129,6 @@ discard block |
||
129 | 129 | die(); |
130 | 130 | } |
131 | 131 | } else { |
132 | - header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); |
|
133 | - die(); |
|
132 | + header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); |
|
133 | + die(); |
|
134 | 134 | } |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | $event = $agenda->get_event($id); |
44 | 44 | |
45 | 45 | if (!empty($event)) { |
46 | - define('ICAL_LANG',api_get_language_isocode()); |
|
46 | + define('ICAL_LANG', api_get_language_isocode()); |
|
47 | 47 | |
48 | 48 | $ical = new vcalendar(); |
49 | - $ical->setConfig('unique_id',api_get_path(WEB_PATH)); |
|
50 | - $ical->setProperty( 'method', 'PUBLISH' ); |
|
51 | - $ical->setConfig('url',api_get_path(WEB_PATH)); |
|
49 | + $ical->setConfig('unique_id', api_get_path(WEB_PATH)); |
|
50 | + $ical->setProperty('method', 'PUBLISH'); |
|
51 | + $ical->setConfig('url', api_get_path(WEB_PATH)); |
|
52 | 52 | $vevent = new vevent(); |
53 | 53 | |
54 | - switch($_GET['class']) { |
|
54 | + switch ($_GET['class']) { |
|
55 | 55 | case 'public': |
56 | 56 | $vevent->setClass('PUBLIC'); |
57 | 57 | break; |
@@ -69,44 +69,44 @@ discard block |
||
69 | 69 | $event['start_date'] = api_get_local_time($event['start_date']); |
70 | 70 | $event['end_date'] = api_get_local_time($event['end_date']); |
71 | 71 | |
72 | - switch($type) { |
|
72 | + switch ($type) { |
|
73 | 73 | case 'personal': |
74 | 74 | case 'platform': |
75 | - $vevent->setProperty( 'summary', api_convert_encoding($event['title'],'UTF-8', $charset)); |
|
76 | - if(empty($event['start_date'])){header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));} |
|
77 | - list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$event['start_date']); |
|
78 | - $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s)); |
|
79 | - if(empty($event['end_date'])) { |
|
80 | - $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s; |
|
81 | - if($M2>60){$M2=$M2-60;$h2+=1;} |
|
75 | + $vevent->setProperty('summary', api_convert_encoding($event['title'], 'UTF-8', $charset)); |
|
76 | + if (empty($event['start_date'])) {header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); } |
|
77 | + list($y, $m, $d, $h, $M, $s) = preg_split('/[\s:-]/', $event['start_date']); |
|
78 | + $vevent->setProperty('dtstart', array('year'=>$y, 'month'=>$m, 'day'=>$d, 'hour'=>$h, 'min'=>$M, 'sec'=>$s)); |
|
79 | + if (empty($event['end_date'])) { |
|
80 | + $y2 = $y; $m2 = $m; $d2 = $d; $h2 = $h; $M2 = $M + 15; $s2 = $s; |
|
81 | + if ($M2 > 60) {$M2 = $M2 - 60; $h2 += 1; } |
|
82 | 82 | } else { |
83 | - list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$event['end_date']); |
|
83 | + list($y2, $m2, $d2, $h2, $M2, $s2) = preg_split('/[\s:-]/', $event['end_date']); |
|
84 | 84 | } |
85 | - $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2)); |
|
85 | + $vevent->setProperty('dtend', array('year'=>$y2, 'month'=>$m2, 'day'=>$d2, 'hour'=>$h2, 'min'=>$M2, 'sec'=>$s2)); |
|
86 | 86 | //$vevent->setProperty( 'LOCATION', get_lang('Unknown') ); // property name - case independent |
87 | - $vevent->setProperty( 'description', api_convert_encoding($event['description'],'UTF-8',$charset)); |
|
87 | + $vevent->setProperty('description', api_convert_encoding($event['description'], 'UTF-8', $charset)); |
|
88 | 88 | //$vevent->setProperty( 'comment', 'This is a comment' ); |
89 | 89 | //$user = api_get_user_info($event['user']); |
90 | 90 | //$vevent->setProperty('organizer',$user['mail']); |
91 | 91 | //$vevent->setProperty('attendee',$user['mail']); |
92 | 92 | //$vevent->setProperty( 'rrule', array( 'FREQ' => 'WEEKLY', 'count' => 4));// occurs also four next weeks |
93 | - $ical->setConfig('filename',$y.$m.$d.$h.$M.$s.'-'.rand(1,1000).'.ics'); |
|
94 | - $ical->setComponent ($vevent); // add event to calendar |
|
93 | + $ical->setConfig('filename', $y.$m.$d.$h.$M.$s.'-'.rand(1, 1000).'.ics'); |
|
94 | + $ical->setComponent($vevent); // add event to calendar |
|
95 | 95 | $ical->returnCalendar(); |
96 | 96 | break; |
97 | 97 | case 'course': |
98 | - $vevent->setProperty( 'summary', api_convert_encoding($event['title'],'UTF-8',$charset)); |
|
99 | - if(empty($event['start_date'])){header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));} |
|
100 | - list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$event['start_date']); |
|
101 | - $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s)); |
|
98 | + $vevent->setProperty('summary', api_convert_encoding($event['title'], 'UTF-8', $charset)); |
|
99 | + if (empty($event['start_date'])) {header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); } |
|
100 | + list($y, $m, $d, $h, $M, $s) = preg_split('/[\s:-]/', $event['start_date']); |
|
101 | + $vevent->setProperty('dtstart', array('year'=>$y, 'month'=>$m, 'day'=>$d, 'hour'=>$h, 'min'=>$M, 'sec'=>$s)); |
|
102 | 102 | if (empty($event['end_date'])) { |
103 | - $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s; |
|
104 | - if($M2>60){$M2=$M2-60;$h2+=1;} |
|
103 | + $y2 = $y; $m2 = $m; $d2 = $d; $h2 = $h; $M2 = $M + 15; $s2 = $s; |
|
104 | + if ($M2 > 60) {$M2 = $M2 - 60; $h2 += 1; } |
|
105 | 105 | } else { |
106 | - list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$event['end_date']); |
|
106 | + list($y2, $m2, $d2, $h2, $M2, $s2) = preg_split('/[\s:-]/', $event['end_date']); |
|
107 | 107 | } |
108 | - $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2)); |
|
109 | - $vevent->setProperty( 'description', api_convert_encoding($event['description'],'UTF-8',$charset)); |
|
108 | + $vevent->setProperty('dtend', array('year'=>$y2, 'month'=>$m2, 'day'=>$d2, 'hour'=>$h2, 'min'=>$M2, 'sec'=>$s2)); |
|
109 | + $vevent->setProperty('description', api_convert_encoding($event['description'], 'UTF-8', $charset)); |
|
110 | 110 | //$vevent->setProperty( 'comment', 'This is a comment' ); |
111 | 111 | //$user = api_get_user_info($event['user']); |
112 | 112 | //$vevent->setProperty('organizer',$user['mail']); |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | $vevent->setProperty('rrule',array('FREQ'=>$freq,'UNTIL'=>array('year'=>$e_y,'month'=>$e_m,'day'=>$e_d),'INTERVAL'=>'1')); |
121 | 121 | }*/ |
122 | 122 | //$vevent->setProperty( 'rrule', array( 'FREQ' => 'WEEKLY', 'count' => 4));// occurs also four next weeks |
123 | - $ical->setConfig('filename',$y.$m.$d.$h.$M.$s.'-'.rand(1,1000).'.ics'); |
|
124 | - $ical->setComponent ($vevent); // add event to calendar |
|
123 | + $ical->setConfig('filename', $y.$m.$d.$h.$M.$s.'-'.rand(1, 1000).'.ics'); |
|
124 | + $ical->setComponent($vevent); // add event to calendar |
|
125 | 125 | $ical->returnCalendar(); |
126 | 126 | break; |
127 | 127 | default: |
@@ -36,7 +36,7 @@ |
||
36 | 36 | if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) { |
37 | 37 | if ($_REQUEST['cidReq'] == -1) { |
38 | 38 | // When is out of the course tool (e.g My agenda) |
39 | - header('Location: ' . api_get_self()); |
|
39 | + header('Location: '.api_get_self()); |
|
40 | 40 | exit; |
41 | 41 | } else { |
42 | 42 | $type = 'course'; |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | require_once '../inc/global.inc.php'; |
8 | 8 | |
9 | 9 | $interbreadcrumb[] = array( |
10 | - 'url' => api_get_path(WEB_CODE_PATH) . "calendar/agenda_js.php", |
|
10 | + 'url' => api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php", |
|
11 | 11 | 'name' => get_lang('Agenda') |
12 | 12 | ); |
13 | 13 | |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | if (!empty($currentCourseId) && $currentCourseId != -1) { |
31 | 31 | // Agenda is inside a course tool |
32 | - $url = api_get_self() . '?' . api_get_cidreq(); |
|
32 | + $url = api_get_self().'?'.api_get_cidreq(); |
|
33 | 33 | $this_section = SECTION_COURSES; |
34 | 34 | } else { |
35 | 35 | // Agenda is out of the course tool (e.g personal agenda) |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | if (!empty($events)) { |
46 | 46 | foreach ($events as &$event) { |
47 | 47 | $courseId = isset($event['course_id']) ? $event['course_id'] : ''; |
48 | - $event['url'] = api_get_self() . '?cid=' . $courseId . '&type=' . $event['type']; |
|
48 | + $event['url'] = api_get_self().'?cid='.$courseId.'&type='.$event['type']; |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | // personal and admin do not have visibility property |
77 | 77 | } |
78 | 78 | } |
79 | - header('Location: '. api_get_self()); |
|
79 | + header('Location: '.api_get_self()); |
|
80 | 80 | exit; |
81 | 81 | } |
82 | 82 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | //make some vars |
36 | 36 | $wamidir=$dir; |
37 | 37 | if($wamidir=="/"){ |
38 | - $wamidir=""; |
|
38 | + $wamidir=""; |
|
39 | 39 | } |
40 | 40 | $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/"; |
41 | 41 | $groupId = api_get_group_id(); |
@@ -45,48 +45,48 @@ discard block |
||
45 | 45 | // Please, do not modify this dirname formatting |
46 | 46 | |
47 | 47 | if (strstr($dir, '..')) { |
48 | - $dir = '/'; |
|
48 | + $dir = '/'; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | if ($dir[0] == '.') { |
52 | - $dir = substr($dir, 1); |
|
52 | + $dir = substr($dir, 1); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if ($dir[0] != '/') { |
56 | - $dir = '/'.$dir; |
|
56 | + $dir = '/'.$dir; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if ($dir[strlen($dir) - 1] != '/') { |
60 | - $dir .= '/'; |
|
60 | + $dir .= '/'; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
64 | 64 | |
65 | 65 | if (!is_dir($filepath)) { |
66 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
67 | - $dir = '/'; |
|
66 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
67 | + $dir = '/'; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | //groups //TODO: clean |
71 | 71 | if (!empty($groupId)) { |
72 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
73 | - $noPHP_SELF = true; |
|
74 | - $group = GroupManager :: get_group_properties($groupId); |
|
75 | - $path = explode('/', $dir); |
|
76 | - if ('/'.$path[1] != $group['directory']) { |
|
77 | - api_not_allowed(true); |
|
78 | - } |
|
72 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
73 | + $noPHP_SELF = true; |
|
74 | + $group = GroupManager :: get_group_properties($groupId); |
|
75 | + $path = explode('/', $dir); |
|
76 | + if ('/'.$path[1] != $group['directory']) { |
|
77 | + api_not_allowed(true); |
|
78 | + } |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents')); |
82 | 82 | |
83 | 83 | if (!$is_allowed_in_course) { |
84 | - api_not_allowed(true); |
|
84 | + api_not_allowed(true); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
88 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
89 | - api_not_allowed(true); |
|
88 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
89 | + api_not_allowed(true); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /* Header */ |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | |
95 | 95 | $display_dir = $dir; |
96 | 96 | if (isset ($group)) { |
97 | - $display_dir = explode('/', $dir); |
|
98 | - unset ($display_dir[0]); |
|
99 | - unset ($display_dir[1]); |
|
100 | - $display_dir = implode('/', $display_dir); |
|
97 | + $display_dir = explode('/', $dir); |
|
98 | + unset ($display_dir[0]); |
|
99 | + unset ($display_dir[1]); |
|
100 | + $display_dir = implode('/', $display_dir); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | // Interbreadcrumb for the current directory root path |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | Display :: display_header($nameTools, 'Doc'); |
123 | 123 | echo '<div class="actions">'; |
124 | - echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 | <!-- swfobject is a commonly used library to embed Flash content https://ajax.googleapis.com/ajax/libs/swfobject/2.2/ --> |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | $dir = $document_data['path']; |
34 | 34 | |
35 | 35 | //make some vars |
36 | -$wamidir=$dir; |
|
37 | -if($wamidir=="/"){ |
|
38 | - $wamidir=""; |
|
36 | +$wamidir = $dir; |
|
37 | +if ($wamidir == "/") { |
|
38 | + $wamidir = ""; |
|
39 | 39 | } |
40 | 40 | $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/"; |
41 | 41 | $groupId = api_get_group_id(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | //groups //TODO: clean |
71 | 71 | if (!empty($groupId)) { |
72 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | + $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
73 | 73 | $noPHP_SELF = true; |
74 | 74 | $group = GroupManager :: get_group_properties($groupId); |
75 | 75 | $path = explode('/', $dir); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
88 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
88 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) { |
|
89 | 89 | api_not_allowed(true); |
90 | 90 | } |
91 | 91 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | // Interbreadcrumb for the current directory root path |
104 | 104 | $counter = 0; |
105 | 105 | if (isset($document_data['parents'])) { |
106 | - foreach($document_data['parents'] as $document_sub_data) { |
|
106 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
107 | 107 | //fixing double group folder in breadcrumb |
108 | 108 | if (api_get_group_id()) { |
109 | 109 | if ($counter == 0) { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | Display :: display_header($nameTools, 'Doc'); |
123 | 123 | echo '<div class="actions">'; |
124 | - echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 | <!-- swfobject is a commonly used library to embed Flash content https://ajax.googleapis.com/ajax/libs/swfobject/2.2/ --> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $web_odf_supported_files = DocumentManager::get_web_odf_extension_list(); |
35 | 35 | |
36 | 36 | if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) { |
37 | - $show_web_odf = true; |
|
37 | + $show_web_odf = true; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file; |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | echo Display::display_header(''); |
86 | 86 | |
87 | 87 | echo '<div class="actions">'; |
88 | -echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
89 | -echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
88 | +echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
89 | +echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
90 | 90 | echo '</div>'; |
91 | 91 | |
92 | 92 | // echo '<div id="odf"></div>'; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | //make some vars |
35 | 35 | $webcamdir=$dir; |
36 | 36 | if($webcamdir=="/"){ |
37 | - $webcamdir=""; |
|
37 | + $webcamdir=""; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
@@ -43,49 +43,49 @@ discard block |
||
43 | 43 | // Please, do not modify this dirname formatting |
44 | 44 | |
45 | 45 | if (strstr($dir, '..')) { |
46 | - $dir = '/'; |
|
46 | + $dir = '/'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($dir[0] == '.') { |
50 | - $dir = substr($dir, 1); |
|
50 | + $dir = substr($dir, 1); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | if ($dir[0] != '/') { |
54 | - $dir = '/'.$dir; |
|
54 | + $dir = '/'.$dir; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if ($dir[strlen($dir) - 1] != '/') { |
58 | - $dir .= '/'; |
|
58 | + $dir .= '/'; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
62 | 62 | |
63 | 63 | if (!is_dir($filepath)) { |
64 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
65 | - $dir = '/'; |
|
64 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
65 | + $dir = '/'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $groupId = api_get_group_id(); |
69 | 69 | |
70 | 70 | if (!empty($groupId)) { |
71 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | - $noPHP_SELF = true; |
|
73 | - $group = GroupManager :: get_group_properties($groupId); |
|
74 | - $path = explode('/', $dir); |
|
75 | - if ('/'.$path[1] != $group['directory']) { |
|
76 | - api_not_allowed(true); |
|
77 | - } |
|
71 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | + $noPHP_SELF = true; |
|
73 | + $group = GroupManager :: get_group_properties($groupId); |
|
74 | + $path = explode('/', $dir); |
|
75 | + if ('/'.$path[1] != $group['directory']) { |
|
76 | + api_not_allowed(true); |
|
77 | + } |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | $interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
81 | 81 | |
82 | 82 | if (!$is_allowed_in_course) { |
83 | - api_not_allowed(true); |
|
83 | + api_not_allowed(true); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
87 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
88 | - api_not_allowed(true); |
|
87 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
88 | + api_not_allowed(true); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /* Header */ |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | |
94 | 94 | $display_dir = $dir; |
95 | 95 | if (isset ($group)) { |
96 | - $display_dir = explode('/', $dir); |
|
97 | - unset ($display_dir[0]); |
|
98 | - unset ($display_dir[1]); |
|
99 | - $display_dir = implode('/', $display_dir); |
|
96 | + $display_dir = explode('/', $dir); |
|
97 | + unset ($display_dir[0]); |
|
98 | + unset ($display_dir[1]); |
|
99 | + $display_dir = implode('/', $display_dir); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | // Interbreadcrumb for the current directory root path |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | Display :: display_header($nameTools, 'Doc'); |
122 | 122 | echo '<div class="actions">'; |
123 | 123 | echo '<a href="document.php?id='.$document_id.'">'. |
124 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | $dir = $document_data['path']; |
33 | 33 | |
34 | 34 | //make some vars |
35 | -$webcamdir=$dir; |
|
36 | -if($webcamdir=="/"){ |
|
37 | - $webcamdir=""; |
|
35 | +$webcamdir = $dir; |
|
36 | +if ($webcamdir == "/") { |
|
37 | + $webcamdir = ""; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $groupId = api_get_group_id(); |
69 | 69 | |
70 | 70 | if (!empty($groupId)) { |
71 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
71 | + $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | 72 | $noPHP_SELF = true; |
73 | 73 | $group = GroupManager :: get_group_properties($groupId); |
74 | 74 | $path = explode('/', $dir); |
@@ -77,14 +77,14 @@ discard block |
||
77 | 77 | } |
78 | 78 | } |
79 | 79 | |
80 | -$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
80 | +$interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
81 | 81 | |
82 | 82 | if (!$is_allowed_in_course) { |
83 | 83 | api_not_allowed(true); |
84 | 84 | } |
85 | 85 | |
86 | 86 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
87 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
87 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) { |
|
88 | 88 | api_not_allowed(true); |
89 | 89 | } |
90 | 90 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | // Interbreadcrumb for the current directory root path |
103 | 103 | $counter = 0; |
104 | 104 | if (isset($document_data['parents'])) { |
105 | - foreach($document_data['parents'] as $document_sub_data) { |
|
105 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
106 | 106 | //fixing double group folder in breadcrumb |
107 | 107 | if (api_get_group_id()) { |
108 | 108 | if ($counter == 0) { |
@@ -116,12 +116,12 @@ discard block |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | //make some vars |
119 | -$webcamuserid=api_get_user_id(); |
|
119 | +$webcamuserid = api_get_user_id(); |
|
120 | 120 | |
121 | 121 | Display :: display_header($nameTools, 'Doc'); |
122 | 122 | echo '<div class="actions">'; |
123 | 123 | echo '<a href="document.php?id='.$document_id.'">'. |
124 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 |
@@ -87,10 +87,11 @@ |
||
87 | 87 | |
88 | 88 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
89 | 89 | |
90 | -if (!$is_certificate_mode) |
|
90 | +if (!$is_certificate_mode) { |
|
91 | 91 | $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents')); |
92 | -else |
|
92 | +} else { |
|
93 | 93 | $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
94 | +} |
|
94 | 95 | |
95 | 96 | // Interbreadcrumb for the current directory root path |
96 | 97 | if (empty($document_data['parents'])) { |
@@ -59,44 +59,44 @@ discard block |
||
59 | 59 | /* Please, do not modify this dirname formatting */ |
60 | 60 | |
61 | 61 | if (strstr($dir, '..')) { |
62 | - $dir = '/'; |
|
62 | + $dir = '/'; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | if ($dir[0] == '.') { |
66 | - $dir = substr($dir, 1); |
|
66 | + $dir = substr($dir, 1); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | if ($dir[0] != '/') { |
70 | - $dir = '/'.$dir; |
|
70 | + $dir = '/'.$dir; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | if ($dir[strlen($dir) - 1] != '/') { |
74 | - $dir .= '/'; |
|
74 | + $dir .= '/'; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
78 | 78 | |
79 | 79 | if (!is_dir($filepath)) { |
80 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
81 | - $dir = '/'; |
|
80 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
81 | + $dir = '/'; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | //groups //TODO:clean |
85 | 85 | if (!empty($group_id)) { |
86 | - $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
87 | - $group_document = true; |
|
88 | - $noPHP_SELF = true; |
|
86 | + $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
87 | + $group_document = true; |
|
88 | + $noPHP_SELF = true; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
92 | 92 | |
93 | 93 | if (!$is_certificate_mode) |
94 | - $interbreadcrumb[] = array( |
|
95 | - "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), |
|
96 | - "name" => get_lang('Documents') |
|
97 | - ); |
|
94 | + $interbreadcrumb[] = array( |
|
95 | + "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), |
|
96 | + "name" => get_lang('Documents') |
|
97 | + ); |
|
98 | 98 | else |
99 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
99 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
100 | 100 | |
101 | 101 | // Interbreadcrumb for the current directory root path |
102 | 102 | if (empty($document_data['parents'])) { |
@@ -111,28 +111,28 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
114 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
114 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
115 | 115 | |
116 | 116 | if (!$is_allowedToEdit) { |
117 | - api_not_allowed(true); |
|
117 | + api_not_allowed(true); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | Event::event_access_tool(TOOL_DOCUMENT); |
121 | 121 | |
122 | 122 | Display :: display_header($nameTools, 'Doc'); |
123 | 123 | echo '<div class="actions">'; |
124 | - echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | - echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | + echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
126 | 126 | echo '</div>'; |
127 | 127 | |
128 | 128 | if (api_browser_support('svg')) { |
129 | - // Automatic loading the course language |
|
130 | - $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
131 | - $langsvgedit = api_get_language_isocode(); |
|
132 | - $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
133 | - $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
134 | - $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
135 | - ?> |
|
129 | + // Automatic loading the course language |
|
130 | + $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
131 | + $langsvgedit = api_get_language_isocode(); |
|
132 | + $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
133 | + $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
134 | + $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
135 | + ?> |
|
136 | 136 | <script> |
137 | 137 | document.write('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'); |
138 | 138 | function resizeIframe() { |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | |
151 | 151 | <?php |
152 | 152 | echo '<noscript>'; |
153 | - echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
154 | - echo '</noscript>'; |
|
153 | + echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
154 | + echo '</noscript>'; |
|
155 | 155 | } else { |
156 | - Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
156 | + Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
157 | 157 | } |
158 | 158 | Display::display_footer(); |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : ''; |
34 | 34 | } |
35 | 35 | |
36 | -$dir= str_replace('\\', '/',$dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
36 | +$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
37 | 37 | |
38 | 38 | /* Constants & Variables */ |
39 | -$current_session_id=api_get_session_id(); |
|
39 | +$current_session_id = api_get_session_id(); |
|
40 | 40 | $group_id = api_get_group_id(); |
41 | 41 | |
42 | 42 | //path for svg-edit save |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $filename = $temp_file[0]; |
52 | 52 | $nameTools = get_lang('EditDocument').': '.$filename; |
53 | 53 | |
54 | -$courseDir = $_course['path'].'/document'; |
|
54 | +$courseDir = $_course['path'].'/document'; |
|
55 | 55 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
56 | 56 | |
57 | 57 | /* Other initialization code */ |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | //groups //TODO:clean |
85 | 85 | if (!empty($group_id)) { |
86 | - $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
86 | + $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
87 | 87 | $group_document = true; |
88 | 88 | $noPHP_SELF = true; |
89 | 89 | } |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | "name" => get_lang('Documents') |
97 | 97 | ); |
98 | 98 | else |
99 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
99 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
100 | 100 | |
101 | 101 | // Interbreadcrumb for the current directory root path |
102 | 102 | if (empty($document_data['parents'])) { |
103 | 103 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
104 | 104 | } else { |
105 | - foreach($document_data['parents'] as $document_sub_data) { |
|
105 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
106 | 106 | if ($document_data['title'] == $document_sub_data['title']) { |
107 | 107 | continue; |
108 | 108 | } |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | |
122 | 122 | Display :: display_header($nameTools, 'Doc'); |
123 | 123 | echo '<div class="actions">'; |
124 | - echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | - echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
125 | + echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
126 | 126 | echo '</div>'; |
127 | 127 | |
128 | 128 | if (api_browser_support('svg')) { |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | $editorConfig = array( |
128 | - 'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' :'DocumentsStudent'), |
|
128 | + 'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' : 'DocumentsStudent'), |
|
129 | 129 | 'Width' => '100%', |
130 | 130 | 'Height' => '400', |
131 | 131 | 'cols-size' => [2, 10, 0], |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
145 | 145 | } |
146 | 146 | |
147 | -$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
|
147 | +$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
|
148 | 148 | DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
149 | 149 | $noPHP_SELF = true; |
150 | 150 | |
@@ -168,14 +168,14 @@ discard block |
||
168 | 168 | "name" => get_lang('Documents'), |
169 | 169 | ); |
170 | 170 | } else { |
171 | - $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
171 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | // Interbreadcrumb for the current directory root path |
175 | 175 | if (empty($document_data['parents'])) { |
176 | 176 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
177 | 177 | } else { |
178 | - foreach($document_data['parents'] as $document_sub_data) { |
|
178 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
179 | 179 | if ($document_data['title'] == $document_sub_data['title']) { |
180 | 180 | continue; |
181 | 181 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | $dir, |
360 | 360 | api_get_user_id() |
361 | 361 | ); |
362 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
362 | + header('Location: document.php?id='.$document_data['parent_id'].'&'.api_get_cidreq().($is_certificate_mode ? '&curdirpath=/certificates&selectcat=1' : '')); |
|
363 | 363 | exit; |
364 | 364 | } else { |
365 | 365 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | /* Display user interface */ |
403 | 403 | |
404 | 404 | // Display the header |
405 | -$nameTools = get_lang('EditDocument') . ': '.Security::remove_XSS($document_data['title']); |
|
405 | +$nameTools = get_lang('EditDocument').': '.Security::remove_XSS($document_data['title']); |
|
406 | 406 | Display::display_header($nameTools, 'Doc'); |
407 | 407 | |
408 | 408 | $document_info = api_get_item_property_info( |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
485 | 485 | |
486 | 486 | if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
487 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
487 | + $checked = & $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
488 | 488 | if ($readonly == 1) { |
489 | 489 | $checked->setChecked(true); |
490 | 490 | } |
@@ -524,14 +524,14 @@ discard block |
||
524 | 524 | foreach ($all_information_by_create_certificate[0] as $info_value) { |
525 | 525 | $str_info .= $info_value.'<br/>'; |
526 | 526 | } |
527 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
527 | + $create_certificate = get_lang('CreateCertificateWithTags'); |
|
528 | 528 | Display::display_normal_message( |
529 | 529 | $create_certificate.': <br /><br />'.$str_info, |
530 | 530 | false |
531 | 531 | ); |
532 | 532 | } |
533 | 533 | |
534 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
534 | + if ($extension == 'svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { |
|
535 | 535 | Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
536 | 536 | } |
537 | 537 | echo '<div class="row" style="overflow:hidden"> |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | } |
585 | 585 | |
586 | 586 | //return button back to |
587 | -function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false) |
|
587 | +function show_return($document_id, $path, $call_from_tool = '', $slide_id = 0, $is_certificate_mode = false) |
|
588 | 588 | { |
589 | 589 | global $parent_id; |
590 | 590 | echo '<div class="actions">'; |
@@ -592,26 +592,26 @@ discard block |
||
592 | 592 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
593 | 593 | |
594 | 594 | if ($is_certificate_mode) { |
595 | - echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
596 | - Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
597 | - } elseif($call_from_tool=='slideshow') { |
|
595 | + echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'. |
|
596 | + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
597 | + } elseif ($call_from_tool == 'slideshow') { |
|
598 | 598 | echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
599 | - Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
600 | - } elseif($call_from_tool=='editdraw') { |
|
599 | + Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
600 | + } elseif ($call_from_tool == 'editdraw') { |
|
601 | 601 | echo '<a href="'.$url.'">'. |
602 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
602 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
603 | 603 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
604 | - } elseif($call_from_tool=='editodf') { |
|
604 | + } elseif ($call_from_tool == 'editodf') { |
|
605 | 605 | echo '<a href="'.$url.'">'. |
606 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
606 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
607 | 607 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
608 | - } elseif($call_from_tool=='editpaint'){ |
|
608 | + } elseif ($call_from_tool == 'editpaint') { |
|
609 | 609 | echo '<a href="'.$url.'">'. |
610 | 610 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
611 | 611 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
612 | 612 | } else { |
613 | 613 | echo '<a href="'.$url.'">'. |
614 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
614 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
615 | 615 | } |
616 | 616 | echo '</div>'; |
617 | 617 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $sessionId = api_get_session_id(); |
66 | 66 | |
67 | 67 | if (api_is_in_group()) { |
68 | - $group_properties = GroupManager::get_group_properties($group_id); |
|
68 | + $group_properties = GroupManager::get_group_properties($group_id); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | $dir = '/'; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $_GET['id'], |
78 | 78 | api_get_course_id(), |
79 | 79 | true, |
80 | - 0 |
|
80 | + 0 |
|
81 | 81 | ); |
82 | 82 | |
83 | 83 | if (!empty($sessionId) && empty($document_data)) { |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | ); |
90 | 90 | } |
91 | 91 | |
92 | - $document_id = $document_data['id']; |
|
93 | - $file = $document_data['path']; |
|
94 | - $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
95 | - $dir = dirname($document_data['path']); |
|
96 | - $dir_original = $dir; |
|
97 | - $doc = basename($file); |
|
98 | - $readonly = $document_data['readonly']; |
|
92 | + $document_id = $document_data['id']; |
|
93 | + $file = $document_data['path']; |
|
94 | + $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
95 | + $dir = dirname($document_data['path']); |
|
96 | + $dir_original = $dir; |
|
97 | + $doc = basename($file); |
|
98 | + $readonly = $document_data['readonly']; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | if (empty($document_data)) { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | // Level correction for group documents. |
119 | 119 | if (!empty($group_properties['directory'])) { |
120 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
120 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
121 | 121 | } |
122 | 122 | $relative_url = ''; |
123 | 123 | for ($i = 0; $i < ($count_dir); $i++) { |
@@ -139,13 +139,13 @@ discard block |
||
139 | 139 | ); |
140 | 140 | |
141 | 141 | if ($is_certificate_mode) { |
142 | - $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
143 | - $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
144 | - $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
142 | + $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
143 | + $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
144 | + $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
148 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
148 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
149 | 149 | $noPHP_SELF = true; |
150 | 150 | |
151 | 151 | /* Other initialization code */ |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
159 | 159 | 'name' => get_lang('GroupSpace'), |
160 | 160 | ); |
161 | - $group_document = true; |
|
162 | - $noPHP_SELF = true; |
|
161 | + $group_document = true; |
|
162 | + $noPHP_SELF = true; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | if (!$is_certificate_mode) { |
@@ -193,9 +193,9 @@ discard block |
||
193 | 193 | |
194 | 194 | //TODO:check the below code and his funcionality |
195 | 195 | if (!api_is_allowed_to_edit()) { |
196 | - if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
197 | - api_not_allowed(); |
|
198 | - } |
|
196 | + if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
197 | + api_not_allowed(); |
|
198 | + } |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | /* MAIN TOOL CODE */ |
@@ -203,18 +203,18 @@ discard block |
||
203 | 203 | /* Code to change the comment */ |
204 | 204 | |
205 | 205 | if (isset($_POST['comment'])) { |
206 | - // Fixing the path if it is wrong |
|
207 | - $comment = trim($_POST['comment']); |
|
208 | - $title = trim($_POST['title']); |
|
206 | + // Fixing the path if it is wrong |
|
207 | + $comment = trim($_POST['comment']); |
|
208 | + $title = trim($_POST['title']); |
|
209 | 209 | |
210 | 210 | // Just in case see BT#3525 |
211 | 211 | if (empty($title)) { |
212 | - $title = $document_data['title']; |
|
213 | - } |
|
212 | + $title = $document_data['title']; |
|
213 | + } |
|
214 | 214 | |
215 | - if (empty($title)) { |
|
216 | - $title = get_document_title($_POST['filename']); |
|
217 | - } |
|
215 | + if (empty($title)) { |
|
216 | + $title = get_document_title($_POST['filename']); |
|
217 | + } |
|
218 | 218 | |
219 | 219 | if (!empty($document_id)) { |
220 | 220 | $params = [ |
@@ -226,43 +226,43 @@ discard block |
||
226 | 226 | $params, |
227 | 227 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
228 | 228 | ); |
229 | - Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
229 | + Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
233 | 233 | /* WYSIWYG HTML EDITOR - Program Logic */ |
234 | 234 | if ($is_allowed_to_edit) { |
235 | - if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
235 | + if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
236 | 236 | |
237 | - $filename = stripslashes($_POST['filename']); |
|
237 | + $filename = stripslashes($_POST['filename']); |
|
238 | 238 | $extension = $_POST['extension']; |
239 | - $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
240 | - $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
239 | + $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
240 | + $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
241 | 241 | |
242 | 242 | if ($dir == '/') { |
243 | 243 | $dir = ''; |
244 | 244 | } |
245 | 245 | |
246 | - $file = $dir.'/'.$filename.'.'.$extension; |
|
247 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
248 | - $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
246 | + $file = $dir.'/'.$filename.'.'.$extension; |
|
247 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
248 | + $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
249 | 249 | |
250 | - if (empty($filename)) { |
|
250 | + if (empty($filename)) { |
|
251 | 251 | Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning')); |
252 | - } else { |
|
252 | + } else { |
|
253 | 253 | |
254 | - $file_size = filesize($document_data['absolute_path']); |
|
254 | + $file_size = filesize($document_data['absolute_path']); |
|
255 | 255 | |
256 | - if ($read_only_flag == 0) { |
|
257 | - if (!empty($content)) { |
|
258 | - if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
259 | - // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
260 | - $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
261 | - fputs($fp, $content); |
|
262 | - fclose($fp); |
|
256 | + if ($read_only_flag == 0) { |
|
257 | + if (!empty($content)) { |
|
258 | + if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
259 | + // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
260 | + $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
261 | + fputs($fp, $content); |
|
262 | + fclose($fp); |
|
263 | 263 | |
264 | 264 | $filepath = $document_data['absolute_parent_path']; |
265 | - /* |
|
265 | + /* |
|
266 | 266 | if (!is_dir($filepath.'css')) { |
267 | 267 | mkdir($filepath.'css', api_get_permissions_for_new_directories()); |
268 | 268 | $doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css'); |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | ); |
293 | 293 | }*/ |
294 | 294 | |
295 | - /*if (!is_file($filepath.'css/frames.css')) { |
|
295 | + /*if (!is_file($filepath.'css/frames.css')) { |
|
296 | 296 | $platform_theme = api_get_setting('stylesheets'); |
297 | 297 | if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) { |
298 | 298 | copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css'); |
@@ -330,54 +330,54 @@ discard block |
||
330 | 330 | } |
331 | 331 | }*/ |
332 | 332 | |
333 | - // "WHAT'S NEW" notification: update table item_property |
|
334 | - $document_id = DocumentManager::get_document_id($_course, $file); |
|
335 | - |
|
336 | - if ($document_id) { |
|
337 | - update_existing_document( |
|
338 | - $_course, |
|
339 | - $document_id, |
|
340 | - $file_size, |
|
341 | - $read_only_flag |
|
342 | - ); |
|
343 | - api_item_property_update( |
|
344 | - $_course, |
|
345 | - TOOL_DOCUMENT, |
|
346 | - $document_id, |
|
347 | - 'DocumentUpdated', |
|
348 | - api_get_user_id(), |
|
349 | - null, |
|
350 | - null, |
|
351 | - null, |
|
352 | - null, |
|
353 | - $sessionId |
|
354 | - ); |
|
355 | - // Update parent folders |
|
356 | - item_property_update_on_folder( |
|
357 | - $_course, |
|
358 | - $dir, |
|
359 | - api_get_user_id() |
|
360 | - ); |
|
361 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
362 | - exit; |
|
363 | - } else { |
|
333 | + // "WHAT'S NEW" notification: update table item_property |
|
334 | + $document_id = DocumentManager::get_document_id($_course, $file); |
|
335 | + |
|
336 | + if ($document_id) { |
|
337 | + update_existing_document( |
|
338 | + $_course, |
|
339 | + $document_id, |
|
340 | + $file_size, |
|
341 | + $read_only_flag |
|
342 | + ); |
|
343 | + api_item_property_update( |
|
344 | + $_course, |
|
345 | + TOOL_DOCUMENT, |
|
346 | + $document_id, |
|
347 | + 'DocumentUpdated', |
|
348 | + api_get_user_id(), |
|
349 | + null, |
|
350 | + null, |
|
351 | + null, |
|
352 | + null, |
|
353 | + $sessionId |
|
354 | + ); |
|
355 | + // Update parent folders |
|
356 | + item_property_update_on_folder( |
|
357 | + $_course, |
|
358 | + $dir, |
|
359 | + api_get_user_id() |
|
360 | + ); |
|
361 | + header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
362 | + exit; |
|
363 | + } else { |
|
364 | 364 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
365 | - } |
|
366 | - } else { |
|
365 | + } |
|
366 | + } else { |
|
367 | 367 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
368 | - } |
|
369 | - } else { |
|
370 | - if ($document_id) { |
|
368 | + } |
|
369 | + } else { |
|
370 | + if ($document_id) { |
|
371 | 371 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
372 | - } |
|
373 | - } |
|
374 | - } else { |
|
372 | + } |
|
373 | + } |
|
374 | + } else { |
|
375 | 375 | if ($document_id) { |
376 | 376 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
377 | 377 | } |
378 | - } |
|
379 | - } |
|
380 | - } |
|
378 | + } |
|
379 | + } |
|
380 | + } |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/') |
@@ -431,35 +431,35 @@ discard block |
||
431 | 431 | api_get_group_id() |
432 | 432 | ) |
433 | 433 | ) { |
434 | - $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
434 | + $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
435 | 435 | if ($is_certificate_mode) { |
436 | 436 | $action .= '&curdirpath=/certificates&selectcat=1'; |
437 | 437 | } |
438 | - $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
439 | - |
|
440 | - // Form title |
|
441 | - $form->addElement('header', $nameTools); |
|
442 | - $form->addElement('hidden', 'filename'); |
|
443 | - $form->addElement('hidden', 'extension'); |
|
444 | - $form->addElement('hidden', 'file_path'); |
|
445 | - $form->addElement('hidden', 'commentPath'); |
|
446 | - $form->addElement('hidden', 'showedit'); |
|
447 | - $form->addElement('hidden', 'origin'); |
|
448 | - $form->addElement('hidden', 'origin_opt'); |
|
438 | + $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
439 | + |
|
440 | + // Form title |
|
441 | + $form->addElement('header', $nameTools); |
|
442 | + $form->addElement('hidden', 'filename'); |
|
443 | + $form->addElement('hidden', 'extension'); |
|
444 | + $form->addElement('hidden', 'file_path'); |
|
445 | + $form->addElement('hidden', 'commentPath'); |
|
446 | + $form->addElement('hidden', 'showedit'); |
|
447 | + $form->addElement('hidden', 'origin'); |
|
448 | + $form->addElement('hidden', 'origin_opt'); |
|
449 | 449 | $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
450 | 450 | |
451 | - $defaults['title'] = $document_data['title']; |
|
451 | + $defaults['title'] = $document_data['title']; |
|
452 | 452 | |
453 | - $form->addElement('hidden', 'formSent'); |
|
454 | - $defaults['formSent'] = 1; |
|
453 | + $form->addElement('hidden', 'formSent'); |
|
454 | + $defaults['formSent'] = 1; |
|
455 | 455 | |
456 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
456 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
457 | 457 | |
458 | - // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
459 | - // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
460 | - $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
458 | + // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
459 | + // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
460 | + $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
461 | 461 | |
462 | - // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
462 | + // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
463 | 463 | |
464 | 464 | $showSystemFolders = api_get_course_setting('show_system_folders'); |
465 | 465 | $condition = stripos($dir, '/HotPotatoes_files') === false; |
@@ -467,44 +467,44 @@ discard block |
||
467 | 467 | $condition = true; |
468 | 468 | } |
469 | 469 | |
470 | - if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
471 | - if (empty($readonly) && $readonly == 0) { |
|
470 | + if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
471 | + if (empty($readonly) && $readonly == 0) { |
|
472 | 472 | $form->addHtmlEditor('content', '', true, true, $editorConfig); |
473 | - } |
|
474 | - } |
|
473 | + } |
|
474 | + } |
|
475 | 475 | |
476 | - if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
477 | - // Updated on field |
|
478 | - $last_edit_date = api_get_local_time($last_edit_date); |
|
476 | + if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
477 | + // Updated on field |
|
478 | + $last_edit_date = api_get_local_time($last_edit_date); |
|
479 | 479 | $display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>'; |
480 | - $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
481 | - } |
|
480 | + $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
481 | + } |
|
482 | 482 | |
483 | - $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
483 | + $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
484 | 484 | |
485 | - if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
486 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
487 | - if ($readonly == 1) { |
|
488 | - $checked->setChecked(true); |
|
489 | - } |
|
490 | - } |
|
485 | + if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
486 | + $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
487 | + if ($readonly == 1) { |
|
488 | + $checked->setChecked(true); |
|
489 | + } |
|
490 | + } |
|
491 | 491 | |
492 | - if ($is_certificate_mode) { |
|
493 | - $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
492 | + if ($is_certificate_mode) { |
|
493 | + $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
494 | 494 | } else { |
495 | - $form->addButtonUpdate(get_lang('SaveDocument')); |
|
495 | + $form->addButtonUpdate(get_lang('SaveDocument')); |
|
496 | 496 | } |
497 | 497 | |
498 | - $defaults['filename'] = $filename; |
|
499 | - $defaults['extension'] = $extension; |
|
500 | - $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
501 | - $defaults['commentPath'] = $file; |
|
502 | - $defaults['renameTo'] = $file_name; |
|
503 | - $defaults['comment'] = $document_data['comment']; |
|
504 | - $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
505 | - $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
498 | + $defaults['filename'] = $filename; |
|
499 | + $defaults['extension'] = $extension; |
|
500 | + $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
501 | + $defaults['commentPath'] = $file; |
|
502 | + $defaults['renameTo'] = $file_name; |
|
503 | + $defaults['comment'] = $document_data['comment']; |
|
504 | + $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
505 | + $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
506 | 506 | |
507 | - $form->setDefaults($defaults); |
|
507 | + $form->setDefaults($defaults); |
|
508 | 508 | |
509 | 509 | show_return( |
510 | 510 | $parent_id, |
@@ -514,25 +514,25 @@ discard block |
||
514 | 514 | $is_certificate_mode |
515 | 515 | ); |
516 | 516 | |
517 | - if ($is_certificate_mode) { |
|
518 | - $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
519 | - api_get_user_id(), |
|
520 | - api_get_course_id() |
|
521 | - ); |
|
522 | - $str_info = ''; |
|
523 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
524 | - $str_info .= $info_value.'<br/>'; |
|
525 | - } |
|
526 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
527 | - Display::display_normal_message( |
|
528 | - $create_certificate.': <br /><br />'.$str_info, |
|
529 | - false |
|
530 | - ); |
|
531 | - } |
|
532 | - |
|
533 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
534 | - Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
535 | - } |
|
517 | + if ($is_certificate_mode) { |
|
518 | + $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
519 | + api_get_user_id(), |
|
520 | + api_get_course_id() |
|
521 | + ); |
|
522 | + $str_info = ''; |
|
523 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
524 | + $str_info .= $info_value.'<br/>'; |
|
525 | + } |
|
526 | + $create_certificate=get_lang('CreateCertificateWithTags'); |
|
527 | + Display::display_normal_message( |
|
528 | + $create_certificate.': <br /><br />'.$str_info, |
|
529 | + false |
|
530 | + ); |
|
531 | + } |
|
532 | + |
|
533 | + if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
534 | + Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
535 | + } |
|
536 | 536 | echo '<div class="row" style="overflow:hidden"> |
537 | 537 | <div id="template_col" class="col-md-2"> |
538 | 538 | <div class="panel panel-default"> |
@@ -560,57 +560,57 @@ discard block |
||
560 | 560 | */ |
561 | 561 | function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc) |
562 | 562 | { |
563 | - $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
563 | + $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
564 | 564 | $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file |
565 | - $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
566 | - |
|
567 | - if ($rename_to) { |
|
568 | - if (isset($dir) && $dir != '') { |
|
569 | - $source_file = $dir.$source_file; |
|
570 | - $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
571 | - } else { |
|
572 | - $source_file = '/'.$source_file; |
|
573 | - $new_full_file_name = '/'.$rename_to; |
|
574 | - } |
|
575 | - |
|
576 | - update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
565 | + $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
566 | + |
|
567 | + if ($rename_to) { |
|
568 | + if (isset($dir) && $dir != '') { |
|
569 | + $source_file = $dir.$source_file; |
|
570 | + $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
571 | + } else { |
|
572 | + $source_file = '/'.$source_file; |
|
573 | + $new_full_file_name = '/'.$rename_to; |
|
574 | + } |
|
575 | + |
|
576 | + update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
577 | 577 | Display::addFlash(Display::return_message(get_lang('fileModified'))); |
578 | 578 | |
579 | - return true; |
|
580 | - } else { |
|
579 | + return true; |
|
580 | + } else { |
|
581 | 581 | Display::addFlash(Display::return_message(get_lang('FileExists'))); |
582 | - } |
|
582 | + } |
|
583 | 583 | } |
584 | 584 | |
585 | 585 | //return button back to |
586 | 586 | function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false) |
587 | 587 | { |
588 | 588 | global $parent_id; |
589 | - echo '<div class="actions">'; |
|
589 | + echo '<div class="actions">'; |
|
590 | 590 | |
591 | 591 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
592 | 592 | |
593 | - if ($is_certificate_mode) { |
|
594 | - echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
593 | + if ($is_certificate_mode) { |
|
594 | + echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
595 | 595 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
596 | - } elseif($call_from_tool=='slideshow') { |
|
597 | - echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
596 | + } elseif($call_from_tool=='slideshow') { |
|
597 | + echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
598 | 598 | Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
599 | - } elseif($call_from_tool=='editdraw') { |
|
600 | - echo '<a href="'.$url.'">'. |
|
599 | + } elseif($call_from_tool=='editdraw') { |
|
600 | + echo '<a href="'.$url.'">'. |
|
601 | 601 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
602 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
603 | - } elseif($call_from_tool=='editodf') { |
|
602 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
603 | + } elseif($call_from_tool=='editodf') { |
|
604 | 604 | echo '<a href="'.$url.'">'. |
605 | 605 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
606 | 606 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
607 | 607 | } elseif($call_from_tool=='editpaint'){ |
608 | - echo '<a href="'.$url.'">'. |
|
608 | + echo '<a href="'.$url.'">'. |
|
609 | 609 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
610 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
611 | - } else { |
|
612 | - echo '<a href="'.$url.'">'. |
|
610 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
611 | + } else { |
|
612 | + echo '<a href="'.$url.'">'. |
|
613 | 613 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
614 | - } |
|
615 | - echo '</div>'; |
|
614 | + } |
|
615 | + echo '</div>'; |
|
616 | 616 | } |