Completed
Push — 1.10.x ( 8104fe...432f77 )
by Angel Fernando Quiroz
125:00 queued 74:07
created
main/inc/ajax/model.ajax.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
         }
732 732
 
733 733
         break;
734
-	case 'get_user_skill_ranking':
734
+    case 'get_user_skill_ranking':
735 735
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
736 736
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
737 737
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@  discard block
 block discarded – undo
1281 1281
 
1282 1282
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
1283 1283
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
1284
-                 $item['has_certificates'] = '1';
1284
+                    $item['has_certificates'] = '1';
1285 1285
             } else {
1286 1286
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
1287 1287
                 $item['has_certificates'] = '0';
Please login to merge, or discard this patch.
main/inc/local.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -758,7 +758,7 @@
 block discarded – undo
758 758
     //    $gidReset = true;
759 759
 } // end else
760 760
 
761
- // Now check for anonymous user mode
761
+    // Now check for anonymous user mode
762 762
 if (isset($use_anonymous) && $use_anonymous) {
763 763
     //if anonymous mode is set, then try to set the current user as anonymous
764 764
     //if he doesn't have a login yet
Please login to merge, or discard this patch.
main/inc/lib/usermanager.lib.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1229,13 +1229,13 @@  discard block
 block discarded – undo
1229 1229
     }
1230 1230
 
1231 1231
     /**
1232
-    * Get the users by ID
1233
-    * @param array $ids student ids
1234
-    * @param string $active
1235
-    * @param string $order
1236
-    * @param string $limit
1237
-    * @return array $result student information
1238
-    */
1232
+     * Get the users by ID
1233
+     * @param array $ids student ids
1234
+     * @param string $active
1235
+     * @param string $order
1236
+     * @param string $limit
1237
+     * @return array $result student information
1238
+     */
1239 1239
     public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null)
1240 1240
     {
1241 1241
         if (empty($ids)) {
@@ -3332,12 +3332,12 @@  discard block
 block discarded – undo
3332 3332
         if ($tag_id == 0) {
3333 3333
             //the tag doesn't exist
3334 3334
             $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)";
3335
-             Database::query($sql);
3335
+                Database::query($sql);
3336 3336
             $last_insert_id = Database::insert_id();
3337 3337
         } else {
3338 3338
             //the tag exists we update it
3339 3339
             $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
3340
-             Database::query($sql);
3340
+                Database::query($sql);
3341 3341
             $last_insert_id = $tag_id;
3342 3342
         }
3343 3343
 
@@ -3532,9 +3532,9 @@  discard block
 block discarded – undo
3532 3532
     }
3533 3533
 
3534 3534
     /**
3535
-      * Get extra filtrable user fields (only type select)
3536
-      * @return array
3537
-      */
3535
+     * Get extra filtrable user fields (only type select)
3536
+     * @return array
3537
+     */
3538 3538
     public static function get_extra_filtrable_fields()
3539 3539
     {
3540 3540
         $extraFieldList = UserManager::get_extra_fields();
@@ -3559,9 +3559,9 @@  discard block
 block discarded – undo
3559 3559
     }
3560 3560
 
3561 3561
     /**
3562
-      * Get extra where clauses for finding users based on extra filtrable user fields (type select)
3563
-      * @return string With AND clauses based on user's ID which have the values to search in extra user fields
3564
-      */
3562
+     * Get extra where clauses for finding users based on extra filtrable user fields (type select)
3563
+     * @return string With AND clauses based on user's ID which have the values to search in extra user fields
3564
+     */
3565 3565
     public static function get_search_form_where_extra_fields()
3566 3566
     {
3567 3567
         $useExtraFields = false;
@@ -3869,23 +3869,23 @@  discard block
 block discarded – undo
3869 3869
     }
3870 3870
 
