Completed
Push — 1.11.x ( 566ea6...b264ab )
by José
110:20 queued 69:00
created
main/document/webcam_clip.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 //make some vars
35 35
 $webcamdir=$dir;
36 36
 if($webcamdir=="/"){
37
- $webcamdir="";
37
+    $webcamdir="";
38 38
 }
39 39
 
40 40
 
@@ -43,49 +43,49 @@  discard block
 block discarded – undo
43 43
 // Please, do not modify this dirname formatting
44 44
 
45 45
 if (strstr($dir, '..')) {
46
-	$dir = '/';
46
+    $dir = '/';
47 47
 }
48 48
 
49 49
 if ($dir[0] == '.') {
50
-	$dir = substr($dir, 1);
50
+    $dir = substr($dir, 1);
51 51
 }
52 52
 
53 53
 if ($dir[0] != '/') {
54
-	$dir = '/'.$dir;
54
+    $dir = '/'.$dir;
55 55
 }
56 56
 
57 57
 if ($dir[strlen($dir) - 1] != '/') {
58
-	$dir .= '/';
58
+    $dir .= '/';
59 59
 }
60 60
 
61 61
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
62 62
 
63 63
 if (!is_dir($filepath)) {
64
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
65
-	$dir = '/';
64
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
65
+    $dir = '/';
66 66
 }
67 67
 
68 68
 $groupId = api_get_group_id();
69 69
 
70 70
 if (!empty($groupId)) {
71
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72
-	$noPHP_SELF = true;
73
-	$group = GroupManager :: get_group_properties($groupId);
74
-	$path = explode('/', $dir);
75
-	if ('/'.$path[1] != $group['directory']) {
76
-		api_not_allowed(true);
77
-	}
71
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72
+    $noPHP_SELF = true;
73
+    $group = GroupManager :: get_group_properties($groupId);
74
+    $path = explode('/', $dir);
75
+    if ('/'.$path[1] != $group['directory']) {
76
+        api_not_allowed(true);
77
+    }
78 78
 }
79 79
 
80 80
 $interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
81 81
 
82 82
 if (!$is_allowed_in_course) {
83
-	api_not_allowed(true);
83
+    api_not_allowed(true);
84 84
 }
85 85
 
86 86
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
87
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
88
-	api_not_allowed(true);
87
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
88
+    api_not_allowed(true);
89 89
 }
90 90
 
91 91
 /*	Header */
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 
94 94
 $display_dir = $dir;
95 95
 if (isset ($group)) {
96
-	$display_dir = explode('/', $dir);
97
-	unset ($display_dir[0]);
98
-	unset ($display_dir[1]);
99
-	$display_dir = implode('/', $display_dir);
96
+    $display_dir = explode('/', $dir);
97
+    unset ($display_dir[0]);
98
+    unset ($display_dir[1]);
99
+    $display_dir = implode('/', $display_dir);
100 100
 }
101 101
 
102 102
 // Interbreadcrumb for the current directory root path
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 Display :: display_header($nameTools, 'Doc');
122 122
 echo '<div class="actions">';
123 123
 echo '<a href="document.php?id='.$document_id.'">'.
124
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
124
+    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
125 125
 echo '</div>';
126 126
 ?>
127 127
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 $dir = $document_data['path'];
33 33
 
34 34
 //make some vars
35
-$webcamdir=$dir;
36
-if($webcamdir=="/"){
37
- $webcamdir="";
35
+$webcamdir = $dir;
36
+if ($webcamdir == "/") {
37
+ $webcamdir = "";
38 38
 }
39 39
 
40 40
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 $groupId = api_get_group_id();
69 69
 
70 70
 if (!empty($groupId)) {
71
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
71
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72 72
 	$noPHP_SELF = true;
73 73
 	$group = GroupManager :: get_group_properties($groupId);
74 74
 	$path = explode('/', $dir);
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
 	}
78 78
 }
79 79
 
80
-$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
80
+$interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
81 81
 
82 82
 if (!$is_allowed_in_course) {
83 83
 	api_not_allowed(true);
84 84
 }
85 85
 
86 86
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
87
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
87
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
88 88
 	api_not_allowed(true);
89 89
 }
90 90
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 // Interbreadcrumb for the current directory root path
103 103
 $counter = 0;
