Completed
Pull Request — 1.11.x (#1339)
by José
73:57 queued 34:43
created
main/document/webcam_clip.php 1 patch
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.
main/document/download.php 1 patch
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.
main/document/webcam_receiver.php 1 patch
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.
main/document/document_slideshow.inc.php 1 patch
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.
main/document/slideshowoptions.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                     if ($image_resizing == 'noresizing' || $image_resizing == '') {
78 78
                             echo ' checked';
79 79
                     }
80
-		?>>
80
+        ?>>
81 81
             </label>
82 82
             <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
83 83
         </div>
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                         if ($image_resizing == 'resizing_auto' || $image_resizing == '') {
88 88
                                 echo ' checked';
89 89
                         }
90
-		?>>
90
+        ?>>
91 91
             </label>
92 92
             <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
93 93
 	</div>
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
                             $width = $_SESSION['image_resizing_width'];
100 100
                             $height = $_SESSION['image_resizing_height'];
101 101
                     }
102
-		?>>
102
+        ?>>
103 103
             </label>
104 104
             <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
105 105
 	</div>
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
108 108
             <div class="col-sm-3">
109 109
                 <input class="form-control" name="width" type="text" id="width" <?php
110
-		if ($image_resizing == 'resizing') {
111
-			echo ' value="'.$width.'"';
112
-			echo ' class="enabled_input"';
110
+        if ($image_resizing == 'resizing') {
111
+            echo ' value="'.$width.'"';
112
+            echo ' class="enabled_input"';
113 113
                     } else {
114 114
                     echo ' class="disabled_input"';
115 115
                 }
116
-		?> >
116
+        ?> >
117 117
             </div>
118 118
             <div class="col-sm-8"></div>
119 119
         </div>
@@ -121,13 +121,13 @@  discard block
 block discarded – undo
121 121
             <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label>
122 122
             <div class="col-sm-3">
123 123
                 <input class="form-control" name="height" type="text" id="height" <?php
124
-		if ($image_resizing == 'resizing') {
125
-			echo ' value="'.$height.'"';
126
-			echo ' class="enabled_input"';
127
-		} else {
124
+        if ($image_resizing == 'resizing') {
125
+            echo ' value="'.$height.'"';
126
+            echo ' class="enabled_input"';
127
+        } else {
128 128
                         echo ' class="disabled_input"';
129 129
                 }
130
-		?> >
130
+        ?> >
131 131
             </div>
132 132
             <div class="col-sm-8"></div>
133 133
         </div>
Please login to merge, or discard this patch.
main/document/exit_pixlr.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@
 block discarded – undo
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26 26
 if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
29
-	api_not_allowed(true);
27
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
29
+    api_not_allowed(true);
30 30
 } else {
31
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
34
-	unset($_SESSION['exit_pixlr']);
31
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
34
+    unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
main/document/slideshow.inc.php 1 patch
Indentation   +11 added lines, -13 removed lines patch added patch discarded remove patch
@@ -15,8 +15,6 @@  discard block
 block discarded – undo
15 15
 	This file has two large sections.
16 16
 	1. code that belongs in document.php, but to avoid clutter I put the code here
17 17
 	2. the function resize_image that handles the image resizing
18
-
19
-
20 18
  *	@author Patrick Cool
21 19
  *	@package chamilo.document
22 20
  *	@todo convert comments to be understandable to phpDocumentor
@@ -34,16 +32,16 @@  discard block
 block discarded – undo
34 32
  *							view is also possible when you choose not to resize the source images
35 33
  */
36 34
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37
-	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38
-	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
40
-		$new_sizes = api_resize_image($image, $target_width, $target_height);
41
-		$result[] = $new_sizes['height'];
42
-		$result[] = $new_sizes['width'];
43
-	} else {		
35
+    // Modifications by Ivan Tcholakov, 04-MAY-2009.
36
+    $result = array();
37
+    if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
38
+        $new_sizes = api_resize_image($image, $target_width, $target_height);
39
+        $result[] = $new_sizes['height'];
40
+        $result[] = $new_sizes['width'];
41
+    } else {		
44 42
         $size = api_getimagesize($image);
45
-		$result[] = $size['height'];
46
-		$result[] = $size['width'];
47
-	}
48
-	return $result;
43
+        $result[] = $size['height'];
44
+        $result[] = $size['width'];
45
+    }
46
+    return $result;
49 47
 }
Please login to merge, or discard this patch.
main/template/default/auth/courses_list.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
 
29 29
 // COURSES WITH CATEGORIES
30 30
 if (!empty($user_course_categories)) {
31
-       foreach ($user_course_categories as $row) {
32
-           echo Display::page_subheader($row['title']);
33
-           echo '<a name="category'.$row['id'].'"></a>';
31
+        foreach ($user_course_categories as $row) {
32
+            echo Display::page_subheader($row['title']);
33
+            echo '<a name="category'.$row['id'].'"></a>';
34 34
 
35
-           if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
35
+            if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
36 36
             <!-- We display the edit form for the category -->
37 37
 
38 38
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
243 243
                     </a>
244 244
             <?php } else {
245 245
                     echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
246
-                  }
246
+                    }
247 247
 
248
-                  if ($key < $number_of_courses - 1) { ?>
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 250
                     <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
251 251
                     </a>
252 252
             <?php } else {
253 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;">
257 257
                   <!-- cancel subscrioption-->
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
                     </div>
270 270
               <?php }
271 271
                 }
272
-              ?>
272
+                ?>
273 273
             </td>
274 274
             </tr>
275 275
             <?php
Please login to merge, or discard this patch.
main/group/settings.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 /**
5 5
  *	This script displays an area where teachers can edit the group properties and member list.
6
-  *
6
+ *
7 7
  *	@author various contributors
8 8
  *	@author Roan Embrechts (VUB), partial code cleanup, initial virtual course support
9 9
  *	@package chamilo.group
Please login to merge, or discard this patch.