Completed
Push — 1.11.x ( 727252...8d45cd )
by José
172:29 queued 138:39
created
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.
main/group/group_edit.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,9 +161,9 @@
 block discarded – undo
161 161
 // possible : number_groups_left > 0 and is group member
162 162
 $possible_users = array();
163 163
 foreach ($complete_user_list as $index => $user) {
164
-     if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) {
164
+        if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) {
165 165
         $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
166
-     }
166
+        }
167 167
 }
168 168
 
169 169
 $group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"');
Please login to merge, or discard this patch.
main/dropbox/dropbox_download.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
             'error'
90 90
         )
91 91
     );
92
-	exit;
92
+    exit;
93 93
 } else {
94 94
     /*      DOWNLOAD THE FILE */
95 95
     // the user is allowed to download the file
Please login to merge, or discard this patch.
main/dropbox/dropbox_functions.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,11 +83,11 @@
 block discarded – undo
83 83
     if (strstr($_POST['action'], 'move_')) {
84 84
         // check move_received_n or move_sent_n command
85 85
         if (strstr($_POST['action'], 'received')) {
86
-              $part = 'received';
87
-              $to_cat_id = str_replace('move_received_', '', $_POST['action']);
86
+                $part = 'received';
87
+                $to_cat_id = str_replace('move_received_', '', $_POST['action']);
88 88
         } else {
89
-              $part = 'sent';
90
-              $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
89
+                $part = 'sent';
90
+                $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
91 91
         }
92 92
 
93 93
         foreach ($checked_file_ids as $value) {
Please login to merge, or discard this patch.