104 104
 if (isset($document_data['parents'])) {
105
-    foreach($document_data['parents'] as $document_sub_data) {
105
+    foreach ($document_data['parents'] as $document_sub_data) {
106 106
         //fixing double group folder in breadcrumb
107 107
         if (api_get_group_id()) {
108 108
             if ($counter == 0) {
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 }
117 117
 
118 118
 //make some vars
119
-$webcamuserid=api_get_user_id();
119
+$webcamuserid = api_get_user_id();
120 120
 
121 121
 Display :: display_header($nameTools, 'Doc');
122 122
 echo '<div class="actions">';
123 123
 echo '<a href="document.php?id='.$document_id.'">'.
124
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
124
+	Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
125 125
 echo '</div>';
126 126
 ?>
127 127
 
Please login to merge, or discard this patch.
main/document/edit_draw.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,10 +87,11 @@
 block discarded – undo
87 87
 
88 88
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
89 89
 
90
-if (!$is_certificate_mode)
90
+if (!$is_certificate_mode) {
91 91
 	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents'));
92
-else
92
+} else {
93 93
 	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
94
+}
94 95
 
95 96
 // Interbreadcrumb for the current directory root path
96 97
 if (empty($document_data['parents'])) {
Please login to merge, or discard this patch.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 //path for svg-edit save
44 44
 $_SESSION['draw_dir'] = Security::remove_XSS($dir);
45 45
 if ($_SESSION['draw_dir'] == '/') {
46
-	$_SESSION['draw_dir'] = '';
46
+    $_SESSION['draw_dir'] = '';
47 47
 }
48 48
 $_SESSION['draw_file'] = basename(Security::remove_XSS($file_path));
49 49
 $get_file = Security::remove_XSS($file_path);
@@ -59,26 +59,26 @@  discard block
 block discarded – undo
59 59
 /* Please, do not modify this dirname formatting */
60 60
 
61 61
 if (strstr($dir, '..')) {
62
-	$dir = '/';
62
+    $dir = '/';
63 63
 }
64 64
 
65 65
 if ($dir[0] == '.') {
66
-	$dir = substr($dir, 1);
66
+    $dir = substr($dir, 1);
67 67
 }
68 68
 
69 69
 if ($dir[0] != '/') {
70
-	$dir = '/'.$dir;
70
+    $dir = '/'.$dir;
71 71
 }
72 72
 
73 73
 if ($dir[strlen($dir) - 1] != '/') {
74
-	$dir .= '/';
74
+    $dir .= '/';
75 75
 }
76 76
 
77 77
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
78 78
 
79 79
 if (!is_dir($filepath)) {
80
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
81
-	$dir = '/';
80
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
81
+    $dir = '/';
82 82
 }
83 83
 
84 84
 //groups //TODO:clean
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
88 88
         'name' => get_lang('GroupSpace'),
89 89
     );
90
-	$group_document = true;
91
-	$noPHP_SELF = true;
90
+    $group_document = true;
91
+    $noPHP_SELF = true;
92 92
 }
93 93
 
94 94
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 }
115 115
 
116 116
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
117
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
117
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
118 118
 
119 119
 if (!$is_allowedToEdit) {
120
-	api_not_allowed(true);
120
+    api_not_allowed(true);
121 121
 }
122 122
 
123 123
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
 echo '</div>';
132 132
 
133 133
 if (api_browser_support('svg')) {
134
-	//automatic loading the course language
135
-	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
136
-	$langsvgedit  = api_get_language_isocode();
137
-	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
138
-	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
139
-	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
140
-	?>
134
+    //automatic loading the course language
135
+    $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
136
+    $langsvgedit  = api_get_language_isocode();
137
+    $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
138
+    $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
139
+    $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
140
+    ?>
141 141
 	<script>
142 142
 	document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
143 143
 	function resizeIframe() {
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 
156 156
     <?php
157 157
     echo '<noscript>';
158
-	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
159
-	echo '</noscript>';
158
+    echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
159
+    echo '</noscript>';
160 160
 } else {
161
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
161
+    Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
162 162
 }
163 163
 Display::display_footer();
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 $dir = str_replace('\\', '/', $dir);
38 38
 
39 39
 /* Constants & Variables */
40
-$current_session_id=api_get_session_id();
40
+$current_session_id = api_get_session_id();
41 41
 $group_id = api_get_group_id();
42 42
 
43 43
 //path for svg-edit save
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 $file = basename($get_file);
51 51
 $temp_file = explode(".", $file);
52 52
 $filename = $temp_file[0];
53
-$nameTools = get_lang('EditDocument') . ': ' . $filename;
54
-$courseDir = $_course['path'] . '/document';
53
+$nameTools = get_lang('EditDocument').': '.$filename;
54
+$courseDir = $_course['path'].'/document';
55 55
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
56 56
 
57 57
 /*	Other initialization code */
@@ -125,15 +125,15 @@  discard block
 block discarded – undo
125 125
 Display :: display_header($nameTools, 'Doc');
126 126
 echo '<div class="actions">';
127 127
 echo '<a href="document.php?id='.$parent_id.'">'.
128
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
128
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
129 129
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.
130
-    Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
130
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
131 131
 echo '</div>';
132 132
 
133 133
 if (api_browser_support('svg')) {
134 134
 	//automatic loading the course language
135 135
 	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
136
-	$langsvgedit  = api_get_language_isocode();
136
+	$langsvgedit = api_get_language_isocode();
137 137
 	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
138 138
 	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
139 139
 	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
Please login to merge, or discard this patch.
main/document/download.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
main/document/webcam_receiver.php 3 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
main/document/edit_paint.php 3 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,10 +93,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -33,26 +33,26 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -61,44 +61,44 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
main/document/document_slideshow.inc.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
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') {
Please login to merge, or discard this patch.
main/document/downloadfolder.inc.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         );
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
main/document/save_pixlr.php 3 patches
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -16,36 +16,36 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,7 +124,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
main/document/create_document.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -561,8 +561,9 @@
 block discarded – undo
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']);
Please login to merge, or discard this patch.
Indentation   +167 added lines, -167 removed lines patch added patch discarded remove patch
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
 $is_certificate_mode = false;
79 79
 
80 80
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
81
-	$is_certificate_mode = true;
81
+    $is_certificate_mode = true;
82 82
 }
83 83
 
84 84
 if ($is_certificate_mode) {
85
-	$nameTools = get_lang('CreateCertificate');
85
+    $nameTools = get_lang('CreateCertificate');
86 86
 } else {
87
-	$nameTools = get_lang('CreateDocument');
87
+    $nameTools = get_lang('CreateDocument');
88 88
 }
89 89
 
90 90
 /*	Constants and variables */
@@ -137,26 +137,26 @@  discard block
 block discarded – undo
137 137
 
138 138
 // Please, do not modify this dirname formatting
139 139
 if (strstr($dir, '..')) {
140
-	$dir = '/';
140
+    $dir = '/';
141 141
 }
142 142
 
143 143
 if ($dir[0] == '.') {
144
-	$dir = substr($dir, 1);
144
+    $dir = substr($dir, 1);
145 145
 }
146 146
 
147 147
 if ($dir[0] != '/') {
148
-	$dir = '/'.$dir;
148
+    $dir = '/'.$dir;
149 149
 }
150 150
 
151 151
 if ($dir[strlen($dir) - 1] != '/') {
152
-	$dir .= '/';
152
+    $dir .= '/';
153 153
 }
154 154
 
155 155
 if ($is_certificate_mode) {
156
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
157
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
158
-	$folder_id = $document_data['id'];
159
-	$dir = '/certificates/';
156
+    $document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
157
+    $document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
158
+    $folder_id = $document_data['id'];
159
+    $dir = '/certificates/';
160 160
 }
161 161
 
162 162
 $doc_tree  = explode('/', $dir);
@@ -167,16 +167,16 @@  discard block
 block discarded – undo
167 167
 
168 168
     // Level correction for group documents.
169 169
     if (!empty($group_properties['directory'])) {
170
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
170
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
171 171
     }
172 172
 }
173 173
 $relative_url = '';
174 174
 for ($i = 0; $i < ($count_dir); $i++) {
175
-	$relative_url .= '../';
175
+    $relative_url .= '../';
176 176
 }
177 177
 
178 178
 if ($relative_url== '') {
179
-	$relative_url = '/';
179
+    $relative_url = '/';
180 180
 }
181 181
 
182 182
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
     'cols-size' => [2, 10, 0],
189 189
     'FullPage' => true,
190 190
     'InDocument' => true,
191
-	'CreateDocumentDir'    => $relative_url,
192
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
193
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
194
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
195
-	'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
191
+    'CreateDocumentDir'    => $relative_url,
192
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
193
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
194
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
195
+    'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
196 196
 );
