Completed
Push — master ( 73f386...565c08 )
by José
55:34 queued 26:04
created
main/document/save_pixlr.php 1 patch
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.
main/document/slideshowoptions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array
40 40
 $url = 'slideshowoptions.php?curdirpath='.$pathurl;
41 41
 $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
42
-$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
42
+$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname);
43 43
 
44 44
 Display::display_header($originalToolName, 'Doc');
45 45
 $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 </script>
64 64
 
65 65
 <?php
66
-$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
67
-$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
66
+$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
67
+$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>';
68 68
 Display::toolbarAction('toolbar-slideshow', $content)
69 69
 ?>
70 70
 <div class="panel panel-default">
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
                     }
80 80
 		?>>
81 81
             </label>
82
-            <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
82
+            <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?>
83 83
         </div>
84 84
         <div class="radio">
85 85
             <label>
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                         }
90 90
 		?>>
91 91
             </label>
92
-            <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
92
+            <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?>
93 93
 	</div>
94 94
 	<div class="radio">
95 95
             <label>
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                     }
102 102
 		?>>
103 103
             </label>
104
-            <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
104
+            <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?>
105 105
 	</div>
106 106
         <div class="form-group">
107 107
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
Please login to merge, or discard this patch.
main/document/exit_pixlr.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,13 +23,13 @@
 block discarded – undo
