@@ -27,7 +27,7 @@ |
||
27 | 27 | $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url; |
28 | 28 | |
29 | 29 | if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) { |
30 | - $doc_url = ''; |
|
30 | + $doc_url = ''; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | // Dealing with image included into survey: when users receive a link towards a |
@@ -95,7 +95,7 @@ |
||
95 | 95 | } |
96 | 96 | |
97 | 97 | if (!api_is_allowed_to_edit() && !$is_visible) { |
98 | - Display::display_error_message(get_lang('ProtectedDocument'));//api_not_allowed backbutton won't work. |
|
98 | + Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work. |
|
99 | 99 | exit; // You shouldn't be here anyway. |
100 | 100 | } |
101 | 101 | // Launch event |
@@ -14,18 +14,18 @@ discard block |
||
14 | 14 | parse_str($_SERVER['QUERY_STRING'], $params); |
15 | 15 | |
16 | 16 | if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
17 | - $webcamname = $params['webcamname']; |
|
18 | - $webcamdir = $params['webcamdir']; |
|
19 | - $webcamuserid = $params['webcamuserid']; |
|
17 | + $webcamname = $params['webcamname']; |
|
18 | + $webcamdir = $params['webcamdir']; |
|
19 | + $webcamuserid = $params['webcamuserid']; |
|
20 | 20 | } |
21 | 21 | else { |
22 | - api_not_allowed(); |
|
23 | - die(); |
|
22 | + api_not_allowed(); |
|
23 | + die(); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) { |
27 | - api_not_allowed(); |
|
28 | - die(); |
|
27 | + api_not_allowed(); |
|
28 | + die(); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $ext = strtolower($ext[sizeof($ext) - 1]); |
43 | 43 | |
44 | 44 | if($ext!= 'jpg'){ |
45 | - die(); |
|
45 | + die(); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | //Do not use here check Fileinfo method because return: text/plain //CHECK THIS BEFORE COMMIT |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | $title_to_save=str_replace('_',' ',$webcamname); |
58 | 58 | $webcamname_noex=basename($webcamname, ".jpg"); |
59 | 59 | if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
60 | - $i = 1; |
|
61 | - while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
62 | - $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
63 | - $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
64 | - $title_to_save = str_replace('_',' ',$title_to_save); |
|
60 | + $i = 1; |
|
61 | + while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
62 | + $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
63 | + $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
64 | + $title_to_save = str_replace('_',' ',$title_to_save); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $documentPath = $saveDir.'/'.$webcamname_to_save; |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | //Change to move_uploaded_file() function instead file_get_contents() to adapt the new lib |
71 | 71 | $content = move_uploaded_file($_FILES['webcam']['tmp_name'], $documentPath); |
72 | 72 | if (!$content) { |
73 | - print "PHP ERROR: Failed to read data\n"; |
|
74 | - exit(); |
|
73 | + print "PHP ERROR: Failed to read data\n"; |
|
74 | + exit(); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | //add document to database |
78 | - $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
79 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
78 | + $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
79 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
80 | 80 | /// |
81 | 81 | $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; |
82 | 82 | print get_lang('ClipSent'); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | # Save the audio to a URL-accessible directory for playback. |
14 | 14 | parse_str($_SERVER['QUERY_STRING'], $params); |
15 | 15 | |
16 | -if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
|
16 | +if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
|
17 | 17 | $webcamname = $params['webcamname']; |
18 | 18 | $webcamdir = $params['webcamdir']; |
19 | 19 | $webcamuserid = $params['webcamuserid']; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | die(); |
24 | 24 | } |
25 | 25 | |
26 | -if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) { |
|
26 | +if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) { |
|
27 | 27 | api_not_allowed(); |
28 | 28 | die(); |
29 | 29 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $ext = explode('.', $webcamname); |
42 | 42 | $ext = strtolower($ext[sizeof($ext) - 1]); |
43 | 43 | |
44 | -if($ext!= 'jpg'){ |
|
44 | +if ($ext != 'jpg') { |
|
45 | 45 | die(); |
46 | 46 | } |
47 | 47 | |
@@ -53,15 +53,15 @@ discard block |
||
53 | 53 | $groupId = api_get_group_id(); |
54 | 54 | |
55 | 55 | //Avoid duplicates |
56 | -$webcamname_to_save=$webcamname; |
|
57 | -$title_to_save=str_replace('_',' ',$webcamname); |
|
58 | -$webcamname_noex=basename($webcamname, ".jpg"); |
|
59 | -if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
|
56 | +$webcamname_to_save = $webcamname; |
|
57 | +$title_to_save = str_replace('_', ' ', $webcamname); |
|
58 | +$webcamname_noex = basename($webcamname, ".jpg"); |
|
59 | +if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) { |
|
60 | 60 | $i = 1; |
61 | 61 | while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
62 | - $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
63 | - $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
64 | - $title_to_save = str_replace('_',' ',$title_to_save); |
|
62 | + $webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext; |
|
63 | + $title_to_save = $webcamname_noex.'_'.$i.'.'.$ext; |
|
64 | + $title_to_save = str_replace('_', ' ', $title_to_save); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $documentPath = $saveDir.'/'.$webcamname_to_save; |
@@ -78,5 +78,5 @@ discard block |
||
78 | 78 | $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
79 | 79 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
80 | 80 | /// |
81 | -$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; |
|
81 | +$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath; |
|
82 | 82 | print get_lang('ClipSent'); |
@@ -17,8 +17,7 @@ discard block |
||
17 | 17 | $webcamname = $params['webcamname']; |
18 | 18 | $webcamdir = $params['webcamdir']; |
19 | 19 | $webcamuserid = $params['webcamuserid']; |
20 | -} |
|
21 | -else { |
|
20 | +} else { |
|
22 | 21 | api_not_allowed(); |
23 | 22 | die(); |
24 | 23 | } |
@@ -58,7 +57,9 @@ discard block |
||
58 | 57 | $webcamname_noex=basename($webcamname, ".jpg"); |
59 | 58 | if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
60 | 59 | $i = 1; |
61 | - while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
60 | + while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) { |
|
61 | + $i++; |
|
62 | + } |
|
62 | 63 | $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
63 | 64 | $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
64 | 65 | $title_to_save = str_replace('_',' ',$title_to_save); |
@@ -93,10 +93,11 @@ discard block |
||
93 | 93 | |
94 | 94 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
95 | 95 | |
96 | -if (!$is_certificate_mode) |
|
96 | +if (!$is_certificate_mode) { |
|
97 | 97 | $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
98 | -else |
|
98 | +} else { |
|
99 | 99 | $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
100 | +} |
|
100 | 101 | |
101 | 102 | // Interbreadcrumb for the current directory root path |
102 | 103 | if (empty($document_data['parents'])) { |
@@ -158,8 +159,7 @@ discard block |
||
158 | 159 | @file_put_contents($path_and_file, $crossdomain); |
159 | 160 | } |
160 | 161 | $credentials="true"; |
161 | -} |
|
162 | -else { |
|
162 | +} else { |
|
163 | 163 | $credentials="false"; |
164 | 164 | } |
165 | 165 |
@@ -33,26 +33,26 @@ discard block |
||
33 | 33 | $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null; |
34 | 34 | } |
35 | 35 | |
36 | -$dir= str_replace('\\', '/', $dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
36 | +$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261) |
|
37 | 37 | |
38 | 38 | /* Constants & Variables */ |
39 | -$current_session_id=api_get_session_id(); |
|
39 | +$current_session_id = api_get_session_id(); |
|
40 | 40 | //path for pixlr save |
41 | -$_SESSION['paint_dir']=Security::remove_XSS($dir); |
|
42 | -if($_SESSION['paint_dir']=='/'){ |
|
43 | - $_SESSION['paint_dir']=''; |
|
41 | +$_SESSION['paint_dir'] = Security::remove_XSS($dir); |
|
42 | +if ($_SESSION['paint_dir'] == '/') { |
|
43 | + $_SESSION['paint_dir'] = ''; |
|
44 | 44 | } |
45 | -$_SESSION['paint_file']=basename(Security::remove_XSS($file_path)); |
|
45 | +$_SESSION['paint_file'] = basename(Security::remove_XSS($file_path)); |
|
46 | 46 | |
47 | 47 | $get_file = Security::remove_XSS($file_path); |
48 | 48 | |
49 | 49 | $file = basename($get_file); |
50 | 50 | |
51 | -$temp_file = explode(".",$file); |
|
52 | -$filename=$temp_file[0]; |
|
53 | -$nameTools = get_lang('EditDocument') . ': '.$filename; |
|
51 | +$temp_file = explode(".", $file); |
|
52 | +$filename = $temp_file[0]; |
|
53 | +$nameTools = get_lang('EditDocument').': '.$filename; |
|
54 | 54 | |
55 | -$courseDir = $_course['path'].'/document'; |
|
55 | +$courseDir = $_course['path'].'/document'; |
|
56 | 56 | |
57 | 57 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
58 | 58 | |
@@ -96,15 +96,15 @@ discard block |
||
96 | 96 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
97 | 97 | |
98 | 98 | if (!$is_certificate_mode) |
99 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
99 | + $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
100 | 100 | else |
101 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
101 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
102 | 102 | |
103 | 103 | // Interbreadcrumb for the current directory root path |
104 | 104 | if (empty($document_data['parents'])) { |
105 | 105 | $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
106 | 106 | } else { |
107 | - foreach($document_data['parents'] as $document_sub_data) { |
|
107 | + foreach ($document_data['parents'] as $document_sub_data) { |
|
108 | 108 | if ($document_data['title'] == $document_sub_data['title']) { |
109 | 109 | continue; |
110 | 110 | } |
@@ -124,33 +124,33 @@ discard block |
||
124 | 124 | Display :: display_header($nameTools, 'Doc'); |
125 | 125 | echo '<div class="actions">'; |
126 | 126 | echo '<a href="document.php?id='.$parent_id.'&'.api_get_cidreq().'">'. |
127 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
127 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
128 | 128 | echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_get_cidreq().'&origin=editpaint">'. |
129 | - Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
129 | + Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
130 | 130 | echo '</div>'; |
131 | 131 | |
132 | 132 | ///pixlr |
133 | -$title=$file;//disk name. No sql name because pixlr return this when save |
|
133 | +$title = $file; //disk name. No sql name because pixlr return this when save |
|
134 | 134 | $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
135 | -$langpixlr = api_get_language_isocode(); |
|
135 | +$langpixlr = api_get_language_isocode(); |
|
136 | 136 | $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr; |
137 | -$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser |
|
137 | +$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser |
|
138 | 138 | |
139 | -$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
140 | -$_SESSION['exit_pixlr']= Security::remove_XSS($parent_id); |
|
139 | +$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
140 | +$_SESSION['exit_pixlr'] = Security::remove_XSS($parent_id); |
|
141 | 141 | |
142 | -$referrer="Chamilo"; |
|
142 | +$referrer = "Chamilo"; |
|
143 | 143 | |
144 | -$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
145 | -$target=$target_path; |
|
144 | +$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
145 | +$target = $target_path; |
|
146 | 146 | |
147 | -$locktarget="true"; |
|
148 | -$locktitle="false"; |
|
147 | +$locktarget = "true"; |
|
148 | +$locktitle = "false"; |
|
149 | 149 | |
150 | -if ($_SERVER['HTTP_HOST']=="localhost") { |
|
151 | - $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
150 | +if ($_SERVER['HTTP_HOST'] == "localhost") { |
|
151 | + $path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
152 | 152 | if (!file_exists($path_and_file)) { |
153 | - $crossdomain='<?xml version="1.0"?> |
|
153 | + $crossdomain = '<?xml version="1.0"?> |
|
154 | 154 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
155 | 155 | <cross-domain-policy> |
156 | 156 | <allow-access-from domain="cdn.pixlr.com" /> |
@@ -159,23 +159,23 @@ discard block |
||
159 | 159 | </cross-domain-policy>';//more open domain="*" |
160 | 160 | @file_put_contents($path_and_file, $crossdomain); |
161 | 161 | } |
162 | - $credentials="true"; |
|
162 | + $credentials = "true"; |
|
163 | 163 | } |
164 | 164 | else { |
165 | - $credentials="false"; |
|
165 | + $credentials = "false"; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | //make temp images |
169 | -$temp_folder=api_get_path(SYS_ARCHIVE_PATH).'temp/images'; |
|
169 | +$temp_folder = api_get_path(SYS_ARCHIVE_PATH).'temp/images'; |
|
170 | 170 | if (!file_exists($temp_folder)) { |
171 | - @mkdir($temp_folder, api_get_permissions_for_new_directories(), true);//TODO:check $permissions value, now empty; |
|
171 | + @mkdir($temp_folder, api_get_permissions_for_new_directories(), true); //TODO:check $permissions value, now empty; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | //make htaccess with allow from all, and file index.html into temp/images |
175 | -$htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
|
175 | +$htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
|
176 | 176 | if (!file_exists($htaccess)) { |
177 | 177 | |
178 | - $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
178 | + $htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
179 | 179 | |
180 | 180 | $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
181 | 181 | if ($fp) { |
@@ -184,9 +184,9 @@ discard block |
||
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
187 | -$html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
|
187 | +$html_index = api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
|
188 | 188 | if (!file_exists($html_index)) { |
189 | - $html_index_content="<html><head></head><body></body></html>"; |
|
189 | + $html_index_content = "<html><head></head><body></body></html>"; |
|
190 | 190 | $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
191 | 191 | if ($fp) { |
192 | 192 | fwrite($fp, $html_index_content); |
@@ -195,20 +195,20 @@ discard block |
||
195 | 195 | } |
196 | 196 | |
197 | 197 | //encript temp name file |
198 | -$name_crip=sha1(uniqid());//encript |
|
199 | -$findext= explode(".", $file); |
|
200 | -$extension= $findext[count($findext)-1]; |
|
201 | -$file_crip=$name_crip.'.'.$extension; |
|
198 | +$name_crip = sha1(uniqid()); //encript |
|
199 | +$findext = explode(".", $file); |
|
200 | +$extension = $findext[count($findext) - 1]; |
|
201 | +$file_crip = $name_crip.'.'.$extension; |
|
202 | 202 | |
203 | 203 | //copy file to temp/images directory |
204 | -$from=$filepath.$file; |
|
205 | -$to=api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
204 | +$from = $filepath.$file; |
|
205 | +$to = api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
206 | 206 | copy($from, $to); |
207 | -$_SESSION['temp_realpath_image']=$to; |
|
207 | +$_SESSION['temp_realpath_image'] = $to; |
|
208 | 208 | |
209 | 209 | //load image to url |
210 | -$to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
211 | -$image=urlencode($to_url); |
|
210 | +$to_url = api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip; |
|
211 | +$image = urlencode($to_url); |
|
212 | 212 | $pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; |
213 | 213 | |
214 | 214 | //make frame an send image |
@@ -61,44 +61,44 @@ discard block |
||
61 | 61 | /* Please, do not modify this dirname formatting */ |
62 | 62 | |
63 | 63 | if (strstr($dir, '..')) { |
64 | - $dir = '/'; |
|
64 | + $dir = '/'; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | if ($dir[0] == '.') { |
68 | - $dir = substr($dir, 1); |
|
68 | + $dir = substr($dir, 1); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | if ($dir[0] != '/') { |
72 | - $dir = '/'.$dir; |
|
72 | + $dir = '/'.$dir; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | if ($dir[strlen($dir) - 1] != '/') { |
76 | - $dir .= '/'; |
|
76 | + $dir .= '/'; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
80 | 80 | |
81 | 81 | if (!is_dir($filepath)) { |
82 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
83 | - $dir = '/'; |
|
82 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
83 | + $dir = '/'; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | //groups //TODO:clean |
87 | 87 | if (!empty($groupId)) { |
88 | - $interbreadcrumb[] = array( |
|
89 | - 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
90 | - 'name' => get_lang('GroupSpace'), |
|
91 | - ); |
|
92 | - $group_document = true; |
|
93 | - $noPHP_SELF = true; |
|
88 | + $interbreadcrumb[] = array( |
|
89 | + 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
90 | + 'name' => get_lang('GroupSpace'), |
|
91 | + ); |
|
92 | + $group_document = true; |
|
93 | + $noPHP_SELF = true; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
97 | 97 | |
98 | 98 | if (!$is_certificate_mode) |
99 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
99 | + $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
100 | 100 | else |
101 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
101 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
102 | 102 | |
103 | 103 | // Interbreadcrumb for the current directory root path |
104 | 104 | if (empty($document_data['parents'])) { |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | } |
114 | 114 | |
115 | 115 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
116 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
116 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
117 | 117 | |
118 | 118 | if (!$is_allowedToEdit) { |
119 | - api_not_allowed(true); |
|
119 | + api_not_allowed(true); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | Event::event_access_tool(TOOL_DOCUMENT); |
@@ -148,21 +148,21 @@ discard block |
||
148 | 148 | $locktitle="false"; |
149 | 149 | |
150 | 150 | if ($_SERVER['HTTP_HOST']=="localhost") { |
151 | - $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
152 | - if (!file_exists($path_and_file)) { |
|
153 | - $crossdomain='<?xml version="1.0"?> |
|
151 | + $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
152 | + if (!file_exists($path_and_file)) { |
|
153 | + $crossdomain='<?xml version="1.0"?> |
|
154 | 154 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
155 | 155 | <cross-domain-policy> |
156 | 156 | <allow-access-from domain="cdn.pixlr.com" /> |
157 | 157 | <site-control permitted-cross-domain-policies="master-only"/> |
158 | 158 | <allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/> |
159 | 159 | </cross-domain-policy>';//more open domain="*" |
160 | - @file_put_contents($path_and_file, $crossdomain); |
|
161 | - } |
|
162 | - $credentials="true"; |
|
160 | + @file_put_contents($path_and_file, $crossdomain); |
|
161 | + } |
|
162 | + $credentials="true"; |
|
163 | 163 | } |
164 | 164 | else { |
165 | - $credentials="false"; |
|
165 | + $credentials="false"; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | //make temp images |
@@ -175,23 +175,23 @@ discard block |
||
175 | 175 | $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
176 | 176 | if (!file_exists($htaccess)) { |
177 | 177 | |
178 | - $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
178 | + $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
179 | 179 | |
180 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
181 | - if ($fp) { |
|
182 | - fwrite($fp, $htaccess_content); |
|
183 | - fclose($fp); |
|
184 | - } |
|
180 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
181 | + if ($fp) { |
|
182 | + fwrite($fp, $htaccess_content); |
|
183 | + fclose($fp); |
|
184 | + } |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
188 | 188 | if (!file_exists($html_index)) { |
189 | - $html_index_content="<html><head></head><body></body></html>"; |
|
190 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
191 | - if ($fp) { |
|
192 | - fwrite($fp, $html_index_content); |
|
193 | - fclose($fp); |
|
194 | - } |
|
189 | + $html_index_content="<html><head></head><body></body></html>"; |
|
190 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
191 | + if ($fp) { |
|
192 | + fwrite($fp, $html_index_content); |
|
193 | + fclose($fp); |
|
194 | + } |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | //encript temp name file |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | |
30 | 30 | // Resetting the images of the slideshow = destroying the slideshow |
31 | 31 | if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') { |
32 | - $_SESSION['image_files_only'] = null; |
|
33 | - unset($image_files_only); |
|
32 | + $_SESSION['image_files_only'] = null; |
|
33 | + unset($image_files_only); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | // We check if there are images in this folder by searching the extensions for .jpg, .gif, .png |
@@ -39,10 +39,10 @@ discard block |
||
39 | 39 | $array_to_search = !empty($documentAndFolders) && is_array($documentAndFolders) ? $documentAndFolders : array(); |
40 | 40 | |
41 | 41 | if (count($array_to_search) > 0) { |
42 | - while (list($key) = each($array_to_search)) { |
|
43 | - $all_files[] = basename($array_to_search[$key]['path']); |
|
44 | - //echo basename($array_to_search[$key]['path']).'<br />'; |
|
45 | - } |
|
42 | + while (list($key) = each($array_to_search)) { |
|
43 | + $all_files[] = basename($array_to_search[$key]['path']); |
|
44 | + //echo basename($array_to_search[$key]['path']).'<br />'; |
|
45 | + } |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | // Always show gallery. |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | |
63 | 63 | $tablename_column = isset($_GET['tablename_column']) ? Security::remove_XSS($_GET['tablename_column']) : 0; |
64 | 64 | if ($tablename_column == 0) { |
65 | - $tablename_column = 1; |
|
65 | + $tablename_column = 1; |
|
66 | 66 | } else { |
67 | - $tablename_column = intval($tablename_column) - 1; |
|
67 | + $tablename_column = intval($tablename_column) - 1; |
|
68 | 68 | } |
69 | 69 | $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XSS($_GET['tablename_direction']) : 'ASC'; |
70 | 70 | |
@@ -98,15 +98,15 @@ discard block |
||
98 | 98 | $final_array[] = $file_array[1]; |
99 | 99 | } |
100 | 100 | |
101 | - return $final_array; |
|
101 | + return $final_array; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | function sort_table($a, $b) { |
105 | - global $tablename_column; |
|
106 | - return strnatcmp($a[$tablename_column], $b[$tablename_column]); |
|
105 | + global $tablename_column; |
|
106 | + return strnatcmp($a[$tablename_column], $b[$tablename_column]); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | function rsort_table($a, $b) { |
110 | - global $tablename_column; |
|
111 | - return strnatcmp($b[$tablename_column], $a[$tablename_column]); |
|
110 | + global $tablename_column; |
|
111 | + return strnatcmp($b[$tablename_column], $a[$tablename_column]); |
|
112 | 112 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * too much things in one file , I decided to put the code for document.php here and to include this |
26 | 26 | * file into document.php |
27 | 27 | */ |
28 | -$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp','.svg'); |
|
28 | +$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.svg'); |
|
29 | 29 | |
30 | 30 | // Resetting the images of the slideshow = destroying the slideshow |
31 | 31 | if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | // A student should not be able to download a root shared directory |
53 | 53 | if (($path == '/shared_folder' || |
54 | - $path == '/shared_folder_session_' . api_get_session_id()) && |
|
54 | + $path == '/shared_folder_session_'.api_get_session_id()) && |
|
55 | 55 | (!api_is_allowed_to_edit() || !api_is_platform_admin()) |
56 | 56 | ) { |
57 | 57 | api_not_allowed(true); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | (props.session_id IN ('0', '$sessionId') OR props.session_id IS NULL) AND |
150 | 150 | docs.c_id = ".$courseId." "; |
151 | 151 | |
152 | - $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
152 | + $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
153 | 153 | |
154 | 154 | $result = Database::query($sql); |
155 | 155 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | $groupCondition |
215 | 215 | "; |
216 | 216 | |
217 | - $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
217 | + $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId); |
|
218 | 218 | $result = Database::query($sql); |
219 | 219 | |
220 | 220 | $files = array(); |
@@ -294,9 +294,9 @@ discard block |
||
294 | 294 | // Add all files in our final array to the zipfile |
295 | 295 | for ($i = 0; $i < count($files_for_zipfile); $i++) { |
296 | 296 | $zip->add( |
297 | - $sysCoursePath . $courseInfo['path'] . '/document' . $files_for_zipfile[$i], |
|
297 | + $sysCoursePath.$courseInfo['path'].'/document'.$files_for_zipfile[$i], |
|
298 | 298 | PCLZIP_OPT_REMOVE_PATH, |
299 | - $sysCoursePath . $courseInfo['path'] . '/document' . $remove_dir, |
|
299 | + $sysCoursePath.$courseInfo['path'].'/document'.$remove_dir, |
|
300 | 300 | PCLZIP_CB_PRE_ADD, |
301 | 301 | 'fixDocumentNameCallback' |
302 | 302 | ); |
@@ -212,7 +212,7 @@ |
||
212 | 212 | * @param array $arr1 first array |
213 | 213 | * @param array $arr2 second array |
214 | 214 | * |
215 | - * @return array difference between the two arrays |
|
215 | + * @return string difference between the two arrays |
|
216 | 216 | */ |
217 | 217 | function diff($arr1, $arr2) |
218 | 218 | { |
@@ -16,36 +16,36 @@ discard block |
||
16 | 16 | api_protect_course_script(); |
17 | 17 | api_block_anonymous_users(); |
18 | 18 | |
19 | -if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) { |
|
19 | +if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) { |
|
20 | 20 | api_not_allowed(); |
21 | 21 | die(); |
22 | 22 | } |
23 | 23 | |
24 | -if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) { |
|
24 | +if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) { |
|
25 | 25 | api_not_allowed(); |
26 | 26 | die(); |
27 | 27 | } |
28 | 28 | |
29 | -if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){ |
|
29 | +if (!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami'])) { |
|
30 | 30 | api_not_allowed(); |
31 | 31 | die(); |
32 | 32 | } |
33 | 33 | |
34 | 34 | //pixlr return |
35 | 35 | |
36 | -$filename=Security::remove_XSS($_GET['title']);//The user preferred file name of the image. |
|
37 | -$extension=Security::remove_XSS($_GET['type']);//The image type, "pdx", "jpg", "bmp" or "png". |
|
38 | -$urlcontents=Security::remove_XSS($_GET['image']);//A URL to the image on Pixlr.com server or the raw file post of the saved image. |
|
36 | +$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image. |
|
37 | +$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png". |
|
38 | +$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image. |
|
39 | 39 | |
40 | 40 | //make variables |
41 | 41 | |
42 | -$title = Database::escape_string(str_replace('_',' ',$filename)); |
|
42 | +$title = Database::escape_string(str_replace('_', ' ', $filename)); |
|
43 | 43 | $current_session_id = api_get_session_id(); |
44 | -$groupId= api_get_group_id(); |
|
45 | -$relativeUrlPath=$_SESSION['paint_dir']; |
|
46 | -$currentTool=$_SESSION['whereami']; |
|
44 | +$groupId = api_get_group_id(); |
|
45 | +$relativeUrlPath = $_SESSION['paint_dir']; |
|
46 | +$currentTool = $_SESSION['whereami']; |
|
47 | 47 | $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
48 | -$saveDir=$dirBaseDocuments.$_SESSION['paint_dir']; |
|
48 | +$saveDir = $dirBaseDocuments.$_SESSION['paint_dir']; |
|
49 | 49 | |
50 | 50 | $contents = file_get_contents($urlcontents); |
51 | 51 | |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | $filename = api_replace_dangerous_char($filename); |
72 | 72 | $filename = disable_dangerous_file($filename); |
73 | 73 | |
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 |
|
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 | 76 | exit; |
77 | 77 | } |
78 | 78 | |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | // Extension security |
86 | -if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){ |
|
86 | +if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') { |
|
87 | 87 | die(); |
88 | 88 | } |
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 |
|
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 |
|
91 | 91 | exit; |
92 | 92 | } |
93 | 93 | |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | |
102 | 102 | //Verify that the file is an image. Fileinfo method |
103 | 103 | $finfo = new finfo(FILEINFO_MIME); |
104 | -$current_mime=$finfo->buffer($contents); |
|
104 | +$current_mime = $finfo->buffer($contents); |
|
105 | 105 | finfo_close($finfo); |
106 | -if(strpos($current_mime, 'image')===false) { |
|
106 | +if (strpos($current_mime, 'image') === false) { |
|
107 | 107 | echo "Invalid mime type file"; |
108 | 108 | exit; |
109 | 109 | } |
@@ -113,46 +113,46 @@ discard block |
||
113 | 113 | $paintFileName = $filename.'.'.$extension; |
114 | 114 | $title = $title.'.'.$extension; |
115 | 115 | |
116 | -if($currentTool=='document/createpaint'){ |
|
116 | +if ($currentTool == 'document/createpaint') { |
|
117 | 117 | //check save as and prevent rewrite an older file with same name |
118 | - if (0 != $groupId){ |
|
119 | - $group_properties = GroupManager :: get_group_properties($groupId); |
|
118 | + if (0 != $groupId) { |
|
119 | + $group_properties = GroupManager :: get_group_properties($groupId); |
|
120 | 120 | $groupPath = $group_properties['directory']; |
121 | 121 | } else { |
122 | - $groupPath =''; |
|
122 | + $groupPath = ''; |
|
123 | 123 | } |
124 | 124 | |
125 | - if (file_exists($saveDir.'/'.$filename.'.'.$extension)){ |
|
125 | + if (file_exists($saveDir.'/'.$filename.'.'.$extension)) { |
|
126 | 126 | $i = 1; |
127 | 127 | while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++; |
128 | - $paintFileName = $filename . '_' . $i . '.'.$extension; |
|
129 | - $title = $filename . '_' . $i . '.'.$extension; |
|
128 | + $paintFileName = $filename.'_'.$i.'.'.$extension; |
|
129 | + $title = $filename.'_'.$i.'.'.$extension; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | // |
133 | 133 | $documentPath = $saveDir.'/'.$paintFileName; |
134 | 134 | //add new document to disk |
135 | - file_put_contents( $documentPath, $contents ); |
|
135 | + file_put_contents($documentPath, $contents); |
|
136 | 136 | //add document to database |
137 | 137 | $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
138 | 138 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
139 | 139 | |
140 | -}elseif($currentTool=='document/editpaint'){ |
|
140 | +}elseif ($currentTool == 'document/editpaint') { |
|
141 | 141 | |
142 | 142 | $documentPath = $saveDir.'/'.$paintFileName; |
143 | 143 | //add new document to disk |
144 | - file_put_contents( $documentPath, $contents ); |
|
144 | + file_put_contents($documentPath, $contents); |
|
145 | 145 | |
146 | 146 | //check path |
147 | - if(!isset($_SESSION['paint_file'])){ |
|
147 | + if (!isset($_SESSION['paint_file'])) { |
|
148 | 148 | api_not_allowed(); |
149 | 149 | die(); |
150 | 150 | } |
151 | - if($_SESSION['paint_file']==$paintFileName){ |
|
151 | + if ($_SESSION['paint_file'] == $paintFileName) { |
|
152 | 152 | $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName); |
153 | 153 | update_existing_document($_course, $document_id, filesize($documentPath), null); |
154 | 154 | api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
155 | - }else{ |
|
155 | + } else { |
|
156 | 156 | //add a new document |
157 | 157 | $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
158 | 158 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | |
163 | 163 | //delete temporal file |
164 | -$temp_file_2delete=$_SESSION['temp_realpath_image']; |
|
164 | +$temp_file_2delete = $_SESSION['temp_realpath_image']; |
|
165 | 165 | unlink($temp_file_2delete); |
166 | 166 | |
167 | 167 | //Clean sessions and return to Chamilo file list |
@@ -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'; |
|
174 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
175 | 175 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
176 | 176 | api_not_allowed(true); |
177 | 177 | } else { |
178 | 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']); |
|
179 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
180 | 180 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
181 | 181 | unset($_SESSION['exit_pixlr']); |
182 | 182 | } |
@@ -124,7 +124,9 @@ discard block |
||
124 | 124 | |
125 | 125 | if (file_exists($saveDir.'/'.$filename.'.'.$extension)){ |
126 | 126 | $i = 1; |
127 | - while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++; |
|
127 | + while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) { |
|
128 | + $i++; |
|
129 | + } |
|
128 | 130 | $paintFileName = $filename . '_' . $i . '.'.$extension; |
129 | 131 | $title = $filename . '_' . $i . '.'.$extension; |
130 | 132 | } |
@@ -137,7 +139,7 @@ discard block |
||
137 | 139 | $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
138 | 140 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
139 | 141 | |
140 | -}elseif($currentTool=='document/editpaint'){ |
|
142 | +} elseif($currentTool=='document/editpaint'){ |
|
141 | 143 | |
142 | 144 | $documentPath = $saveDir.'/'.$paintFileName; |
143 | 145 | //add new document to disk |
@@ -152,7 +154,7 @@ discard block |
||
152 | 154 | $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName); |
153 | 155 | update_existing_document($_course, $document_id, filesize($documentPath), null); |
154 | 156 | api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
155 | - }else{ |
|
157 | + } else{ |
|
156 | 158 | //add a new document |
157 | 159 | $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); |
158 | 160 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
@@ -17,18 +17,18 @@ discard block |
||
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 | } |
@@ -561,8 +561,9 @@ |
||
561 | 561 | } |
562 | 562 | $dir= substr($dir,0,-1); |
563 | 563 | $selectcat = ''; |
564 | - if (isset($_REQUEST['selectcat'])) |
|
565 | - $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
564 | + if (isset($_REQUEST['selectcat'])) { |
|
565 | + $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
566 | + } |
|
566 | 567 | $certificate_condition = ''; |
567 | 568 | if ($is_certificate_mode) { |
568 | 569 | $df = DocumentManager::get_default_certificate_id($_course['code']); |
@@ -71,13 +71,13 @@ discard block |
||
71 | 71 | $is_certificate_mode = false; |
72 | 72 | |
73 | 73 | if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') { |
74 | - $is_certificate_mode = true; |
|
74 | + $is_certificate_mode = true; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | if ($is_certificate_mode) { |
78 | - $nameTools = get_lang('CreateCertificate'); |
|
78 | + $nameTools = get_lang('CreateCertificate'); |
|
79 | 79 | } else { |
80 | - $nameTools = get_lang('CreateDocument'); |
|
80 | + $nameTools = get_lang('CreateDocument'); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /* Constants and variables */ |
@@ -130,26 +130,26 @@ discard block |
||
130 | 130 | |
131 | 131 | // Please, do not modify this dirname formatting |
132 | 132 | if (strstr($dir, '..')) { |
133 | - $dir = '/'; |
|
133 | + $dir = '/'; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | if ($dir[0] == '.') { |
137 | - $dir = substr($dir, 1); |
|
137 | + $dir = substr($dir, 1); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | if ($dir[0] != '/') { |
141 | - $dir = '/'.$dir; |
|
141 | + $dir = '/'.$dir; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | if ($dir[strlen($dir) - 1] != '/') { |
145 | - $dir .= '/'; |
|
145 | + $dir .= '/'; |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | if ($is_certificate_mode) { |
149 | - $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
150 | - $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
151 | - $folder_id = $document_data['id']; |
|
152 | - $dir = '/certificates/'; |
|
149 | + $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
150 | + $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
151 | + $folder_id = $document_data['id']; |
|
152 | + $dir = '/certificates/'; |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | $doc_tree = explode('/', $dir); |
@@ -160,16 +160,16 @@ discard block |
||
160 | 160 | |
161 | 161 | // Level correction for group documents. |
162 | 162 | if (!empty($group_properties['directory'])) { |
163 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
163 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | $relative_url = ''; |
167 | 167 | for ($i = 0; $i < ($count_dir); $i++) { |
168 | - $relative_url .= '../'; |
|
168 | + $relative_url .= '../'; |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | if ($relative_url== '') { |
172 | - $relative_url = '/'; |
|
172 | + $relative_url = '/'; |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
@@ -181,11 +181,11 @@ discard block |
||
181 | 181 | 'cols-size' => [2, 10, 0], |
182 | 182 | 'FullPage' => true, |
183 | 183 | 'InDocument' => true, |
184 | - 'CreateDocumentDir' => $relative_url, |
|
185 | - 'CreateDocumentWebDir' => (empty($group_properties['directory'])) |
|
186 | - ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/' |
|
187 | - : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/', |
|
188 | - 'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir |
|
184 | + 'CreateDocumentDir' => $relative_url, |
|
185 | + 'CreateDocumentWebDir' => (empty($group_properties['directory'])) |
|
186 | + ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/' |
|
187 | + : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/', |
|
188 | + 'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir |
|
189 | 189 | ); |
190 | 190 | |
191 | 191 | if ($is_certificate_mode) { |
@@ -197,36 +197,36 @@ discard block |
||
197 | 197 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
198 | 198 | |
199 | 199 | if (!is_dir($filepath)) { |
200 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
201 | - $dir = '/'; |
|
200 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
201 | + $dir = '/'; |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | $to_group_id = 0; |
205 | 205 | |
206 | 206 | if (!$is_certificate_mode) { |
207 | - if (api_is_in_group()) { |
|
208 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
209 | - $noPHP_SELF = true; |
|
210 | - $to_group_id = api_get_group_id(); |
|
211 | - $path = explode('/', $dir); |
|
212 | - if ('/'.$path[1] != $group_properties['directory']) { |
|
213 | - api_not_allowed(true); |
|
214 | - } |
|
215 | - } |
|
216 | - $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
207 | + if (api_is_in_group()) { |
|
208 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
209 | + $noPHP_SELF = true; |
|
210 | + $to_group_id = api_get_group_id(); |
|
211 | + $path = explode('/', $dir); |
|
212 | + if ('/'.$path[1] != $group_properties['directory']) { |
|
213 | + api_not_allowed(true); |
|
214 | + } |
|
215 | + } |
|
216 | + $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
|
217 | 217 | } else { |
218 | - $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
218 | + $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | if (!$is_allowed_in_course) { |
222 | - api_not_allowed(true); |
|
222 | + api_not_allowed(true); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | if (!($is_allowed_to_edit || |
226 | 226 | $groupRights || |
227 | 227 | DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id())) |
228 | 228 | ) { |
229 | - api_not_allowed(true); |
|
229 | + api_not_allowed(true); |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | /* Header */ |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | |
235 | 235 | $display_dir = $dir; |
236 | 236 | if (isset($group_properties)) { |
237 | - $display_dir = explode('/', $dir); |
|
238 | - unset($display_dir[0]); |
|
239 | - unset($display_dir[1]); |
|
240 | - $display_dir = implode('/', $display_dir); |
|
237 | + $display_dir = explode('/', $dir); |
|
238 | + unset($display_dir[0]); |
|
239 | + unset($display_dir[1]); |
|
240 | + $display_dir = implode('/', $display_dir); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null; |
@@ -254,9 +254,9 @@ discard block |
||
254 | 254 | $form->addElement('header', $nameTools); |
255 | 255 | |
256 | 256 | if ($is_certificate_mode) {//added condition for certicate in gradebook |
257 | - $form->addElement('hidden','certificate','true',array('id'=>'certificate')); |
|
258 | - if (isset($_GET['selectcat'])) { |
|
259 | - $form->addElement('hidden','selectcat', $select_cat); |
|
257 | + $form->addElement('hidden','certificate','true',array('id'=>'certificate')); |
|
258 | + if (isset($_GET['selectcat'])) { |
|
259 | + $form->addElement('hidden','selectcat', $select_cat); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
@@ -291,12 +291,12 @@ discard block |
||
291 | 291 | if ($is_certificate_mode) { |
292 | 292 | $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
293 | 293 | } else { |
294 | - $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
|
294 | + $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | // Show read-only box only in groups |
298 | 298 | if (!empty($groupId)) { |
299 | - $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
299 | + $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
300 | 300 | } |
301 | 301 | $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); |
302 | 302 | $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists'); |
@@ -311,14 +311,14 @@ discard block |
||
311 | 311 | // new document created |
312 | 312 | |
313 | 313 | if (!$is_certificate_mode && |
314 | - !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id) |
|
314 | + !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id) |
|
315 | 315 | ) { |
316 | - $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
|
316 | + $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
|
317 | 317 | |
318 | - //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory'))); |
|
318 | + //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory'))); |
|
319 | 319 | $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) ); |
320 | - // Following two conditions copied from document.inc.php::build_directory_selector() |
|
321 | - $folder_titles = array(); |
|
320 | + // Following two conditions copied from document.inc.php::build_directory_selector() |
|
321 | + $folder_titles = array(); |
|
322 | 322 | |
323 | 323 | if (is_array($folders)) { |
324 | 324 | $escaped_folders = array(); |
@@ -356,22 +356,22 @@ discard block |
||
356 | 356 | } |
357 | 357 | } |
358 | 358 | |
359 | - if (empty($group_dir)) { |
|
360 | - $parent_select -> addOption(get_lang('HomeDirectory'), '/'); |
|
361 | - if (is_array($folders)) { |
|
362 | - foreach ($folders as & $folder) { |
|
363 | - //Hide some folders |
|
364 | - if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { |
|
359 | + if (empty($group_dir)) { |
|
360 | + $parent_select -> addOption(get_lang('HomeDirectory'), '/'); |
|
361 | + if (is_array($folders)) { |
|
362 | + foreach ($folders as & $folder) { |
|
363 | + //Hide some folders |
|
364 | + if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { |
|
365 | 365 | continue; |
366 | - } |
|
367 | - //Admin setting for Hide/Show the folders of all users |
|
368 | - if (api_get_setting('show_users_folders') == 'false' && |
|
366 | + } |
|
367 | + //Admin setting for Hide/Show the folders of all users |
|
368 | + if (api_get_setting('show_users_folders') == 'false' && |
|
369 | 369 | (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_')) |
370 | 370 | ){ |
371 | - continue; |
|
372 | - } |
|
373 | - //Admin setting for Hide/Show Default folders to all users |
|
374 | - if (api_get_setting('show_default_folders') == 'false' && |
|
371 | + continue; |
|
372 | + } |
|
373 | + //Admin setting for Hide/Show Default folders to all users |
|
374 | + if (api_get_setting('show_default_folders') == 'false' && |
|
375 | 375 | ( |
376 | 376 | $folder == '/images' || |
377 | 377 | $folder == '/flash' || |
@@ -381,82 +381,82 @@ discard block |
||
381 | 381 | $folder == '/video/flv' |
382 | 382 | ) |
383 | 383 | ){ |
384 | - continue; |
|
385 | - } |
|
386 | - //Admin setting for Hide/Show chat history folder |
|
387 | - if (api_get_setting('show_chat_folder') == 'false' && |
|
384 | + continue; |
|
385 | + } |
|
386 | + //Admin setting for Hide/Show chat history folder |
|
387 | + if (api_get_setting('show_chat_folder') == 'false' && |
|
388 | 388 | $folder=='/chat_files' |
389 | 389 | ){ |
390 | - continue; |
|
391 | - } |
|
390 | + continue; |
|
391 | + } |
|
392 | 392 | |
393 | - $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; |
|
394 | - $path_parts = explode('/', $folder); |
|
395 | - $folder_titles[$folder] = cut($folder_titles[$folder], 80); |
|
393 | + $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; |
|
394 | + $path_parts = explode('/', $folder); |
|
395 | + $folder_titles[$folder] = cut($folder_titles[$folder], 80); |
|
396 | 396 | $space_counter =count($path_parts) - 2; |
397 | 397 | if ($space_counter > 0) { |
398 | 398 | $label = str_repeat(' ', $space_counter).' — '.$folder_titles[$folder]; |
399 | 399 | } else { |
400 | 400 | $label = ' — '.$folder_titles[$folder]; |
401 | 401 | } |
402 | - $parent_select -> addOption($label, $folder); |
|
403 | - if ($selected != '') { |
|
404 | - $parent_select->setSelected($folder); |
|
405 | - } |
|
406 | - } |
|
407 | - } |
|
408 | - } else { |
|
409 | - if (is_array($folders) && !empty($folders)) { |
|
410 | - foreach ($folders as & $folder) { |
|
411 | - $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; |
|
412 | - $label = $folder_titles[$folder]; |
|
413 | - if ($folder == $group_dir) { |
|
414 | - $label = '/ (' . get_lang('HomeDirectory') . ')'; |
|
415 | - } else { |
|
416 | - $path_parts = explode('/', str_replace($group_dir, '', $folder)); |
|
417 | - $label = cut($label, 80); |
|
418 | - $label = str_repeat(' ', count($path_parts) - 2) . ' — ' . $label; |
|
419 | - } |
|
420 | - $parent_select->addOption($label, $folder); |
|
421 | - if ($selected != '') { |
|
422 | - $parent_select->setSelected($folder); |
|
423 | - } |
|
424 | - } |
|
425 | - } |
|
426 | - } |
|
402 | + $parent_select -> addOption($label, $folder); |
|
403 | + if ($selected != '') { |
|
404 | + $parent_select->setSelected($folder); |
|
405 | + } |
|
406 | + } |
|
407 | + } |
|
408 | + } else { |
|
409 | + if (is_array($folders) && !empty($folders)) { |
|
410 | + foreach ($folders as & $folder) { |
|
411 | + $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; |
|
412 | + $label = $folder_titles[$folder]; |
|
413 | + if ($folder == $group_dir) { |
|
414 | + $label = '/ (' . get_lang('HomeDirectory') . ')'; |
|
415 | + } else { |
|
416 | + $path_parts = explode('/', str_replace($group_dir, '', $folder)); |
|
417 | + $label = cut($label, 80); |
|
418 | + $label = str_repeat(' ', count($path_parts) - 2) . ' — ' . $label; |
|
419 | + } |
|
420 | + $parent_select->addOption($label, $folder); |
|
421 | + if ($selected != '') { |
|
422 | + $parent_select->setSelected($folder); |
|
423 | + } |
|
424 | + } |
|
425 | + } |
|
426 | + } |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | $form->addHidden('dirValue', ''); |
430 | 430 | |
431 | 431 | if ($is_certificate_mode) { |
432 | - $form->addButtonCreate(get_lang('CreateCertificate')); |
|
432 | + $form->addButtonCreate(get_lang('CreateCertificate')); |
|
433 | 433 | } else { |
434 | - $form->addButtonCreate(get_lang('CreateDoc')); |
|
434 | + $form->addButtonCreate(get_lang('CreateDoc')); |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | $form->setDefaults($defaults); |
438 | 438 | |
439 | 439 | // If form validates -> save the new document |
440 | 440 | if ($form->validate()) { |
441 | - $values = $form->exportValues(); |
|
442 | - $readonly = isset($values['readonly']) ? 1 : 0; |
|
443 | - $values['title'] = trim($values['title']); |
|
441 | + $values = $form->exportValues(); |
|
442 | + $readonly = isset($values['readonly']) ? 1 : 0; |
|
443 | + $values['title'] = trim($values['title']); |
|
444 | 444 | |
445 | 445 | if (!empty($values['dirValue'])) { |
446 | 446 | $dir = $values['dirValue']; |
447 | 447 | } |
448 | 448 | |
449 | 449 | if ($dir[strlen($dir) - 1] != '/') { |
450 | - $dir .= '/'; |
|
451 | - } |
|
450 | + $dir .= '/'; |
|
451 | + } |
|
452 | 452 | $filepath = $filepath.$dir; |
453 | 453 | |
454 | 454 | // Setting the filename |
455 | - $filename = $values['title']; |
|
456 | - $filename = addslashes(trim($filename)); |
|
457 | - $filename = Security::remove_XSS($filename); |
|
458 | - $filename = api_replace_dangerous_char($filename); |
|
459 | - $filename = disable_dangerous_file($filename); |
|
455 | + $filename = $values['title']; |
|
456 | + $filename = addslashes(trim($filename)); |
|
457 | + $filename = Security::remove_XSS($filename); |
|
458 | + $filename = api_replace_dangerous_char($filename); |
|
459 | + $filename = disable_dangerous_file($filename); |
|
460 | 460 | $filename .= DocumentManager::getDocumentSuffix( |
461 | 461 | $_course, |
462 | 462 | api_get_session_id(), |
@@ -464,14 +464,14 @@ discard block |
||
464 | 464 | ); |
465 | 465 | |
466 | 466 | // Setting the title |
467 | - $title = $values['title']; |
|
467 | + $title = $values['title']; |
|
468 | 468 | |
469 | 469 | // Setting the extension |
470 | - $extension = 'html'; |
|
470 | + $extension = 'html'; |
|
471 | 471 | |
472 | - $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY); |
|
472 | + $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY); |
|
473 | 473 | |
474 | - /*if (strpos($content, '/css/frames.css') == false) { |
|
474 | + /*if (strpos($content, '/css/frames.css') == false) { |
|
475 | 475 | $content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content); |
476 | 476 | }*/ |
477 | 477 | |
@@ -484,13 +484,13 @@ discard block |
||
484 | 484 | exit; |
485 | 485 | } |
486 | 486 | |
487 | - if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) { |
|
488 | - //$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content); |
|
489 | - $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content); |
|
487 | + if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) { |
|
488 | + //$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content); |
|
489 | + $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content); |
|
490 | 490 | |
491 | - fputs($fp, $content); |
|
492 | - fclose($fp); |
|
493 | - chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files()); |
|
491 | + fputs($fp, $content); |
|
492 | + fclose($fp); |
|
493 | + chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files()); |
|
494 | 494 | |
495 | 495 | /* |
496 | 496 | if (!is_dir($filepath.'css')) { |
@@ -508,8 +508,8 @@ discard block |
||
508 | 508 | api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id); |
509 | 509 | }*/ |
510 | 510 | |
511 | - $file_size = filesize($filepath.$filename.'.'.$extension); |
|
512 | - $save_file_path = $dir.$filename.'.'.$extension; |
|
511 | + $file_size = filesize($filepath.$filename.'.'.$extension); |
|
512 | + $save_file_path = $dir.$filename.'.'.$extension; |
|
513 | 513 | |
514 | 514 | $document_id = add_document( |
515 | 515 | $_course, |
@@ -521,8 +521,8 @@ discard block |
||
521 | 521 | $readonly |
522 | 522 | ); |
523 | 523 | |
524 | - if ($document_id) { |
|
525 | - api_item_property_update( |
|
524 | + if ($document_id) { |
|
525 | + api_item_property_update( |
|
526 | 526 | $_course, |
527 | 527 | TOOL_DOCUMENT, |
528 | 528 | $document_id, |
@@ -534,13 +534,13 @@ discard block |
||
534 | 534 | null, |
535 | 535 | $current_session_id |
536 | 536 | ); |
537 | - // Update parent folders |
|
538 | - item_property_update_on_folder($_course, $dir, $userId); |
|
539 | - $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : ''; |
|
540 | - $new_title = isset($_POST['title']) ? trim($_POST['title']) : ''; |
|
537 | + // Update parent folders |
|
538 | + item_property_update_on_folder($_course, $dir, $userId); |
|
539 | + $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : ''; |
|
540 | + $new_title = isset($_POST['title']) ? trim($_POST['title']) : ''; |
|
541 | 541 | $new_title = htmlspecialchars($new_title); |
542 | - if ($new_comment || $new_title) { |
|
543 | - $ct = ''; |
|
542 | + if ($new_comment || $new_title) { |
|
543 | + $ct = ''; |
|
544 | 544 | $params = []; |
545 | 545 | if ($new_comment) { |
546 | 546 | $params['comment'] = $new_comment; |
@@ -555,38 +555,38 @@ discard block |
||
555 | 555 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
556 | 556 | ); |
557 | 557 | } |
558 | - } |
|
559 | - $dir= substr($dir,0,-1); |
|
560 | - $selectcat = ''; |
|
561 | - if (isset($_REQUEST['selectcat'])) |
|
562 | - $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
563 | - $certificate_condition = ''; |
|
564 | - if ($is_certificate_mode) { |
|
565 | - $df = DocumentManager::get_default_certificate_id($_course['code']); |
|
558 | + } |
|
559 | + $dir= substr($dir,0,-1); |
|
560 | + $selectcat = ''; |
|
561 | + if (isset($_REQUEST['selectcat'])) |
|
562 | + $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
|
563 | + $certificate_condition = ''; |
|
564 | + if ($is_certificate_mode) { |
|
565 | + $df = DocumentManager::get_default_certificate_id($_course['code']); |
|
566 | 566 | if (!isset($df)) { |
567 | 567 | DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id); |
568 | - } |
|
569 | - $certificate_condition = '&certificate=true&curdirpath=/certificates'; |
|
570 | - } |
|
571 | - |
|
572 | - header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition); |
|
573 | - exit(); |
|
574 | - } else { |
|
575 | - Display :: display_header($nameTools, 'Doc'); |
|
576 | - Display :: display_error_message(get_lang('Impossible')); |
|
577 | - Display :: display_footer(); |
|
578 | - } |
|
579 | - } else { |
|
580 | - Display :: display_header($nameTools, 'Doc'); |
|
581 | - Display :: display_error_message(get_lang('Impossible')); |
|
582 | - Display :: display_footer(); |
|
583 | - } |
|
568 | + } |
|
569 | + $certificate_condition = '&certificate=true&curdirpath=/certificates'; |
|
570 | + } |
|
571 | + |
|
572 | + header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition); |
|
573 | + exit(); |
|
574 | + } else { |
|
575 | + Display :: display_header($nameTools, 'Doc'); |
|
576 | + Display :: display_error_message(get_lang('Impossible')); |
|
577 | + Display :: display_footer(); |
|
578 | + } |
|
579 | + } else { |
|
580 | + Display :: display_header($nameTools, 'Doc'); |
|
581 | + Display :: display_error_message(get_lang('Impossible')); |
|
582 | + Display :: display_footer(); |
|
583 | + } |
|
584 | 584 | } else { |
585 | - // Copied from document.php |
|
586 | - $dir_array = explode('/', $dir); |
|
587 | - $array_len = count($dir_array); |
|
585 | + // Copied from document.php |
|
586 | + $dir_array = explode('/', $dir); |
|
587 | + $array_len = count($dir_array); |
|
588 | 588 | |
589 | - // Breadcrumb for the current directory root path |
|
589 | + // Breadcrumb for the current directory root path |
|
590 | 590 | if (!empty($document_data)) { |
591 | 591 | if (empty($document_data['parents'])) { |
592 | 592 | $interbreadcrumb[] = array( |
@@ -603,11 +603,11 @@ discard block |
||
603 | 603 | } |
604 | 604 | } |
605 | 605 | |
606 | - Display :: display_header($nameTools, "Doc"); |
|
607 | - // actions |
|
606 | + Display :: display_header($nameTools, "Doc"); |
|
607 | + // actions |
|
608 | 608 | |
609 | - // link back to the documents overview |
|
610 | - if ($is_certificate_mode) { |
|
609 | + // link back to the documents overview |
|
610 | + if ($is_certificate_mode) { |
|
611 | 611 | $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
612 | 612 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
613 | 613 | $actionsLeft .= '<a id="hide_bar_template" href="#">'. |
@@ -622,19 +622,19 @@ discard block |
||
622 | 622 | |
623 | 623 | echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft)); |
624 | 624 | |
625 | - if ($is_certificate_mode) { |
|
625 | + if ($is_certificate_mode) { |
|
626 | 626 | $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
627 | 627 | api_get_user_id(), |
628 | 628 | api_get_course_id() |
629 | 629 | ); |
630 | 630 | |
631 | - $str_info = ''; |
|
632 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
633 | - $str_info.=$info_value.'<br/>'; |
|
634 | - } |
|
635 | - $create_certificate = get_lang('CreateCertificateWithTags'); |
|
636 | - Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); |
|
637 | - } |
|
631 | + $str_info = ''; |
|
632 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
633 | + $str_info.=$info_value.'<br/>'; |
|
634 | + } |
|
635 | + $create_certificate = get_lang('CreateCertificateWithTags'); |
|
636 | + Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); |
|
637 | + } |
|
638 | 638 | |
639 | 639 | // HTML-editor |
640 | 640 | echo '<div class="page-create"> |
@@ -650,5 +650,5 @@ discard block |
||
650 | 650 | '.$form->returnForm().' |
651 | 651 | </div> |
652 | 652 | </div></div>'; |
653 | - Display :: display_footer(); |
|
653 | + Display :: display_footer(); |
|
654 | 654 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $.ajax({ |
50 | 50 | contentType: "application/x-www-form-urlencoded", |
51 | 51 | data: "dirValue="+dirValue, |
52 | - url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=document_destination", |
|
52 | + url: "' . api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_destination", |
|
53 | 53 | type: "POST", |
54 | 54 | success: function(response) { |
55 | 55 | $("[name=\'dirValue\']").val(response) |
@@ -146,14 +146,14 @@ discard block |
||
146 | 146 | } |
147 | 147 | |
148 | 148 | if ($is_certificate_mode) { |
149 | - $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
150 | - $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
149 | + $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates'); |
|
150 | + $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); |
|
151 | 151 | $folder_id = $document_data['id']; |
152 | 152 | $dir = '/certificates/'; |
153 | 153 | } |
154 | 154 | |
155 | 155 | $doc_tree = explode('/', $dir); |
156 | -$count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/" |
|
156 | +$count_dir = count($doc_tree) - 2; // "2" because at the begin and end there are 2 "/" |
|
157 | 157 | |
158 | 158 | if (api_is_in_group()) { |
159 | 159 | $group_properties = GroupManager::get_group_properties(api_get_group_id()); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $relative_url .= '../'; |
169 | 169 | } |
170 | 170 | |
171 | -if ($relative_url== '') { |
|
171 | +if ($relative_url == '') { |
|
172 | 172 | $relative_url = '/'; |
173 | 173 | } |
174 | 174 | |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | if (!$is_certificate_mode) { |
207 | 207 | if (api_is_in_group()) { |
208 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
208 | + $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
209 | 209 | $noPHP_SELF = true; |
210 | 210 | $to_group_id = api_get_group_id(); |
211 | 211 | $path = explode('/', $dir); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | } |
216 | 216 | $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents')); |
217 | 217 | } else { |
218 | - $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
218 | + $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | if (!$is_allowed_in_course) { |
@@ -254,9 +254,9 @@ discard block |
||
254 | 254 | $form->addElement('header', $nameTools); |
255 | 255 | |
256 | 256 | if ($is_certificate_mode) {//added condition for certicate in gradebook |
257 | - $form->addElement('hidden','certificate','true',array('id'=>'certificate')); |
|
257 | + $form->addElement('hidden', 'certificate', 'true', array('id'=>'certificate')); |
|
258 | 258 | if (isset($_GET['selectcat'])) { |
259 | - $form->addElement('hidden','selectcat', $select_cat); |
|
259 | + $form->addElement('hidden', 'selectcat', $select_cat); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
@@ -296,13 +296,13 @@ discard block |
||
296 | 296 | |
297 | 297 | // Show read-only box only in groups |
298 | 298 | if (!empty($groupId)) { |
299 | - $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
299 | + $group[] = $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); |
|
300 | 300 | } |
301 | 301 | $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); |
302 | 302 | $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists'); |
303 | 303 | |
304 | 304 | $current_session_id = api_get_session_id(); |
305 | -$form->addHtmlEditor('content','', true, true, $editorConfig, true); |
|
305 | +$form->addHtmlEditor('content', '', true, true, $editorConfig, true); |
|
306 | 306 | |
307 | 307 | // Comment-field |
308 | 308 | $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); |
317 | 317 | |
318 | 318 | //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory'))); |
319 | - $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) ); |
|
319 | + $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'), null, array('cols-size' => [2, 10, 0])); |
|
320 | 320 | // Following two conditions copied from document.inc.php::build_directory_selector() |
321 | 321 | $folder_titles = array(); |
322 | 322 | |
@@ -324,19 +324,19 @@ discard block |
||
324 | 324 | $escaped_folders = array(); |
325 | 325 | foreach ($folders as $key => & $val) { |
326 | 326 | // Hide some folders |
327 | - if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){ |
|
327 | + if ($val == '/HotPotatoes_files' || $val == '/certificates' || basename($val) == 'css') { |
|
328 | 328 | continue; |
329 | 329 | } |
330 | 330 | // Admin setting for Hide/Show the folders of all users |
331 | - if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){ |
|
331 | + if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))) { |
|
332 | 332 | continue; |
333 | 333 | } |
334 | 334 | // Admin setting for Hide/Show Default folders to all users |
335 | - if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){ |
|
335 | + if (api_get_setting('show_default_folders') == 'false' && ($val == '/images' || $val == '/flash' || $val == '/audio' || $val == '/video' || strstr($val, '/images/gallery') || $val == '/video/flv')) { |
|
336 | 336 | continue; |
337 | 337 | } |
338 | 338 | // Admin setting for Hide/Show chat history folder |
339 | - if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){ |
|
339 | + if (api_get_setting('show_chat_folder') == 'false' && $val == '/chat_files') { |
|
340 | 340 | continue; |
341 | 341 | } |
342 | 342 | |
@@ -361,13 +361,13 @@ discard block |
||
361 | 361 | if (is_array($folders)) { |
362 | 362 | foreach ($folders as & $folder) { |
363 | 363 | //Hide some folders |
364 | - if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { |
|
364 | + if ($folder == '/HotPotatoes_files' || $folder == '/certificates' || basename($folder) == 'css') { |
|
365 | 365 | continue; |
366 | 366 | } |
367 | 367 | //Admin setting for Hide/Show the folders of all users |
368 | 368 | if (api_get_setting('show_users_folders') == 'false' && |
369 | 369 | (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_')) |
370 | - ){ |
|
370 | + ) { |
|
371 | 371 | continue; |
372 | 372 | } |
373 | 373 | //Admin setting for Hide/Show Default folders to all users |
@@ -380,20 +380,20 @@ discard block |
||
380 | 380 | strstr($folder, '/images/gallery') || |
381 | 381 | $folder == '/video/flv' |
382 | 382 | ) |
383 | - ){ |
|
383 | + ) { |
|
384 | 384 | continue; |
385 | 385 | } |
386 | 386 | //Admin setting for Hide/Show chat history folder |
387 | 387 | if (api_get_setting('show_chat_folder') == 'false' && |
388 | - $folder=='/chat_files' |
|
389 | - ){ |
|
388 | + $folder == '/chat_files' |
|
389 | + ) { |
|
390 | 390 | continue; |
391 | 391 | } |
392 | 392 | |
393 | - $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; |
|
393 | + $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; |
|
394 | 394 | $path_parts = explode('/', $folder); |
395 | 395 | $folder_titles[$folder] = cut($folder_titles[$folder], 80); |
396 | - $space_counter =count($path_parts) - 2; |
|
396 | + $space_counter = count($path_parts) - 2; |
|
397 | 397 | if ($space_counter > 0) { |
398 | 398 | $label = str_repeat(' ', $space_counter).' — '.$folder_titles[$folder]; |
399 | 399 | } else { |
@@ -411,11 +411,11 @@ discard block |
||
411 | 411 | $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; |
412 | 412 | $label = $folder_titles[$folder]; |
413 | 413 | if ($folder == $group_dir) { |
414 | - $label = '/ (' . get_lang('HomeDirectory') . ')'; |
|
414 | + $label = '/ ('.get_lang('HomeDirectory').')'; |
|
415 | 415 | } else { |
416 | 416 | $path_parts = explode('/', str_replace($group_dir, '', $folder)); |
417 | 417 | $label = cut($label, 80); |
418 | - $label = str_repeat(' ', count($path_parts) - 2) . ' — ' . $label; |
|
418 | + $label = str_repeat(' ', count($path_parts) - 2).' — '.$label; |
|
419 | 419 | } |
420 | 420 | $parent_select->addOption($label, $folder); |
421 | 421 | if ($selected != '') { |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | ); |
557 | 557 | } |
558 | 558 | } |
559 | - $dir= substr($dir,0,-1); |
|
559 | + $dir = substr($dir, 0, -1); |
|
560 | 560 | $selectcat = ''; |
561 | 561 | if (isset($_REQUEST['selectcat'])) |
562 | 562 | $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']); |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | if ($is_certificate_mode) { |
565 | 565 | $df = DocumentManager::get_default_certificate_id($_course['code']); |
566 | 566 | if (!isset($df)) { |
567 | - DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id); |
|
567 | + DocumentManager::attach_gradebook_certificate($_course['code'], $document_id); |
|
568 | 568 | } |
569 | 569 | $certificate_condition = '&certificate=true&curdirpath=/certificates'; |
570 | 570 | } |
@@ -608,16 +608,16 @@ discard block |
||
608 | 608 | |
609 | 609 | // link back to the documents overview |
610 | 610 | if ($is_certificate_mode) { |
611 | - $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
612 | - Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
611 | + $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'. |
|
612 | + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
613 | 613 | $actionsLeft .= '<a id="hide_bar_template" href="#">'. |
614 | - Display::return_icon('expand.png',get_lang('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; |
|
614 | + Display::return_icon('expand.png', get_lang('Back'), array('id'=>'expand'), ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Back'), array('id'=>'contract', 'class'=>'hide'), ICON_SIZE_MEDIUM).'</a>'; |
|
615 | 615 | } else { |
616 | 616 | $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'. |
617 | - Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
617 | + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
618 | 618 | $actionsLeft .= '<a id="hide_bar_template" href="#">'. |
619 | - Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM). |
|
620 | - Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; |
|
619 | + Display::return_icon('expand.png', get_lang('Expand'), array('id'=>'expand'), ICON_SIZE_MEDIUM). |
|
620 | + Display::return_icon('contract.png', get_lang('Collapse'), array('id'=>'contract', 'class'=>'hide'), ICON_SIZE_MEDIUM).'</a>'; |
|
621 | 621 | } |
622 | 622 | |
623 | 623 | echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft)); |
@@ -630,10 +630,10 @@ discard block |
||
630 | 630 | |
631 | 631 | $str_info = ''; |
632 | 632 | foreach ($all_information_by_create_certificate[0] as $info_value) { |
633 | - $str_info.=$info_value.'<br/>'; |
|
633 | + $str_info .= $info_value.'<br/>'; |
|
634 | 634 | } |
635 | 635 | $create_certificate = get_lang('CreateCertificateWithTags'); |
636 | - Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); |
|
636 | + Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info, false); |
|
637 | 637 | } |
638 | 638 | |
639 | 639 | // HTML-editor |
@@ -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> |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array |
40 | 40 | $url = 'slideshowoptions.php?curdirpath='.$pathurl; |
41 | 41 | $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>'; |
42 | -$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname ); |
|
42 | +$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname); |
|
43 | 43 | |
44 | 44 | Display::display_header($originalToolName, 'Doc'); |
45 | 45 | $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null; |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | </script> |
64 | 64 | |
65 | 65 | <?php |
66 | -$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
67 | -$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
66 | +$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
67 | +$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
68 | 68 | Display::toolbarAction('toolbar-slideshow', $content) |
69 | 69 | ?> |
70 | 70 | <div class="panel panel-default"> |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | } |
80 | 80 | ?>> |
81 | 81 | </label> |
82 | - <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?> |
|
82 | + <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?> |
|
83 | 83 | </div> |
84 | 84 | <div class="radio"> |
85 | 85 | <label> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | ?>> |
91 | 91 | </label> |
92 | - <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?> |
|
92 | + <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?> |
|
93 | 93 | </div> |
94 | 94 | <div class="radio"> |
95 | 95 | <label> |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | ?>> |
103 | 103 | </label> |
104 | - <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?> |
|
104 | + <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?> |
|
105 | 105 | </div> |
106 | 106 | <div class="form-group"> |
107 | 107 | <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label> |
@@ -24,12 +24,12 @@ |
||
24 | 24 | unset($_SESSION['temp_realpath_image']); |
25 | 25 | |
26 | 26 | if (!isset($_SESSION['exit_pixlr'])){ |
27 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | - api_not_allowed(true); |
|
27 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | + api_not_allowed(true); |
|
30 | 30 | } else { |
31 | - 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>'; |
|
32 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | - unset($_SESSION['exit_pixlr']); |
|
31 | + 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>'; |
|
32 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | + unset($_SESSION['exit_pixlr']); |
|
35 | 35 | } |
@@ -23,13 +23,13 @@ |
||
23 | 23 | unset($_SESSION['whereami']); |
24 | 24 | unset($_SESSION['temp_realpath_image']); |
25 | 25 | |
26 | -if (!isset($_SESSION['exit_pixlr'])){ |
|
27 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
26 | +if (!isset($_SESSION['exit_pixlr'])) { |
|
27 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | 28 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
29 | 29 | api_not_allowed(true); |
30 | 30 | } else { |
31 | 31 | 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>'; |
32 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
32 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | 33 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
34 | 34 | unset($_SESSION['exit_pixlr']); |
35 | 35 | } |