197 197
 
198 198
 if ($is_certificate_mode) {
@@ -204,36 +204,36 @@  discard block
 block discarded – undo
204 204
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
205 205
 
206 206
 if (!is_dir($filepath)) {
207
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
208
-	$dir = '/';
207
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
208
+    $dir = '/';
209 209
 }
210 210
 
211 211
 $to_group_id = 0;
212 212
 
213 213
 if (!$is_certificate_mode) {
214
-	if (api_is_in_group()) {
215
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
216
-		$noPHP_SELF = true;
217
-		$to_group_id = api_get_group_id();
218
-		$path = explode('/', $dir);
219
-		if ('/'.$path[1] != $group_properties['directory']) {
220
-			api_not_allowed(true);
221
-		}
222
-	}
223
-	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
214
+    if (api_is_in_group()) {
215
+        $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
216
+        $noPHP_SELF = true;
217
+        $to_group_id = api_get_group_id();
218
+        $path = explode('/', $dir);
219
+        if ('/'.$path[1] != $group_properties['directory']) {
220
+            api_not_allowed(true);
221
+        }
222
+    }
223
+    $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
224 224
 } else {
225
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
225
+    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
226 226
 }
227 227
 
228 228
 if (!$is_allowed_in_course) {
229
-	api_not_allowed(true);
229
+    api_not_allowed(true);
230 230
 }
231 231
 
232 232
 if (!($is_allowed_to_edit ||
233 233
     $_SESSION['group_member_with_upload_rights'] ||
234 234
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
235 235
 ) {
236
-	api_not_allowed(true);
236
+    api_not_allowed(true);
237 237
 }
238 238
 
239 239
 /*	Header */
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
 
242 242
 $display_dir = $dir;
243 243
 if (isset($group_properties)) {
244
-	$display_dir = explode('/', $dir);
245
-	unset($display_dir[0]);
246
-	unset($display_dir[1]);
247
-	$display_dir = implode('/', $display_dir);
244
+    $display_dir = explode('/', $dir);
245
+    unset($display_dir[0]);
246
+    unset($display_dir[1]);
247
+    $display_dir = implode('/', $display_dir);
248 248
 }
249 249
 
250 250
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
 $form->addElement('header', $nameTools);
262 262
 
263 263
 if ($is_certificate_mode) {//added condition for certicate in gradebook
264
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
265
-	if (isset($_GET['selectcat'])) {
266
-		$form->addElement('hidden','selectcat', $select_cat);
264
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
265
+    if (isset($_GET['selectcat'])) {
266
+        $form->addElement('hidden','selectcat', $select_cat);
267 267
     }
268 268
 }
269 269
 
@@ -298,12 +298,12 @@  discard block
 block discarded – undo
298 298
 if ($is_certificate_mode) {
299 299
     $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
300 300
 } else {
301
-	$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
301
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
302 302
 }
303 303
 
304 304
 // Show read-only box only in groups
305 305
 if (!empty($groupId)) {
306
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
306
+    $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
307 307
 }
308 308
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
309 309
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
@@ -318,14 +318,14 @@  discard block
 block discarded – undo
318 318
 // new document created
319 319
 
320 320
 if (!$is_certificate_mode &&
321
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
321
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
322 322
 ) {
323
-	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
323
+    $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
324 324
 
325
-	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
325
+    //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
326 326
         $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
327
-	// Following two conditions copied from document.inc.php::build_directory_selector()
328
-	$folder_titles = array();
327
+    // Following two conditions copied from document.inc.php::build_directory_selector()
328
+    $folder_titles = array();
329 329
 
330 330
     if (is_array($folders)) {
331 331
         $escaped_folders = array();
@@ -363,22 +363,22 @@  discard block
 block discarded – undo
363 363
         }
364 364
     }
365 365
 
366
-	if (empty($group_dir)) {
367
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
368
-		if (is_array($folders)) {
369
-			foreach ($folders as & $folder) {
370
-				//Hide some folders
371
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
366
+    if (empty($group_dir)) {
367
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
368
+        if (is_array($folders)) {
369
+            foreach ($folders as & $folder) {
370
+                //Hide some folders
371
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
372 372
                     continue;
373
-				}
374
-				//Admin setting for Hide/Show the folders of all users
375
-				if (api_get_setting('show_users_folders') == 'false' &&
373
+                }
374
+                //Admin setting for Hide/Show the folders of all users
375
+                if (api_get_setting('show_users_folders') == 'false' &&
376 376
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
377 377
                 ){
378
-					continue;
379
-				}
380
-				//Admin setting for Hide/Show Default folders to all users
381
-				if (api_get_setting('show_default_folders') == 'false' &&
378
+                    continue;
379
+                }
380
+                //Admin setting for Hide/Show Default folders to all users
381
+                if (api_get_setting('show_default_folders') == 'false' &&
382 382
                     (
383 383
                         $folder == '/images' ||
384 384
                         $folder == '/flash' ||
@@ -388,80 +388,80 @@  discard block
 block discarded – undo
388 388
                         $folder == '/video/flv'
389 389
                     )
390 390
                 ){
391
-					continue;
392
-				}
393
-				//Admin setting for Hide/Show chat history folder
394
-				if (api_get_setting('show_chat_folder') == 'false' &&
391
+                    continue;
392
+                }
393
+                //Admin setting for Hide/Show chat history folder
394
+                if (api_get_setting('show_chat_folder') == 'false' &&
395 395
                     $folder=='/chat_files'
396 396
                 ){
397
-					continue;
398
-				}
397
+                    continue;
398
+                }
399 399
 
400
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
401
-				$path_parts = explode('/', $folder);
402
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
400
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
401
+                $path_parts = explode('/', $folder);
402
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
403 403
                 $space_counter =count($path_parts) - 2;
404 404
                 if ($space_counter > 0) {
405 405
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
406 406
                 } else {
407 407
                     $label = ' &mdash; '.$folder_titles[$folder];
408 408
                 }
409
-				$parent_select -> addOption($label, $folder);
410
-				if ($selected != '') {
411
-					$parent_select->setSelected($folder);
412
-				}
413
-			}
414
-		}
415
-	} else {
416
-		foreach ($folders as & $folder) {
417
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
418
-			$label = $folder_titles[$folder];
419
-			if ($folder == $group_dir) {
420
-				$label = '/ ('.get_lang('HomeDirectory').')';
421
-			} else {
422
-				$path_parts = explode('/', str_replace($group_dir, '', $folder));
423
-				$label = cut($label, 80);
424
-				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
425
-			}
426
-			$parent_select -> addOption($label, $folder);
427
-			if ($selected != '') {
428
-				$parent_select->setSelected($folder);
429
-			}
430
-		}
431
-	}
409
+                $parent_select -> addOption($label, $folder);
410
+                if ($selected != '') {
411
+                    $parent_select->setSelected($folder);
412
+                }
413
+            }
414
+        }
415
+    } else {
416
+        foreach ($folders as & $folder) {
417
+            $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
418
+            $label = $folder_titles[$folder];
419
+            if ($folder == $group_dir) {
420
+                $label = '/ ('.get_lang('HomeDirectory').')';
421
+            } else {
422
+                $path_parts = explode('/', str_replace($group_dir, '', $folder));
423
+                $label = cut($label, 80);
424
+                $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
425
+            }
426
+            $parent_select -> addOption($label, $folder);
427
+            if ($selected != '') {
428
+                $parent_select->setSelected($folder);
429
+            }
430
+        }
431
+    }
432 432
 }