23 23
 unset($_SESSION['whereami']);
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26
-if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
26
+if (!isset($_SESSION['exit_pixlr'])) {
27
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
28 28
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
29 29
 	api_not_allowed(true);
30 30
 } else {
31 31
 	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
32
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33 33
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
34 34
 	unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
main/document/slideshow.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37 37
 	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38 38
 	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
39
+	if ((isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') or $slideshow == 1) {
40 40
 		$new_sizes = api_resize_image($image, $target_width, $target_height);
41 41
 		$result[] = $new_sizes['height'];
42 42
 		$result[] = $new_sizes['width'];
Please login to merge, or discard this patch.
main/template/default/auth/categories_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 <!-- Actions: The menu with the different options in cathe course management -->
17 17
 <div id="actions" class="actions">
18 18
     <a href="<?php echo api_get_self() ?>?action=sortmycourses">
19
-        <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?>
19
+        <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?>
20 20
     </a>
21 21
 </div>
22 22
 
Please login to merge, or discard this patch.
main/group/member_settings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 require_once '../inc/global.inc.php';
15 15
 $this_section = SECTION_COURSES;
16
-$current_course_tool  = TOOL_GROUP;
16
+$current_course_tool = TOOL_GROUP;
17 17
 
18 18
 // Notice for unauthorized people.
19 19
 api_protect_course_script(true);
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 // Group members
163 163
 $group_member_list = GroupManager::get_subscribed_users($current_group['id']);
164 164
 
165
-$selected_users = array ();
165
+$selected_users = array();
166 166
 if (!empty($group_member_list)) {
167 167
     foreach ($group_member_list as $index => $user) {
168 168
         $selected_users[] = $user['user_id'];
Please login to merge, or discard this patch.
main/course_progress/thematic_controller.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -201,20 +201,20 @@  discard block
 block discarded – undo
201 201
                         $plan_html = null;
202 202
                         if (!empty($data)) {
203 203
                             foreach ($data as $plan) {
204
-                                $plan_html .= '<strong>' . $plan['title'] . '</strong><br /> ' . $plan['description'] . '<br />';
204
+                                $plan_html .= '<strong>'.$plan['title'].'</strong><br /> '.$plan['description'].'<br />';
205 205
                             }
206 206
                         }
207 207
                         $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
208 208
                         $advance_html = null;
209 209
                         if (!empty($data)) {
210 210
                             foreach ($data as $advance) {
211
-                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG) . ' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
211
+                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG).' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
212 212
                             }
213 213
                         }
214 214
                         $table[] = array($theme['title'], $plan_html, $advance_html);
215 215
                     }
216 216
                     $params = array(
217
-                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
217
+                        'filename' => get_lang('Thematic').'-'.api_get_local_time(),
218 218
                         'pdf_title' => get_lang('Thematic'),
219 219
                         'add_signatures' => true,
220 220
                         'format' => 'A4-L',
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
                             unset($_SESSION['thematic_plan_token']);
312 312
                             $data['message'] = 'ok';
313 313
 
314
-                            $saveRedirect = api_get_path(WEB_PATH) . 'main/course_progress/index.php?';
315
-                            $saveRedirect.= api_get_cidreq() . '&';
316
-                            $saveRedirect.= 'thematic_plan_save_message=ok';
314
+                            $saveRedirect = api_get_path(WEB_PATH).'main/course_progress/index.php?';
315
+                            $saveRedirect .= api_get_cidreq().'&';
316
+                            $saveRedirect .= 'thematic_plan_save_message=ok';
317 317
 
318 318
                             header("Location: $saveRedirect");
319 319
                             exit;
Please login to merge, or discard this patch.
main/course_progress/thematic.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -23,25 +23,25 @@  discard block
 block discarded – undo
23 23
         case 'thematic_add' :
24 24
         case 'thematic_import_select' :
25 25
             echo '<a href="index.php?'.api_get_cidreq().'">'.
26
-                Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'</a>';
26
+                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ThematicDetails'), '', ICON_SIZE_MEDIUM).'</a>';
27 27
             break;
28 28
         case 'thematic_list' :
29 29
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
30
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
30
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
31 31
             break;
32 32
         case 'thematic_details' :
33 33
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
34
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
34
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
35 35
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_import_select'.$url_token.'">'.
36
-                Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'</a>';
36
+                Display::return_icon('import_csv.png', get_lang('ImportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
37 37
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export'.$url_token.'">'.
38
-                Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'</a>';
38
+                Display::return_icon('export_csv.png', get_lang('ExportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
39 39
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export_pdf'.$url_token.'">'.
40
-                Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
40
+                Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
41 41
             break;
42 42
         default :
43 43
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
44
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
44
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
45 45
     }
46 46
     echo '</div>';
47 47
 }
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
     $parameters['action'] = $action;
58 58
     $table->set_additional_parameters($parameters);
59 59
     $table->set_header(0, '', false, array('style'=>'width:20px;'));
60
-    $table->set_header(1, get_lang('Title'), false );
60
+    $table->set_header(1, get_lang('Title'), false);
61 61
     if (api_is_allowed_to_edit(null, true)) {
62
-        $table->set_header(2, get_lang('Actions'), false,array('style'=>'text-align:center;width:40%;'));
63
-        $table->set_form_actions(array ('thematic_delete_select' => get_lang('DeleteAllThematics')));
62
+        $table->set_header(2, get_lang('Actions'), false, array('style'=>'text-align:center;width:40%;'));
63
+        $table->set_form_actions(array('thematic_delete_select' => get_lang('DeleteAllThematics')));
64 64
     }
65 65
     $table->display();
66 66
 
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
 
73 73
     if (isset($last_id) && $last_id) {
74 74
         $link_to_thematic_plan = '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$last_id.'">'.
75
-            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
75
+            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
76 76
         $link_to_thematic_advance = '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$last_id.'">'.
77
-            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
77
+            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
78 78
         Display::display_confirmation_message(
79
-            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance),
79
+            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'), $link_to_thematic_plan, $link_to_thematic_advance),
80 80
             false
81 81
         );
82 82
     }
@@ -113,27 +113,27 @@  discard block
 block discarded – undo
113 113
             $actions_first_col = '';
114 114
             if (api_is_allowed_to_edit(null, true)) {
115 115
                 // Thematic title
116
-                $actions_first_col  = Display::url(
116
+                $actions_first_col = Display::url(
117 117
                     Display::return_icon('cd.gif', get_lang('Copy')),
118 118
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
119 119
                 );
120
-                if (api_get_session_id() == 0 ) {
120
+                if (api_get_session_id() == 0) {
121 121
 
122 122
                     if ($thematic['display_order'] > 1) {
123
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
123
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
124 124
                     } else {
125
-                        $actions_first_col .= ' '.Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
125
+                        $actions_first_col .= ' '.Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
126 126
                     }
127 127
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
128
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
128
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
129 129
                     } else {
130
-                        $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
130
+                        $actions_first_col .= ' '.Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
131 131
                     }
132 132
 
133 133
                 }
134 134
                 if (api_get_session_id() == $thematic['session_id']) {
135
-                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
136
-                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
135
+                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
136
+                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
137 137
                 }
138 138
 
139 139
                 $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools'));
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
150 150
             if (api_is_allowed_to_edit(null, true)) {
151 151
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
152
-                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_MEDIUM).'</a></div><br />';
152
+                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'), ICON_SIZE_MEDIUM).'</a></div><br />';
153 153
             }
154 154
 
155 155
             if (empty($thematic_plan_div[$thematic['id']])) {
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
166 166
             if (api_is_allowed_to_edit(null, true)) {
167 167
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.
168
-                    Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
168
+                    Display::return_icon('add.png', get_lang('NewThematicAdvance'), '', ICON_SIZE_MEDIUM).'</a></div>';
169 169
             }
170 170
 
171 171
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                                 [],
188 188
                                 ICON_SIZE_SMALL
189 189
                             ),
190
-                            'index.php?' . api_get_cidreq() . '&' . http_build_query([
190
+                            'index.php?'.api_get_cidreq().'&'.http_build_query([
191 191
                                 'action' => 'thematic_advance_edit',
192 192
                                 'thematic_id' => $thematic['id'],
193 193
                                 'thematic_advance_id' => $thematic_advance['id'],
@@ -198,17 +198,17 @@  discard block
 block discarded – undo
198 198
                                 'data-title' => get_lang('EditThematicAdvance')
199 199
                             ]
200 200
                         );
201
-                        $edit_link  .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
202
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
201
+                        $edit_link .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
202
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a></center>';
203 203
 
204 204
                         //Links
205 205
                         $edit_link = Display::div(
206
-                            Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
206
+                            Display::div($edit_link, array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
207 207
                             array('style'=>'height:20px;')
208 208
                         );
209 209
                     }
210 210
 
211
-                    $thematic_advance_item =  isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
211
+                    $thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
212 212
                     echo Display::div($thematic_advance_item, array('id'=>'thematic_advance_'.$thematic_advance['id']));
213 213
                     echo $edit_link;
214 214
                     echo '</td>';
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 } elseif ($action == 'thematic_add' || $action == 'thematic_edit') {
254 254
 
255 255
     // Display form
256
-    $form = new FormValidator('thematic_add','POST','index.php?action=thematic_add&'.api_get_cidreq());
256
+    $form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq());
257 257
 
258 258
     if ($action == 'thematic_edit') {
259 259
         $form->addElement('header', '', get_lang('EditThematicSection'));
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
     $form->addElement('hidden', 'action', $action);
264 264
 
265 265
     if (!empty($thematic_id)) {
266
-        $form->addElement('hidden', 'thematic_id',$thematic_id);
266
+        $form->addElement('hidden', 'thematic_id', $thematic_id);
267 267
     }
268 268
 
269 269
     $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
@@ -275,8 +275,8 @@  discard block
 block discarded – undo
275 275
     if (!empty($thematic_data)) {
276 276
         if (api_get_session_id()) {
277 277
             if ($thematic_data['session_id'] != api_get_session_id()) {
278
-                $show_form  = false;
279
-                Display::display_error_message(get_lang('NotAllowedClickBack'),false);
278
+                $show_form = false;
279
+                Display::display_error_message(get_lang('NotAllowedClickBack'), false);
280 280
             }
281 281
         }
282 282
         // set default values
@@ -287,14 +287,14 @@  discard block
 block discarded – undo
287 287
 
288 288
     // error messages
289 289
     if (isset($error)) {
290
-        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
290
+        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
291 291
     }
292 292
     if ($show_form) {
293 293
         $form->display();
294 294
     }
295 295
 } elseif ($action == 'thematic_import_select') {
296 296
     // Create form to upload csv file.
297
-    $form = new FormValidator('thematic_import','POST','index.php?action=thematic_import&'.api_get_cidreq().$url_token);
297
+    $form = new FormValidator('thematic_import', 'POST', 'index.php?action=thematic_import&'.api_get_cidreq().$url_token);
298 298
     $form->addElement('header', get_lang('ImportThematic'));
299 299
     $form->addElement('file', 'file');
300 300
     $form->addElement('checkbox', 'replace', null, get_lang('DeleteAllThematic'));
Please login to merge, or discard this patch.
main/cron/cleanup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 $a_dir = realpath($dir.'/../../archive/');
16 16
 $list = scandir($a_dir);
17 17
 // calculate 7 days
18
-$t = time()-(86400*7);
18
+$t = time() - (86400 * 7);
19 19
 foreach ($list as $item) {
20
-    if (substr($item,0,1) == '.') {
20
+    if (substr($item, 0, 1) == '.') {
21 21
         continue;
22 22
     }
23 23
     $stat = @stat($a_dir.'/'.$item);
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
  * Delete a file or recursively delete a directory
35 35
  * @param string $str Path to file or directory
36 36
  */
37
-function recursive_delete($str){
37
+function recursive_delete($str) {
38 38
     if (is_file($str)) {
39 39
         return @unlink($str);
40 40
     } elseif (is_dir($str)) {
41
-        $scan = glob(rtrim($str,'/').'/*');
41
+        $scan = glob(rtrim($str, '/').'/*');
42 42
         foreach ($scan as $index=>$path) {
43 43
             recursive_delete($path);
44 44
         }
Please login to merge, or discard this patch.