Completed
Pull Request — 1.11.x (#1459)
by José
164:59 queued 133:05
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/document/document_quota.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 $session = array();
33 33
 $user_name = $user_info['complete_name'];
34 34
 
35
-$course_list = SessionManager::get_course_list_by_session_id ($session_id);
35
+$course_list = SessionManager::get_course_list_by_session_id($session_id);
36 36
 $session_list = SessionManager::get_session_by_course($course_id);
37 37
 $total_quota_bytes = DocumentManager::get_course_quota();
38
-$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0);
39
-$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
38
+$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
39
+$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
40 40
 
41 41
 $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
42 42
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
     foreach ($session_list as $session_data) {
47 47
         $quota_percentage = 0;
48 48
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
49
-        if (!empty($quota_bytes))  {
50
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
49
+        if (!empty($quota_bytes)) {
50
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
51 51
         }
52 52
         if ($session_id == $session_data['id']) {
53
-            $session_data['name'] = $session_data['name'] . ' * ';
53
+            $session_data['name'] = $session_data['name'].' * ';
54 54
         }
55 55
         $used_quota_bytes += $quota_bytes;
56 56
         $session[] = array(
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
         $quota_percentage = 0;
67 67
         $my_group_id = $group_data['id'];
68 68
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
69
-        if (!empty($quota_bytes))  {
70
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
69
+        if (!empty($quota_bytes)) {
70
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
71 71
         }
72 72
         if ($group_id == $my_group_id) {
73
-            $group_data['name'] = $group_data['name'] . ' * ';
73
+            $group_data['name'] = $group_data['name'].' * ';
74 74
         }
75 75
         $used_quota_bytes += $quota_bytes;
76 76
         $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+       $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
                 $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']);
99 99
             }
100 100
             if ($quota_bytes != 0) {
101
-                $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
101
+                $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
102 102
             }
103 103
         }
104
-        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
104
+        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
105 105
 
106 106
    }
107 107
 }
108 108
 
109
-$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
109
+$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
110 110
 $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
111 111
 $quota_data = json_encode($session);
112 112
 
Please login to merge, or discard this patch.
main/template/default/auth/courses_list.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 <!-- Actions: The menu with the different options in cathe course management -->
18 18
 <div id="actions" class="actions">
19 19
     <?php if ($action != 'createcoursecategory') { ?>
20
-	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a>
20
+	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a>
21 21
     <?php } ?>
22 22
 </div>
23 23
 
@@ -49,26 +49,26 @@  discard block
 block discarded – undo
49 49
             $max_category_key = count($user_course_categories);
50 50
             if ($action != 'unsubscribe') { ?>
51 51
                 <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
52
-                <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
52
+                <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
53 53
                 </a>
54 54
 
55 55
                 <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
56 56
                         <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
57
-                        <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
57
+                        <?php echo Display::return_icon('up.png', get_lang('Up'), '', 22); ?>
58 58
                         </a>
59 59
                 <?php } else { ?>
60
-                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?>
60
+                    <?php echo Display::return_icon('up_na.png', get_lang('Up'), '', 22); ?>
61 61
                <?php } ?>
62 62
 
63 63
                 <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
64 64
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
65
-                    <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
65
+                    <?php echo Display::return_icon('down.png', get_lang('Down'), '', 22); ?>
66 66
                     </a>
67 67
                 <?php } else { ?>
68
-                    <?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?>
68
+                    <?php echo Display::return_icon('down_na.png', get_lang('Down'), '', 22); ?>
69 69
                 <?php } ?>
70 70
                 <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
71
-                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
71
+                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"), 22) ?>
72 72
                 </a>
73 73
             <?php }
74 74
             echo '<br /><br />';
@@ -122,35 +122,35 @@  discard block
 block discarded – undo
122 122
                     <div style="float:left;width:110px;">
123 123
                     <?php
124 124
                         if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
125
-                            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
125
+                            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
126 126
                     ?>
127 127
                     <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
128
-                        <?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
128
+                        <?php echo Display::return_icon('info.png', $icon_title, '', '22') ?>
129 129
                        <?php } ?>
130 130
                     </a>
131 131
 
132 132
                     <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
133
-                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
133
+                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
134 134
                     <?php } else { ?>
135 135
                         <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
136
-                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
136
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
137 137
                             </a>
138 138
                     <?php } ?>
139 139
 
140 140
                     <?php if ($key > 0) { ?>
141 141
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
142
-                        <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
142
+                        <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22); ?>
143 143
                         </a>
144 144
                     <?php } else { ?>
145
-                        <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
145
+                        <?php echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); ?>
146 146
                     <?php } ?>
147 147
 
148 148
                     <?php if ($key < $number_of_courses - 1) { ?>
149 149
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
150
-                        <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
150
+                        <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
151 151
                         </a>
152 152
                     <?php } else { ?>
153
-                        <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
153
+                        <?php echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); ?>
154 154
                     <?php } ?>
155 155
 
156 156
                   </div>
@@ -221,36 +221,36 @@  discard block
 block discarded – undo
221 221
             <div style="float:left; width:110px">
222 222
             <?php
223 223
             if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
224
-            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
224
+            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
225 225
             ?>
226 226
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
227
-                <?php echo Display::return_icon('info.png', $icon_title, '','22'); ?>
227
+                <?php echo Display::return_icon('info.png', $icon_title, '', '22'); ?>
228 228
             </a>
229 229
             <?php } ?>
230 230
 
231 231
              <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>
232
-                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
232
+                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
233 233
                   <?php } else { ?>
234 234
                     <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
235
-                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
235
+                    <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
236 236
                     </a>
237 237
              <?php } ?>
238 238
 
239 239
             <!-- up /down icons-->
240 240
             <?php if ($key > 0) { ?>
241 241
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
242
-                    <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?>
242
+                    <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22) ?>
243 243
                     </a>
244 244
             <?php } else {
245
-                    echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
245
+                    echo Display::display_icon('up_na.png', get_lang('Up'), '', 22);
246 246
                   }
247 247
 
248 248
                   if ($key < $number_of_courses - 1) { ?>
249 249
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
250
-                    <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
250
+                    <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
251 251
                     </a>
252 252
             <?php } else {
253
-                    echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
253
+                    echo Display::display_icon('down_na.png', get_lang('Down'), '', 22);
254 254
                   }?>
255 255
                 </div>
256 256
                  <div style="float:left; margin-right:10px;">
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.