433 433
 
434 434
 $form->addHidden('dirValue', '');
435 435
 
436 436
 if ($is_certificate_mode) {
437
-	$form->addButtonCreate(get_lang('CreateCertificate'));
437
+    $form->addButtonCreate(get_lang('CreateCertificate'));
438 438
 } else {
439
-	$form->addButtonCreate(get_lang('CreateDoc'));
439
+    $form->addButtonCreate(get_lang('CreateDoc'));
440 440
 }
441 441
 
442 442
 $form->setDefaults($defaults);
443 443
 
444 444
 // If form validates -> save the new document
445 445
 if ($form->validate()) {
446
-	$values = $form->exportValues();
447
-	$readonly = isset($values['readonly']) ? 1 : 0;
448
-	$values['title'] = trim($values['title']);
446
+    $values = $form->exportValues();
447
+    $readonly = isset($values['readonly']) ? 1 : 0;
448
+    $values['title'] = trim($values['title']);
449 449
 
450 450
     if (!empty($values['dirValue'])) {
451 451
         $dir = $values['dirValue'];
452 452
     }
453 453
 
454 454
     if ($dir[strlen($dir) - 1] != '/') {
455
-		$dir .= '/';
456
-	}
455
+        $dir .= '/';
456
+    }
457 457
     $filepath = $filepath.$dir;