3871 3871
     /**
3872
-    * Get users followed by human resource manager
3873
-    * @param int $userId
3874
-    * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
3875
-    * @param bool $getOnlyUserId
3876
-    * @param bool $getSql
3877
-    * @param bool $getCount
3878
-    * @param int $from
3879
-    * @param int $numberItems
3880
-    * @param int $column
3881
-    * @param string $direction
3882
-    * @param int $active
3883
-    * @param string $lastConnectionDate
3884
-    * @param int $status the function is called by who? COURSEMANAGER, DRH?
3885
-    * @param string $keyword
3872
+     * Get users followed by human resource manager
3873
+     * @param int $userId
3874
+     * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
3875
+     * @param bool $getOnlyUserId
3876
+     * @param bool $getSql
3877
+     * @param bool $getCount
3878
+     * @param int $from
3879
+     * @param int $numberItems
3880
+     * @param int $column
3881
+     * @param string $direction
3882
+     * @param int $active
3883
+     * @param string $lastConnectionDate
3884
+     * @param int $status the function is called by who? COURSEMANAGER, DRH?
3885
+     * @param string $keyword
3886 3886
      *
3887
-    * @return array user list
3888
-    */
3887
+     * @return array user list
3888
+     */
3889 3889
     public static function getUsersFollowedByUser(
3890 3890
         $userId,
3891 3891
         $userStatus = null,
Please login to merge, or discard this patch.
main/inc/lib/svg-edit/extensions/imagelib/index.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -23,22 +23,22 @@  discard block
 block discarded – undo
23 23
 $array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
24 24
 
25 25
 if (count($array_to_search) > 0) {
26
-	while (list($key) = each($array_to_search)) {
27
-		$all_files[] = basename($array_to_search[$key]['path']);
28
-	}
26
+    while (list($key) = each($array_to_search)) {
27
+        $all_files[] = basename($array_to_search[$key]['path']);
28
+    }
29 29
 }
30 30
 
31 31
 //get all svg and png files
32 32
 $accepted_extensions = array('.svg', '.png');
33 33
 
34 34
 if (is_array($all_files) && count($all_files) > 0) {
35
-	foreach ($all_files as & $file) {
36
-		$slideshow_extension = strrchr($file, '.');
37
-		$slideshow_extension = strtolower($slideshow_extension);
38
-		if (in_array($slideshow_extension, $accepted_extensions)) {
39
-			$png_svg_files[] =$file;
40
-		}
41
-	}
35
+    foreach ($all_files as & $file) {
36
+        $slideshow_extension = strrchr($file, '.');
37
+        $slideshow_extension = strtolower($slideshow_extension);
38
+        if (in_array($slideshow_extension, $accepted_extensions)) {
39
+            $png_svg_files[] =$file;
40
+        }
41
+    }
42 42
 }
43 43
 
44 44
 $disk_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/images/gallery/';
@@ -57,24 +57,24 @@  discard block
 block discarded – undo
57 57
 <?php
58 58
 echo '<h2>'.get_lang('Course').': '.$course_info['name'].'</h2>';
59 59
 if (!empty($png_svg_files)) {
60
-	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
61
-	echo '<ul>';
62
-	foreach($png_svg_files as $filename) {
63
-		$image=$disk_path.$filename;
64
-
65
-		if (strpos($filename, "svg")){
66
-			$new_sizes['width'] = 60;
67
-			$new_sizes['height'] = 60;
68
-		}
69
-		else {
70
-			$new_sizes = api_resize_image($image, 60, 60);
71
-		}
72
-
73
-		echo '<li style="display:inline; padding:8px;"><a href="'.$web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
74
-	}
75
-	echo '</ul>';
60
+    echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
61
+    echo '<ul>';
62
+    foreach($png_svg_files as $filename) {
63
+        $image=$disk_path.$filename;
64
+
65
+        if (strpos($filename, "svg")){
66
+            $new_sizes['width'] = 60;
67
+            $new_sizes['height'] = 60;
68
+        }
69
+        else {
70
+            $new_sizes = api_resize_image($image, 60, 60);
71
+        }
72
+
73
+        echo '<li style="display:inline; padding:8px;"><a href="'.$web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
74
+    }
75
+    echo '</ul>';
76 76
 } else {
77
-	Display::display_warning_message(get_lang('NoSVGImagesInImagesGalleryPath'));
77
+    Display::display_warning_message(get_lang('NoSVGImagesInImagesGalleryPath'));
78 78
 }
79 79
 ?>
80 80
 </body>
Please login to merge, or discard this patch.
main/inc/lib/svg-edit/extensions/imagelib/groups.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 $array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
35 35
 
36 36
 if (count($array_to_search) > 0) {
37
-	while (list($key) = each($array_to_search)) {
38
-		$all_files[] = basename($array_to_search[$key]['path']);
39
-	}
37
+    while (list($key) = each($array_to_search)) {
38
+        $all_files[] = basename($array_to_search[$key]['path']);
39
+    }
40 40
 }
41 41
 
42 42
 //get all svg and png group files
@@ -70,26 +70,26 @@  discard block
 block discarded – undo
70 70
         ($is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'], $groupId))) || $group_properties['doc_state'] == 1
71 71
 ){
72 72
 
73
-	if (!empty($png_svg_files)) {
74
-		echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
75
-		echo '<ul>';
76
-		foreach($png_svg_files as $filename) {
77
-			$image = $group_disk_path.$filename;
78
-
79
-			if (strpos($filename, "svg")){
80
-				$new_sizes['width'] = 60;
81
-				$new_sizes['height'] = 60;
82
-			} else {
83
-				$new_sizes = api_resize_image($image, 60, 60);
84
-			}
73
+    if (!empty($png_svg_files)) {
74
+        echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
75
+        echo '<ul>';
76
+        foreach($png_svg_files as $filename) {
77
+            $image = $group_disk_path.$filename;
78
+
79
+            if (strpos($filename, "svg")){
80
+                $new_sizes['width'] = 60;
81
+                $new_sizes['height'] = 60;
82
+            } else {
83
+                $new_sizes = api_resize_image($image, 60, 60);
84
+            }
85 85
             echo '<li style="display:inline; padding:8px;">';
86 86
             echo '<a href = "'.$group_web_path.$filename.'" alt="'.$filename.'" title="'.$filename.'">';
87 87
             echo '<img src = "'.$group_web_path.$filename.'" width = "'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
88
-		}
89
-		echo '</ul>';
90
-	}
88
+        }
89
+        echo '</ul>';
90
+    }
91 91
 } else {
92
-	echo Display::display_warning_message(get_lang('OnlyAccessFromYourGroup'));
92
+    echo Display::display_warning_message(get_lang('OnlyAccessFromYourGroup'));
93 93
 }
94 94
 ?>
95 95
 </body>
Please login to merge, or discard this patch.
main/inc/lib/group_portal_manager.lib.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1335,27 +1335,27 @@
 block discarded – undo
1335 1335
     public static function get_groups_by_user_count($user_id = null, $relation_type = GROUP_USER_PERMISSION_READER, $with_image = false)
1336 1336
     {
1337 1337
         $table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
1338
-		$tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
1339
-		$user_id = intval($user_id);
1338
+        $tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
1339
+        $user_id = intval($user_id);
1340 1340
 
1341
-		if ($relation_type == 0) {
1342
-			$where_relation_condition = '';
1343
-		} else {
1344
-			$relation_type 			= intval($relation_type);
1345
-			$where_relation_condition = "AND gu.relation_type = $relation_type ";
1346
-		}
1341
+        if ($relation_type == 0) {
1342
+            $where_relation_condition = '';
1343
+        } else {
1344
+            $relation_type 			= intval($relation_type);
1345
+            $where_relation_condition = "AND gu.relation_type = $relation_type ";
1346
+        }
1347 1347
 
1348
-		$sql = "SELECT count(g.id) as count
1348
+        $sql = "SELECT count(g.id) as count
1349 1349
 				FROM $tbl_group g
1350 1350
 				INNER JOIN $table_group_rel_user gu
1351 1351
 				ON gu.group_id = g.id WHERE gu.user_id = $user_id $where_relation_condition ";
1352 1352
 
1353
-		$result = Database::query($sql);
1354
-		if (Database::num_rows($result) > 0) {
1355
-			$row = Database::fetch_array($result, 'ASSOC');
1353
+        $result = Database::query($sql);
1354
+        if (Database::num_rows($result) > 0) {
1355
+            $row = Database::fetch_array($result, 'ASSOC');
1356 1356
             return $row['count'];
1357
-		}
1358
-		return 0;
1357
+        }
1358
+        return 0;
1359 1359
     }
1360 1360
 
1361 1361
     /**
Please login to merge, or discard this patch.
main/inc/lib/extra_field.lib.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
         'changeable',
20 20
         'filter',
21 21
         'extra_field_type',
22
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
22
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
23 23
         'field_loggeable',
24 24
          */
25 25
         'created_at'
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
      * France:Paris;Bretagne;Marseilles;Lyon|Belgique:Bruxelles;Namur;Liège;Bruges|Peru:Lima;Piura;
524 524
      * into
525 525
      * array(
526
- *      'France' =>
526
+     *      'France' =>
527 527
      *      array('Paris', 'Bregtane', 'Marseilles'),
528 528
      *  'Belgique' =>
529 529
      *      array('Namur', 'Liège')
@@ -1184,7 +1184,7 @@  discard block
 block discarded – undo
1184 1184
 
1185 1185
                         if ($this->type == 'user') {
1186 1186
 
1187
-                           /* //the magic should be here
1187
+                            /* //the magic should be here
1188 1188
                             $user_tags = UserManager::get_user_tags($user_id, $field_details[0]);
1189 1189
 
1190 1190
                             $tag_list = '';
Please login to merge, or discard this patch.
main/inc/lib/diagnoser.lib.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -401,19 +401,19 @@
 block discarded – undo
401 401
 
402 402
     public function format_yes_no_optional($value)
403 403
     {
404
-    	$return = '';
405
-    	switch($value) {
406
-     		case 0:
407
-     			$return = get_lang('No');
408
-     			break;
409
-     		case 1:
410
-     			$return = get_lang('Yes');
411
-     			break;
412
-			case 2:
413
-				$return = get_lang('Optional');
414
-				break;
415
-    	}
416
-    	return $return;
404
+        $return = '';
405
+        switch($value) {
406
+                case 0:
407
+                 $return = get_lang('No');
408
+                    break;
409
+                case 1:
410
+                 $return = get_lang('Yes');
411
+                    break;
412
+            case 2:
413
+                $return = get_lang('Optional');
414
+                break;
415
+        }
416
+        return $return;
417 417
 
418 418
     }
419 419
 
Please login to merge, or discard this patch.
main/inc/lib/extra_field_value.lib.php 1 patch
Indentation   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -720,11 +720,11 @@  discard block
 block discarded – undo
720 720
         return false;
721 721
     }
722 722
 
723
-     /**
724
-     * @param int $itemId
725
-     * @param int $fieldId
726
-     * @return array
727
-     */
723
+        /**
724
+         * @param int $itemId
725
+         * @param int $fieldId
726
+         * @return array
727
+         */
728 728
     public function getAllValuesByItemAndField($itemId, $fieldId)
729 729
     {
730 730
         $fieldId = intval($fieldId);
@@ -847,7 +847,6 @@  discard block
 block discarded – undo
847 847
     /**
848 848
      * Deletes all values from an item
849 849
      * @param int $itemId (session id, course id, etc)
850
-
851 850
      * @assert (-1,-1) == null
852 851
      */
853 852
     public function deleteValuesByItem($itemId)
Please login to merge, or discard this patch.