@@ -8,13 +8,13 @@ discard block |
||
8 | 8 | $s = WSCMSoapServer::singleton(); |
9 | 9 | |
10 | 10 | $s->register( |
11 | - 'WSCMUser.find_id_user', |
|
12 | - array( |
|
13 | - 'username' => 'xsd:string', |
|
14 | - 'password' => 'xsd:string', |
|
11 | + 'WSCMUser.find_id_user', |
|
12 | + array( |
|
13 | + 'username' => 'xsd:string', |
|
14 | + 'password' => 'xsd:string', |
|
15 | 15 | 'name' => 'xsd:string', |
16 | - ), |
|
17 | - array('return' => 'xsd:string'), |
|
16 | + ), |
|
17 | + array('return' => 'xsd:string'), |
|
18 | 18 | 'urn:WSCMService', |
19 | 19 | '', |
20 | 20 | '', |
@@ -23,14 +23,14 @@ discard block |
||
23 | 23 | ); |
24 | 24 | |
25 | 25 | $s->register( |
26 | - 'WSCMUser.get_user_name', |
|
27 | - array( |
|
28 | - 'username' => 'xsd:string', |
|
29 | - 'password' => 'xsd:string', |
|
26 | + 'WSCMUser.get_user_name', |
|
27 | + array( |
|
28 | + 'username' => 'xsd:string', |
|
29 | + 'password' => 'xsd:string', |
|
30 | 30 | 'id' => 'xsd:string', |
31 | 31 | 'field' => 'xsd:string' |
32 | - ), |
|
33 | - array('return' => 'xsd:string'), |
|
32 | + ), |
|
33 | + array('return' => 'xsd:string'), |
|
34 | 34 | 'urn:WSCMService', |
35 | 35 | '', |
36 | 36 | '', |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | ); |
40 | 40 | |
41 | 41 | $s->register( |
42 | - 'WSCMUser.get_link_user_picture', |
|
43 | - array( |
|
44 | - 'username' => 'xsd:string', |
|
45 | - 'password' => 'xsd:string', |
|
42 | + 'WSCMUser.get_link_user_picture', |
|
43 | + array( |
|
44 | + 'username' => 'xsd:string', |
|
45 | + 'password' => 'xsd:string', |
|
46 | 46 | 'id' => 'xsd:string' |
47 | - ), |
|
48 | - array('return' => 'xsd:string'), |
|
47 | + ), |
|
48 | + array('return' => 'xsd:string'), |
|
49 | 49 | 'urn:WSCMService', |
50 | 50 | '', |
51 | 51 | '', |
@@ -54,14 +54,14 @@ discard block |
||
54 | 54 | ); |
55 | 55 | |
56 | 56 | $s->register( |
57 | - 'WSCMUser.send_invitation', |
|
58 | - array( |
|
59 | - 'username' => 'xsd:string', |
|
60 | - 'password' => 'xsd:string', |
|
57 | + 'WSCMUser.send_invitation', |
|
58 | + array( |
|
59 | + 'username' => 'xsd:string', |
|
60 | + 'password' => 'xsd:string', |
|
61 | 61 | 'userfriend_id' => 'xsd:string', |
62 | 62 | 'content_message' => 'xsd:string' |
63 | - ), |
|
64 | - array('return' => 'xsd:string'), |
|
63 | + ), |
|
64 | + array('return' => 'xsd:string'), |
|
65 | 65 | 'urn:WSCMService', |
66 | 66 | '', |
67 | 67 | '', |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | ); |
71 | 71 | |
72 | 72 | $s->register( |
73 | - 'WSCMUser.accept_friend', |
|
74 | - array( |
|
75 | - 'username' => 'xsd:string', |
|
76 | - 'password' => 'xsd:string', |
|
73 | + 'WSCMUser.accept_friend', |
|
74 | + array( |
|
75 | + 'username' => 'xsd:string', |
|
76 | + 'password' => 'xsd:string', |
|
77 | 77 | 'userfriend_id' => 'xsd:string' |
78 | - ), |
|
79 | - array('return' => 'xsd:string'), |
|
78 | + ), |
|
79 | + array('return' => 'xsd:string'), |
|
80 | 80 | 'urn:WSCMService', |
81 | 81 | '', |
82 | 82 | '', |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | ); |
86 | 86 | |
87 | 87 | $s->register( |
88 | - 'WSCMUser.denied_invitation', |
|
89 | - array( |
|
90 | - 'username' => 'xsd:string', |
|
91 | - 'password' => 'xsd:string', |
|
88 | + 'WSCMUser.denied_invitation', |
|
89 | + array( |
|
90 | + 'username' => 'xsd:string', |
|
91 | + 'password' => 'xsd:string', |
|
92 | 92 | 'userfriend_id' => 'xsd:string' |
93 | - ), |
|
94 | - array('return' => 'xsd:string'), |
|
93 | + ), |
|
94 | + array('return' => 'xsd:string'), |
|
95 | 95 | 'urn:WSCMService', |
96 | 96 | '', |
97 | 97 | '', |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | 24 | while($row = Database::fetch_array($res)) { |
25 | - $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
25 | + $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | - $res2 = Database::query($sql2); |
|
27 | + $res2 = Database::query($sql2); |
|
28 | 28 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | $tuserfv = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); |
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | -while($row = Database::fetch_array($res)) { |
|
24 | +while ($row = Database::fetch_array($res)) { |
|
25 | 25 | $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | 27 | $res2 = Database::query($sql2); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) { |
37 | 37 | if ($_REQUEST['cidReq'] == -1) { |
38 | 38 | // When is out of the course tool (e.g My agenda) |
39 | - header('Location: ' . api_get_self()); |
|
39 | + header('Location: '.api_get_self()); |
|
40 | 40 | exit; |
41 | 41 | } else { |
42 | 42 | $type = 'course'; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $web_odf_supported_files = DocumentManager::get_web_odf_extension_list(); |
35 | 35 | |
36 | 36 | if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) { |
37 | - $show_web_odf = true; |
|
37 | + $show_web_odf = true; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file; |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | echo Display::display_header(''); |
86 | 86 | |
87 | 87 | echo '<div class="actions">'; |
88 | -echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
89 | -echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
88 | +echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
89 | +echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
90 | 90 | echo '</div>'; |
91 | 91 | |
92 | 92 | // echo '<div id="odf"></div>'; |
@@ -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 |
@@ -65,44 +65,44 @@ discard block |
||
65 | 65 | /* Please, do not modify this dirname formatting */ |
66 | 66 | |
67 | 67 | if (strstr($dir, '..')) { |
68 | - $dir = '/'; |
|
68 | + $dir = '/'; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | if ($dir[0] == '.') { |
72 | - $dir = substr($dir, 1); |
|
72 | + $dir = substr($dir, 1); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | if ($dir[0] != '/') { |
76 | - $dir = '/'.$dir; |
|
76 | + $dir = '/'.$dir; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | if ($dir[strlen($dir) - 1] != '/') { |
80 | - $dir .= '/'; |
|
80 | + $dir .= '/'; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
84 | 84 | |
85 | 85 | if (!is_dir($filepath)) { |
86 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
87 | - $dir = '/'; |
|
86 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
87 | + $dir = '/'; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | //groups //TODO:clean |
91 | 91 | if (!empty($groupId)) { |
92 | - $interbreadcrumb[] = array( |
|
93 | - 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
94 | - 'name' => get_lang('GroupSpace'), |
|
95 | - ); |
|
96 | - $group_document = true; |
|
97 | - $noPHP_SELF = true; |
|
92 | + $interbreadcrumb[] = array( |
|
93 | + 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
|
94 | + 'name' => get_lang('GroupSpace'), |
|
95 | + ); |
|
96 | + $group_document = true; |
|
97 | + $noPHP_SELF = true; |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
101 | 101 | |
102 | 102 | if (!$is_certificate_mode) |
103 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
103 | + $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents')); |
|
104 | 104 | else |
105 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
105 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
106 | 106 | |
107 | 107 | // Interbreadcrumb for the current directory root path |
108 | 108 | if (empty($document_data['parents'])) { |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $groupRights || |
120 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
120 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
121 | 121 | |
122 | 122 | if (!$is_allowedToEdit) { |
123 | - api_not_allowed(true); |
|
123 | + api_not_allowed(true); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | Event::event_access_tool(TOOL_DOCUMENT); |
@@ -152,21 +152,21 @@ discard block |
||
152 | 152 | $locktitle="false"; |
153 | 153 | |
154 | 154 | if ($_SERVER['HTTP_HOST']=="localhost") { |
155 | - $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
156 | - if (!file_exists($path_and_file)) { |
|
157 | - $crossdomain='<?xml version="1.0"?> |
|
155 | + $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
156 | + if (!file_exists($path_and_file)) { |
|
157 | + $crossdomain='<?xml version="1.0"?> |
|
158 | 158 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
159 | 159 | <cross-domain-policy> |
160 | 160 | <allow-access-from domain="cdn.pixlr.com" /> |
161 | 161 | <site-control permitted-cross-domain-policies="master-only"/> |
162 | 162 | <allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/> |
163 | 163 | </cross-domain-policy>';//more open domain="*" |
164 | - @file_put_contents($path_and_file, $crossdomain); |
|
165 | - } |
|
166 | - $credentials="true"; |
|
164 | + @file_put_contents($path_and_file, $crossdomain); |
|
165 | + } |
|
166 | + $credentials="true"; |
|
167 | 167 | } |
168 | 168 | else { |
169 | - $credentials="false"; |
|
169 | + $credentials="false"; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | //make temp images |
@@ -179,23 +179,23 @@ discard block |
||
179 | 179 | $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess'; |
180 | 180 | if (!file_exists($htaccess)) { |
181 | 181 | |
182 | - $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
182 | + $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes"; |
|
183 | 183 | |
184 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
185 | - if ($fp) { |
|
186 | - fwrite($fp, $htaccess_content); |
|
187 | - fclose($fp); |
|
188 | - } |
|
184 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w'); |
|
185 | + if ($fp) { |
|
186 | + fwrite($fp, $htaccess_content); |
|
187 | + fclose($fp); |
|
188 | + } |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html'; |
192 | 192 | if (!file_exists($html_index)) { |
193 | - $html_index_content="<html><head></head><body></body></html>"; |
|
194 | - $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
195 | - if ($fp) { |
|
196 | - fwrite($fp, $html_index_content); |
|
197 | - fclose($fp); |
|
198 | - } |
|
193 | + $html_index_content="<html><head></head><body></body></html>"; |
|
194 | + $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w'); |
|
195 | + if ($fp) { |
|
196 | + fwrite($fp, $html_index_content); |
|
197 | + fclose($fp); |
|
198 | + } |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | //encript temp name file |
@@ -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 | } |
@@ -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> |