458 458
 
459 459
     // Setting the filename
460
-	$filename = $values['title'];
461
-	$filename = addslashes(trim($filename));
462
-	$filename = Security::remove_XSS($filename);
463
-	$filename = api_replace_dangerous_char($filename);
464
-	$filename = disable_dangerous_file($filename);
460
+    $filename = $values['title'];
461
+    $filename = addslashes(trim($filename));
462
+    $filename = Security::remove_XSS($filename);
463
+    $filename = api_replace_dangerous_char($filename);
464
+    $filename = disable_dangerous_file($filename);
465 465
     $filename .= DocumentManager::getDocumentSuffix(
466 466
         $_course,
467 467
         api_get_session_id(),
@@ -469,14 +469,14 @@  discard block
 block discarded – undo
469 469
     );
470 470
 
471 471
     // Setting the title
472
-	$title = $values['title'];
472
+    $title = $values['title'];
473 473
 
474 474
     // Setting the extension
475
-	$extension = 'html';
475
+    $extension = 'html';
476 476
 
477
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
477
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
478 478
 
479
-	/*if (strpos($content, '/css/frames.css') == false) {
479
+    /*if (strpos($content, '/css/frames.css') == false) {
480 480
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
481 481
 	}*/
482 482
 
@@ -489,13 +489,13 @@  discard block
 block discarded – undo
489 489
         exit;
490 490
     }
491 491
 
492
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
493
-		//$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
494
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content);
492
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
493
+        //$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
494
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content);
495 495
 
496
-		fputs($fp, $content);
497
-		fclose($fp);
498
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
496
+        fputs($fp, $content);
497
+        fclose($fp);
498
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
499 499
 
500 500
         /*
501 501
 		if (!is_dir($filepath.'css')) {
@@ -513,8 +513,8 @@  discard block
 block discarded – undo
513 513
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id);
514 514
 		}*/
515 515
 
516
-		$file_size = filesize($filepath.$filename.'.'.$extension);
517
-		$save_file_path = $dir.$filename.'.'.$extension;
516
+        $file_size = filesize($filepath.$filename.'.'.$extension);
517
+        $save_file_path = $dir.$filename.'.'.$extension;
518 518
 
519 519
         $document_id = add_document(
520 520
             $_course,
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
             $readonly
527 527
         );
528 528
 
529
-		if ($document_id) {
530
-			api_item_property_update(
529
+        if ($document_id) {
530
+            api_item_property_update(
531 531
                 $_course,
532 532
                 TOOL_DOCUMENT,
533 533
                 $document_id,
@@ -539,13 +539,13 @@  discard block
 block discarded – undo
539 539
                 null,
540 540
                 $current_session_id
541 541
             );
542
-			// Update parent folders
543
-			item_property_update_on_folder($_course, $dir, $userId);
544
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
545
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
542
+            // Update parent folders
543
+            item_property_update_on_folder($_course, $dir, $userId);
544
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
545
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
546 546
             $new_title = htmlspecialchars($new_title);
547
-			if ($new_comment || $new_title) {
548
-				$ct = '';
547
+            if ($new_comment || $new_title) {
548
+                $ct = '';
549 549
                 $params = [];
550 550
                 if ($new_comment) {
551 551
                     $params['comment'] = $new_comment;
@@ -560,38 +560,38 @@  discard block
 block discarded – undo
560 560
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
561 561
                     );
562 562
                 }
563
-			}
564
-			$dir= substr($dir,0,-1);
565
-			$selectcat = '';
566
-			if (isset($_REQUEST['selectcat']))
567
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
568
-			$certificate_condition = '';
569
-			if ($is_certificate_mode) {
570
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
563
+            }
564
+            $dir= substr($dir,0,-1);
565
+            $selectcat = '';
566
+            if (isset($_REQUEST['selectcat']))
567
+                $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
568
+            $certificate_condition = '';
569
+            if ($is_certificate_mode) {
570
+                $df = DocumentManager::get_default_certificate_id($_course['code']);
571 571
                 if (!isset($df)) {
572 572
                     DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
573
-				}
574
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
575
-			}
576
-
577
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
578
-			exit();
579
-		} else {
580
-			Display :: display_header($nameTools, 'Doc');
581
-			Display :: display_error_message(get_lang('Impossible'));
582
-			Display :: display_footer();
583
-		}
584
-	} else {
585
-		Display :: display_header($nameTools, 'Doc');
586
-		Display :: display_error_message(get_lang('Impossible'));
587
-		Display :: display_footer();
588
-	}
573
+                }
574
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
575
+            }
576
+
577
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
578
+            exit();
579
+        } else {
580
+            Display :: display_header($nameTools, 'Doc');
581
+            Display :: display_error_message(get_lang('Impossible'));
582
+            Display :: display_footer();
583
+        }
584
+    } else {
585
+        Display :: display_header($nameTools, 'Doc');
586
+        Display :: display_error_message(get_lang('Impossible'));
587
+        Display :: display_footer();
588
+    }
589 589
 } else {
590
-	// Copied from document.php
591
-	$dir_array = explode('/', $dir);
592
-	$array_len = count($dir_array);
590
+    // Copied from document.php
591
+    $dir_array = explode('/', $dir);
592
+    $array_len = count($dir_array);
593 593
 
594
-	// Breadcrumb for the current directory root path
594
+    // Breadcrumb for the current directory root path
595 595
     if (!empty($document_data)) {
596 596
         if (empty($document_data['parents'])) {
597 597
             $interbreadcrumb[] = array(
@@ -608,11 +608,11 @@  discard block
 block discarded – undo
608 608
         }
609 609
     }
610 610
 
611
-	Display :: display_header($nameTools, "Doc");
612
-	// actions
611
+    Display :: display_header($nameTools, "Doc");
612
+    // actions
613 613
 
614
-	// link back to the documents overview
615
-	if ($is_certificate_mode) {
614
+    // link back to the documents overview
615
+    if ($is_certificate_mode) {
616 616
             $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
617 617
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
618 618
             $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Back'),null,ICON_SIZE_MEDIUM).'</a>';
@@ -625,16 +625,16 @@  discard block
 block discarded – undo
625 625
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
626 626
 
627 627
 
628
-	if ($is_certificate_mode) {
629
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
628
+    if ($is_certificate_mode) {
629
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
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
     // HTML-editor
639 639
     echo '<div class="page-create">
640 640
             <div class="row" style="overflow:hidden">
@@ -649,5 +649,5 @@  discard block
 block discarded – undo
649 649
                 '.$form->returnForm().'
650 650
             </div>
651 651
           </div></div>';
652
-	Display :: display_footer();
652
+    Display :: display_footer();
653 653
 }
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     $.ajax({
57 57
         contentType: "application/x-www-form-urlencoded",
58 58
         data: "dirValue="+dirValue,
59
-        url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=document_destination",
59
+        url: "' . api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_destination",
60 60
         type: "POST",
61 61
         success: function(response) {
62 62
             $("[name=\'dirValue\']").val(response)
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
 }
154 154
 
155 155
 if ($is_certificate_mode) {
156
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
157
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
156
+	$document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
157
+	$document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
158 158
 	$folder_id = $document_data['id'];
159 159
 	$dir = '/certificates/';
160 160
 }
161 161
 
162 162
 $doc_tree  = explode('/', $dir);
163
-$count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/"
163
+$count_dir = count($doc_tree) - 2; // "2" because at the begin and end there are 2 "/"
164 164
 
165 165
 if (api_is_in_group()) {
166 166
     $group_properties = GroupManager::get_group_properties(api_get_group_id());
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 	$relative_url .= '../';
176 176
 }
177 177
 
178
-if ($relative_url== '') {
178
+if ($relative_url == '') {
179 179
 	$relative_url = '/';
180 180
 }
181 181
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
 if (!$is_certificate_mode) {
214 214
 	if (api_is_in_group()) {
215
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215
+		$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
216 216
 		$noPHP_SELF = true;
217 217
 		$to_group_id = api_get_group_id();
218 218
 		$path = explode('/', $dir);
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	}
223 223
 	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
224 224
 } else {
225
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
225
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
226 226
 }
227 227
 
228 228
 if (!$is_allowed_in_course) {
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
 $form->addElement('header', $nameTools);
262 262
 
263 263
 if ($is_certificate_mode) {//added condition for certicate in gradebook
264
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
264
+	$form->addElement('hidden', 'certificate', 'true', array('id'=>'certificate'));
265 265
 	if (isset($_GET['selectcat'])) {
266
-		$form->addElement('hidden','selectcat', $select_cat);
266
+		$form->addElement('hidden', 'selectcat', $select_cat);
267 267
     }
268 268
 }
269 269
 
@@ -303,13 +303,13 @@  discard block
 block discarded – undo
303 303
 
304 304
 // Show read-only box only in groups
305 305
 if (!empty($groupId)) {
306
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
306
+	$group[] = $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
307 307
 }
308 308
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
309 309
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
310 310
 
311 311
 $current_session_id = api_get_session_id();
312
-$form->addHtmlEditor('content','', true, true, $editorConfig, true);
312
+$form->addHtmlEditor('content', '', true, true, $editorConfig, true);
313 313
 
314 314
 // Comment-field
315 315
 $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
324 324
 
325 325
 	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
326
-        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
326
+        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'), null, array('cols-size' => [2, 10, 0]));
327 327
 	// Following two conditions copied from document.inc.php::build_directory_selector()
328 328
 	$folder_titles = array();
329 329
 
@@ -331,19 +331,19 @@  discard block
 block discarded – undo
331 331
         $escaped_folders = array();
332 332
         foreach ($folders as $key => & $val) {
333 333
             // Hide some folders
334
-            if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){
334
+            if ($val == '/HotPotatoes_files' || $val == '/certificates' || basename($val) == 'css') {
335 335
                 continue;
336 336
             }
337 337
             // Admin setting for Hide/Show the folders of all users
338
-            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){
338
+            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))) {
339 339
                 continue;
340 340
             }
341 341
             // Admin setting for Hide/Show Default folders to all users
342
-            if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){
342
+            if (api_get_setting('show_default_folders') == 'false' && ($val == '/images' || $val == '/flash' || $val == '/audio' || $val == '/video' || strstr($val, '/images/gallery') || $val == '/video/flv')) {
343 343
                 continue;
344 344
             }
345 345
             // Admin setting for Hide/Show chat history folder
346
-            if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){
346
+            if (api_get_setting('show_chat_folder') == 'false' && $val == '/chat_files') {
347 347
                 continue;
348 348
             }
349 349
 
@@ -368,13 +368,13 @@  discard block
 block discarded – undo
368 368
 		if (is_array($folders)) {
369 369
 			foreach ($folders as & $folder) {
370 370
 				//Hide some folders
371
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
371
+				if ($folder == '/HotPotatoes_files' || $folder == '/certificates' || basename($folder) == 'css') {
372 372
                     continue;
373 373
 				}
374 374
 				//Admin setting for Hide/Show the folders of all users
375 375
 				if (api_get_setting('show_users_folders') == 'false' &&
376 376
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
377
-                ){
377
+                ) {
378 378
 					continue;
379 379
 				}
380 380
 				//Admin setting for Hide/Show Default folders to all users
@@ -387,20 +387,20 @@  discard block
 block discarded – undo
387 387
                         strstr($folder, '/images/gallery') ||
388 388
                         $folder == '/video/flv'
389 389
                     )
390
-                ){
390
+                ) {
391 391
 					continue;
392 392
 				}
393 393
 				//Admin setting for Hide/Show chat history folder
394 394
 				if (api_get_setting('show_chat_folder') == 'false' &&
395
-                    $folder=='/chat_files'
396
-                ){
395
+                    $folder == '/chat_files'
396
+                ) {
397 397
 					continue;
398 398
 				}
399 399
 
400
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
400
+				$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
401 401
 				$path_parts = explode('/', $folder);
402 402
 				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
403
-                $space_counter =count($path_parts) - 2;
403
+                $space_counter = count($path_parts) - 2;
404 404
                 if ($space_counter > 0) {
405 405
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
406 406
                 } else {
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		}
415 415
 	} else {
416 416
 		foreach ($folders as & $folder) {
417
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
417
+			$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
418 418
 			$label = $folder_titles[$folder];
419 419
 			if ($folder == $group_dir) {
420 420
 				$label = '/ ('.get_lang('HomeDirectory').')';
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
                     );
562 562
                 }
563 563
 			}
564
-			$dir= substr($dir,0,-1);
564
+			$dir = substr($dir, 0, -1);
565 565
 			$selectcat = '';
566 566
 			if (isset($_REQUEST['selectcat']))
567 567
 				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 			if ($is_certificate_mode) {
570 570
 				$df = DocumentManager::get_default_certificate_id($_course['code']);
571 571
                 if (!isset($df)) {
572
-                    DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
572
+                    DocumentManager::attach_gradebook_certificate($_course['code'], $document_id);
573 573
 				}
574 574
 				$certificate_condition = '&certificate=true&curdirpath=/certificates';
575 575
 			}
@@ -613,13 +613,13 @@  discard block
 block discarded – undo
613 613
 
614 614
 	// link back to the documents overview
615 615
 	if ($is_certificate_mode) {
616
-            $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
617
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
618
-            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Back'),null,ICON_SIZE_MEDIUM).'</a>';
616
+            $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.
617
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
618
+            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png', get_lang('Back'), null, ICON_SIZE_MEDIUM).'</a>';
619 619
         } else {
620 620
             $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
621
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
622
-            $actionsLeft .= '<a id="hide_bar_template" href="#">'.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>';
621
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
622
+            $actionsLeft .= '<a id="hide_bar_template" href="#">'.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>';
623 623
         }
624 624
 
625 625
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
@@ -630,10 +630,10 @@  discard block
 block discarded – undo
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
     // HTML-editor
639 639
     echo '<div class="page-create">
Please login to merge, or discard this patch.