Completed
Pull Request — 1.11.x (#1589)
by José
46:32
created
main/inc/lib/social.lib.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1761,7 +1761,9 @@
 block discarded – undo
1761 1761
             $friendHtml.= '<ul class="nav nav-list">';
1762 1762
             $j = 1;
1763 1763
             for ($k=0; $k < $number_friends; $k++) {
1764
-                if ($j > $number_of_images) break;
1764
+                if ($j > $number_of_images) {
1765
+                    break;
1766
+                }
1765 1767
 
1766 1768
                 if (isset($friends[$k])) {
1767 1769
                     $friend = $friends[$k];
Please login to merge, or discard this patch.
main/admin/ldap_form_add_users_group.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,11 @@
 block discarded – undo
40 40
 	  '</tr>'."\n";
41 41
 while (list ($key, $val) = each($nom_form)) {
42 42
 	$nbre=$nbre+1;
43
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
43
+	if($nbre & 1) {
44
+	    $ndiv=2;
45
+	} else {
46
+	    $ndiv=3;
47
+	}
44 48
 	echo '<tr align="center" id="header'.$ndiv.'">';
45 49
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
46 50
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
Please login to merge, or discard this patch.
main/blog/blog.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -378,9 +378,10 @@
 block discarded – undo
378 378
 	$result = Database::query($sql);
379 379
 	$row = Database::fetch_array($result);
380 380
 
381
-	if ($row['number'] == 1)
382
-		$user_task = true;
383
-}
381
+	if ($row['number'] == 1) {
382
+			$user_task = true;
383
+	}
384
+	}
384 385
 
385 386
 switch ($action) {
386 387
 	case 'new_post':
Please login to merge, or discard this patch.
main/gradebook/lib/fe/userform.class.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@
 block discarded – undo
32 32
         }
33 33
         if ($this->form_type == self :: TYPE_USER_INFO) {
34 34
             $this->build_user_info_form();
35
-        }
36
-        elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
35
+        } elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
37 36
             $this->build_simple_search();
38 37
         }
39 38
         $this->setDefaults();
Please login to merge, or discard this patch.
main/gradebook/lib/user_data_generator.class.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         // sort users array
96 96
         if ($sorting & self :: UDG_SORT_TYPE) {
97 97
             usort($allitems, array('UserDataGenerator', 'sort_by_type'));
98
-        }elseif ($sorting & self :: UDG_SORT_NAME) {
98
+        } elseif ($sorting & self :: UDG_SORT_NAME) {
99 99
             usort($allitems, array('UserDataGenerator', 'sort_by_name'));
100 100
         } elseif ($sorting & self :: UDG_SORT_COURSE) {
101 101
             usort($allitems, array('UserDataGenerator', 'sort_by_course'));
@@ -148,8 +148,9 @@  discard block
 block discarded – undo
148 148
             $row[] = $this->build_category_name($item);
149 149
             $row[] = $this->build_average_column($item, $ignore_score_color);
150 150
             $row[] = $this->build_result_column($item, $ignore_score_color);
151
-            if ($scoredisplay->is_custom())
152
-                $row[] = $this->build_mask_column($item, $ignore_score_color);
151
+            if ($scoredisplay->is_custom()) {
152
+                            $row[] = $this->build_mask_column($item, $ignore_score_color);
153
+            }
153 154
             $data[] = $row;
154 155
         }
155 156
         return $data;
Please login to merge, or discard this patch.
main/dropbox/dropbox_class.inc.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -496,13 +496,19 @@
 block discarded – undo
496 496
 		$id = intval($id);
497 497
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
498 498
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
499
-		if (!Database::query($sql)) return false;
499
+		if (!Database::query($sql)) {
500
+		    return false;
501
+		}
500 502
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
501 503
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
502
-		if (!Database::query($sql)) return false;
504
+		if (!Database::query($sql)) {
505
+		    return false;
506
+		}
503 507
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
504 508
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
505
-		if (!Database::query($sql)) return false;
509
+		if (!Database::query($sql)) {
510
+		    return false;
511
+		}
506 512
 		return true;
507 513
 	}
508 514
 
Please login to merge, or discard this patch.
main/dropbox/dropbox_functions.inc.php 1 patch
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -750,10 +750,15 @@
 block discarded – undo
750 750
             ";
751 751
     $result = Database::query($sql);
752 752
 
753
-    if (!($res = Database::fetch_array($result)))
754
-        die(get_lang('GeneralError').' (code 901)');
755
-    if ($owner == 0) return $res['uploader_id'];
756
-    if ($res['uploader_id'] == $owner) return true;
753
+    if (!($res = Database::fetch_array($result))) {
754
+            die(get_lang('GeneralError').' (code 901)');
755
+    }
756
+    if ($owner == 0) {
757
+        return $res['uploader_id'];
758
+    }
759
+    if ($res['uploader_id'] == $owner) {
760
+        return true;
761
+    }
757 762
     die(get_lang('GeneralError').' (code '.$or_die.')');
758 763
 }
759 764
 
Please login to merge, or discard this patch.
main/lp/learnpath.class.php 1 patch
Braces   +100 added lines, -68 removed lines patch added patch discarded remove patch
@@ -3938,8 +3938,9 @@  discard block
 block discarded – undo
3938 3938
                 WHERE c_id = ".$course_id."
3939 3939
                 ORDER BY display_order";
3940 3940
         $res = Database::query($sql);
3941
-        if ($res === false)
3942
-            return false;
3941
+        if ($res === false) {
3942
+                    return false;
3943
+        }
3943 3944
         $lps = array ();
3944 3945
         $lp_order = array ();
3945 3946
         $num = Database :: num_rows($res);
@@ -4539,8 +4540,9 @@  discard block
 block discarded – undo
4539 4540
         if ($this->debug > 0) {
4540 4541
             error_log('New LP - In learnpath::set_maker()', 0);
4541 4542
         }
4542
-        if (empty ($name))
4543
-            return false;
4543
+        if (empty ($name)) {
4544
+                    return false;
4545
+        }
4544 4546
         $this->maker = $name;
4545 4547
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
4546 4548
         $course_id = api_get_course_int_id();
@@ -4605,8 +4607,9 @@  discard block
 block discarded – undo
4605 4607
     public function set_terms_by_prefix($terms_string, $prefix)
4606 4608
     {
4607 4609
         $course_id = api_get_course_int_id();
4608
-        if (api_get_setting('search_enabled') !== 'true')
4609
-            return false;
4610
+        if (api_get_setting('search_enabled') !== 'true') {
4611
+                    return false;
4612
+        }
4610 4613
 
4611 4614
         if (!extension_loaded('xapian')) {
4612 4615
             return false;
@@ -4619,8 +4622,9 @@  discard block
 block discarded – undo
4619 4622
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
4620 4623
 
4621 4624
         // Don't do anything if no change, verify only at DB, not the search engine.
4622
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
4623
-            return false;
4625
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
4626
+                    return false;
4627
+        }
4624 4628
 
4625 4629
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
4626 4630
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4812,8 +4816,9 @@  discard block
 block discarded – undo
4812 4816
         if ($this->debug > 0) {
4813 4817
             error_log('New LP - In learnpath::set_proximity()', 0);
4814 4818
         }
4815
-        if (empty ($name))
4816
-            return false;
4819
+        if (empty ($name)) {
4820
+                    return false;
4821
+        }
4817 4822
 
4818 4823
         $this->proximity = $name;
4819 4824
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5157,8 +5162,9 @@  discard block
 block discarded – undo
5157 5162
 
5158 5163
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
5159 5164
         $res = Database::query($sql);
5160
-        if ($res === false)
5161
-            return false;
5165
+        if ($res === false) {
5166
+                    return false;
5167
+        }
5162 5168
 
5163 5169
         $num = Database :: num_rows($res);
5164 5170
         // First check the order is correct, globally (might be wrong because
@@ -5469,8 +5475,9 @@  discard block
 block discarded – undo
5469 5475
             $position[$key] = $row['display_order'];
5470 5476
         }
5471 5477
 
5472
-        if (count($array) > 0)
5473
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
5478
+        if (count($array) > 0) {
5479
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
5480
+        }
5474 5481
 
5475 5482
         return $array;
5476 5483
     }
@@ -6242,10 +6249,12 @@  discard block
 block discarded – undo
6242 6249
                     if ($new_comment || $new_title) {
6243 6250
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
6244 6251
                         $ct = '';
6245
-                        if ($new_comment)
6246
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
6247
-                        if ($new_title)
6248
-                            $ct .= ", title='" . Database::escape_string($new_title)."' ";
6252
+                        if ($new_comment) {
6253
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
6254
+                        }
6255
+                        if ($new_title) {
6256
+                                                    $ct .= ", title='" . Database::escape_string($new_title)."' ";
6257
+                        }
6249 6258
 
6250 6259
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
6251 6260
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6269,17 +6278,21 @@  discard block
 block discarded – undo
6269 6278
         // Please, do not modify this dirname formatting.
6270 6279
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
6271 6280
 
6272
-        if (strstr($dir, '..'))
6273
-            $dir = '/';
6281
+        if (strstr($dir, '..')) {
6282
+                    $dir = '/';
6283
+        }
6274 6284
 
6275
-        if ($dir[0] == '.')
6276
-            $dir = substr($dir, 1);
6285
+        if ($dir[0] == '.') {
6286
+                    $dir = substr($dir, 1);
6287
+        }
6277 6288
 
6278
-        if ($dir[0] != '/')
6279
-            $dir = '/' . $dir;
6289
+        if ($dir[0] != '/') {
6290
+                    $dir = '/' . $dir;
6291
+        }
6280 6292
 
6281
-        if ($dir[strlen($dir) - 1] != '/')
6282
-            $dir .= '/';
6293
+        if ($dir[strlen($dir) - 1] != '/') {
6294
+                    $dir .= '/';
6295
+        }
6283 6296
 
6284 6297
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
6285 6298
 
@@ -6344,8 +6357,9 @@  discard block
 block discarded – undo
6344 6357
                 }
6345 6358
                 $return .= '<div style="padding:10px;">';
6346 6359
 
6347
-                if ($msg != '')
6348
-                    $return .= $msg;
6360
+                if ($msg != '') {
6361
+                                    $return .= $msg;
6362
+                }
6349 6363
 
6350 6364
                 $return .= '<h3>'.$row['title'].'</h3>';
6351 6365
                 switch ($row['item_type']) {
@@ -6606,10 +6620,11 @@  discard block
 block discarded – undo
6606 6620
         $item_title			= Security::remove_XSS($item_title);
6607 6621
         $item_description 	= Security::remove_XSS($item_description);
6608 6622
 
6609
-        if ($id != 0 && is_array($extra_info))
6610
-            $parent = $extra_info['parent_item_id'];
6611
-        else
6612
-            $parent = 0;
6623
+        if ($id != 0 && is_array($extra_info)) {
6624
+                    $parent = $extra_info['parent_item_id'];
6625
+        } else {
6626
+                    $parent = 0;
6627
+        }
6613 6628
 
6614 6629
         $sql = "SELECT * FROM " . $tbl_lp_item . "
6615 6630
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6909,8 +6924,9 @@  discard block
 block discarded – undo
6909 6924
                         $arrHide[] = $arrLP[$i]['id'];
6910 6925
                     }
6911 6926
                 } else {
6912
-                    if ($arrLP[$i]['item_type'] == 'dir')
6913
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
6927
+                    if ($arrLP[$i]['item_type'] == 'dir') {
6928
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
6929
+                    }
6914 6930
                 }
6915 6931
             }
6916 6932
 
@@ -6928,11 +6944,13 @@  discard block
 block discarded – undo
6928 6944
 
6929 6945
         for ($i = 0; $i < count($arrLP); $i++) {
6930 6946
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
6931
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
6947
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
6948
+                                    $selected = 'selected="selected" ';
6949
+                } elseif ($action == 'add') {
6932 6950
                     $selected = 'selected="selected" ';
6933
-                elseif ($action == 'add') $selected = 'selected="selected" ';
6934
-                else
6935
-                    $selected = '';
6951
+                } else {
6952
+                                    $selected = '';
6953
+                }
6936 6954
 
6937 6955
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
6938 6956
             }
@@ -6959,9 +6977,11 @@  discard block
 block discarded – undo
6959 6977
                 $arrHide = array ();
6960 6978
                 for ($i = 0; $i < count($arrLP); $i++) {
6961 6979
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
6962
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
6963
-                            $s_selected_position = $arrLP[$i]['id'];
6964
-                        elseif ($action == 'add') $s_selected_position = 0;
6980
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
6981
+                                                    $s_selected_position = $arrLP[$i]['id'];
6982
+                        } elseif ($action == 'add') {
6983
+                            $s_selected_position = 0;
6984
+                        }
6965 6985
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
6966 6986
                     }
6967 6987
                 }
@@ -7153,9 +7173,11 @@  discard block
 block discarded – undo
7153 7173
             $arrHide = array();
7154 7174
             for ($i = 0; $i < count($arrLP); $i++) {
7155 7175
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
7156
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
7157
-                        $s_selected_position = $arrLP[$i]['id'];
7158
-                    elseif ($action == 'add') $s_selected_position = 0;
7176
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
7177
+                                            $s_selected_position = $arrLP[$i]['id'];
7178
+                    } elseif ($action == 'add') {
7179
+                        $s_selected_position = 0;
7180
+                    }
7159 7181
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
7160 7182
                 }
7161 7183
             }
@@ -7350,9 +7372,11 @@  discard block
 block discarded – undo
7350 7372
 
7351 7373
             for ($i = 0; $i < count($arrLP); $i++) {
7352 7374
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
7353
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
7354
-                        $s_selected_position = $arrLP[$i]['id'];
7355
-                    elseif ($action == 'add') $s_selected_position = 0;
7375
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
7376
+                                            $s_selected_position = $arrLP[$i]['id'];
7377
+                    } elseif ($action == 'add') {
7378
+                        $s_selected_position = 0;
7379
+                    }
7356 7380
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
7357 7381
 
7358 7382
                 }
@@ -7386,8 +7410,7 @@  discard block
 block discarded – undo
7386 7410
 
7387 7411
         if (is_numeric($extra_info)) {
7388 7412
             $form->addHidden('path', $extra_info);
7389
-        }
7390
-        elseif (is_array($extra_info)) {
7413
+        } elseif (is_array($extra_info)) {
7391 7414
             $form->addHidden('path', $extra_info['path']);
7392 7415
         }
7393 7416
 
@@ -7440,8 +7463,9 @@  discard block
 block discarded – undo
7440 7463
                     lp_id = " . $this->lp_id . " AND
7441 7464
                     id != $id";
7442 7465
 
7443
-        if ($item_type == 'dir')
7444
-            $sql .= " AND parent_item_id = 0";
7466
+        if ($item_type == 'dir') {
7467
+                    $sql .= " AND parent_item_id = 0";
7468
+        }
7445 7469
 
7446 7470
         $result = Database::query($sql);
7447 7471
         $arrLP = array ();
@@ -7842,9 +7866,11 @@  discard block
 block discarded – undo
7842 7866
             $arrHide = array();
7843 7867
             for ($i = 0; $i < count($arrLP); $i++) {
7844 7868
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir' && $arrLP[$i]['item_type'] !== TOOL_LP_FINAL_ITEM) {
7845
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
7869
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
7870
+                                            $s_selected_position = $arrLP[$i]['id'];
7871
+                    } elseif ($action == 'add') {
7846 7872
                         $s_selected_position = $arrLP[$i]['id'];
7847
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
7873
+                    }
7848 7874
 
7849 7875
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
7850 7876
 
@@ -7855,17 +7881,18 @@  discard block
 block discarded – undo
7855 7881
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
7856 7882
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
7857 7883
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_LP_FINAL_ITEM || $edit == 'true')) {
7858
-                    if (isset ($_POST['content']))
7859
-                        $content = stripslashes($_POST['content']);
7860
-                    elseif (is_array($extra_info)) {
7884
+                    if (isset ($_POST['content'])) {
7885
+                                            $content = stripslashes($_POST['content']);
7886
+                    } elseif (is_array($extra_info)) {
7861 7887
                         //If it's an html document or a text file
7862 7888
                         if (!$no_display_edit_textarea) {
7863 7889
                             $content = $this->display_document($extra_info['path'], false, false);
7864 7890
                         }
7865
-                    } elseif (is_numeric($extra_info))
7866
-                        $content = $this->display_document($extra_info, false, false);
7867
-                    else
7868
-                        $content = '';
7891
+                    } elseif (is_numeric($extra_info)) {
7892
+                                            $content = $this->display_document($extra_info, false, false);
7893
+                    } else {
7894
+                                            $content = '';
7895
+                    }
7869 7896
 
7870 7897
                     if (!$no_display_edit_textarea) {
7871 7898
                         // We need to calculate here some specific settings for the online editor.
@@ -8129,9 +8156,11 @@  discard block
 block discarded – undo
8129 8156
             $arrHide = array();
8130 8157
             for ($i = 0; $i < count($arrLP); $i++) {
8131 8158
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
8132
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
8133
-                        $s_selected_position = $arrLP[$i]['id'];
8134
-                    elseif ($action == 'add') $s_selected_position = 0;
8159
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
8160
+                                            $s_selected_position = $arrLP[$i]['id'];
8161
+                    } elseif ($action == 'add') {
8162
+                        $s_selected_position = 0;
8163
+                    }
8135 8164
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
8136 8165
 
8137 8166
                 }
@@ -8327,9 +8356,11 @@  discard block
 block discarded – undo
8327 8356
             $arrHide = array ();
8328 8357
             for ($i = 0; $i < count($arrLP); $i++) {
8329 8358
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
8330
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
8331
-                        $s_selected_position = $arrLP[$i]['id'];
8332
-                    elseif ($action == 'add') $s_selected_position = 0;
8359
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
8360
+                                            $s_selected_position = $arrLP[$i]['id'];
8361
+                    } elseif ($action == 'add') {
8362
+                        $s_selected_position = 0;
8363
+                    }
8333 8364
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
8334 8365
 
8335 8366
                 }
@@ -9381,10 +9412,11 @@  discard block
 block discarded – undo
9381 9412
 
9382 9413
                 // Dependency to other files - not yet supported.
9383 9414
                 $i = 1;
9384
-                if ($inc_docs)
9385
-                foreach ($inc_docs as $doc_info) {
9415
+                if ($inc_docs) {
9416
+                                foreach ($inc_docs as $doc_info) {
9386 9417
                     if (count($doc_info) < 1 || empty($doc_info[0])) {
9387 9418
                         continue;
9419
+                }
9388 9420
                     }
9389 9421
                     $my_dep = $xmldoc->createElement('resource');
9390 9422
                     $res_id = 'RESOURCE_'.$item->get_id().'_'.$i;
Please login to merge, or discard this patch.
main/session/session_category_edit.php 1 patch
Braces   +354 added lines, -88 removed lines patch added patch discarded remove patch
@@ -84,7 +84,12 @@  discard block
 block discarded – undo
84 84
         <div class="form-group">
85 85
             <label class="col-sm-3 control-label"><?php echo get_lang('SessionName') ?></label>
86 86
             <div class="col-sm-6">
87
-                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>">
87
+                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) {
88
+    echo api_htmlentities($name,ENT_QUOTES,$charset);
89
+} else {
90
+    echo api_htmlentities($infos['name'],ENT_QUOTES,$charset);
91
+}
92
+?>">
88 93
             </div>
89 94
             <div class="col-sm-3"></div>
90 95
         </div>
@@ -100,58 +105,184 @@  discard block
 block discarded – undo
100 105
                 <div class="col-sm-6">
101 106
                     <select name="day_start">
102 107
                         <option value="1">01</option>
103
-                        <option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option>
104
-                        <option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option>
105
-                        <option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option>
106
-                        <option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option>
107
-                        <option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option>
108
-                        <option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option>
109
-                        <option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option>
110
-                        <option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option>
111
-                        <option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option>
112
-                        <option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option>
113
-                        <option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option>
114
-                        <option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option>
115
-                        <option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option>
116
-                        <option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option>
117
-                        <option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option>
118
-                        <option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option>
119
-                        <option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option>
120
-                        <option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option>
121
-                        <option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option>
122
-                        <option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option>
123
-                        <option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option>
124
-                        <option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option>
125
-                        <option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option>
126
-                        <option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option>
127
-                        <option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option>
128
-                        <option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option>
129
-                        <option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option>
130
-                        <option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option>
131
-                        <option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option>
132
-                        <option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option>
108
+                        <option value="2" <?php if($day_start == 2) {
109
+    echo 'selected="selected"';
110
+}
111
+?> >02</option>
112
+                        <option value="3" <?php if($day_start == 3) {
113
+    echo 'selected="selected"';
114
+}
115
+?> >03</option>
116
+                        <option value="4" <?php if($day_start == 4) {
117
+    echo 'selected="selected"';
118
+}
119
+?> >04</option>
120
+                        <option value="5" <?php if($day_start == 5) {
121
+    echo 'selected="selected"';
122
+}
123
+?> >05</option>
124
+                        <option value="6" <?php if($day_start == 6) {
125
+    echo 'selected="selected"';
126
+}
127
+?> >06</option>
128
+                        <option value="7" <?php if($day_start == 7) {
129
+    echo 'selected="selected"';
130
+}
131
+?> >07</option>
132
+                        <option value="8" <?php if($day_start == 8) {
133
+    echo 'selected="selected"';
134
+}
135
+?> >08</option>
136
+                        <option value="9" <?php if($day_start == 9) {
137
+    echo 'selected="selected"';
138
+}
139
+?> >09</option>
140
+                        <option value="10" <?php if($day_start == 10) {
141
+    echo 'selected="selected"';
142
+}
143
+?> >10</option>
144
+                        <option value="11" <?php if($day_start == 11) {
145
+    echo 'selected="selected"';
146
+}
147
+?> >11</option>
148
+                        <option value="12" <?php if($day_start == 12) {
149
+    echo 'selected="selected"';
150
+}
151
+?> >12</option>
152
+                        <option value="13" <?php if($day_start == 13) {
153
+    echo 'selected="selected"';
154
+}
155
+?> >13</option>
156
+                        <option value="14" <?php if($day_start == 14) {
157
+    echo 'selected="selected"';
158
+}
159
+?> >14</option>
160
+                        <option value="15" <?php if($day_start == 15) {
161
+    echo 'selected="selected"';
162
+}
163
+?> >15</option>
164
+                        <option value="16" <?php if($day_start == 16) {
165
+    echo 'selected="selected"';
166
+}
167
+?> >16</option>
168
+                        <option value="17" <?php if($day_start == 17) {
169
+    echo 'selected="selected"';
170
+}
171
+?> >17</option>
172
+                        <option value="18" <?php if($day_start == 18) {
173
+    echo 'selected="selected"';
174
+}
175
+?> >18</option>
176
+                        <option value="19" <?php if($day_start == 19) {
177
+    echo 'selected="selected"';
178
+}
179
+?> >19</option>
180
+                        <option value="20" <?php if($day_start == 20) {
181
+    echo 'selected="selected"';
182
+}
183
+?> >20</option>
184
+                        <option value="21" <?php if($day_start == 21) {
185
+    echo 'selected="selected"';
186
+}
187
+?> >21</option>
188
+                        <option value="22" <?php if($day_start == 22) {
189
+    echo 'selected="selected"';
190
+}
191
+?> >22</option>
192
+                        <option value="23" <?php if($day_start == 23) {
193
+    echo 'selected="selected"';
194
+}
195
+?> >23</option>
196
+                        <option value="24" <?php if($day_start == 24) {
197
+    echo 'selected="selected"';
198
+}
199
+?> >24</option>
200
+                        <option value="25" <?php if($day_start == 25) {
201
+    echo 'selected="selected"';
202
+}
203
+?> >25</option>
204
+                        <option value="26" <?php if($day_start == 26) {
205
+    echo 'selected="selected"';
206
+}
207
+?> >26</option>
208
+                        <option value="27" <?php if($day_start == 27) {
209
+    echo 'selected="selected"';
210
+}
211
+?> >27</option>
212
+                        <option value="28" <?php if($day_start == 28) {
213
+    echo 'selected="selected"';
214
+}
215
+?> >28</option>
216
+                        <option value="29" <?php if($day_start == 29) {
217
+    echo 'selected="selected"';
218
+}
219
+?> >29</option>
220
+                        <option value="30" <?php if($day_start == 30) {
221
+    echo 'selected="selected"';
222
+}
223
+?> >30</option>
224
+                        <option value="31" <?php if($day_start == 31) {
225
+    echo 'selected="selected"';
226
+}
227
+?> >31</option>
133 228
                   </select>
134 229
                   /
135 230
                   <select name="month_start">
136 231
                         <option value="1">01</option>
137
-                        <option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option>
138
-                        <option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option>
139
-                        <option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option>
140
-                        <option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option>
141
-                        <option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option>
142
-                        <option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option>
143
-                        <option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option>
144
-                        <option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option>
145
-                        <option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option>
146
-                        <option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option>
147
-                        <option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option>
232
+                        <option value="2" <?php if($month_start == 2) {
233
+    echo 'selected="selected"';
234
+}
235
+?> >02</option>
236
+                        <option value="3" <?php if($month_start == 3) {
237
+    echo 'selected="selected"';
238
+}
239
+?> >03</option>
240
+                        <option value="4" <?php if($month_start == 4) {
241
+    echo 'selected="selected"';
242
+}
243
+?> >04</option>
244
+                        <option value="5" <?php if($month_start == 5) {
245
+    echo 'selected="selected"';
246
+}
247
+?> >05</option>
248
+                        <option value="6" <?php if($month_start == 6) {
249
+    echo 'selected="selected"';
250
+}
251
+?> >06</option>
252
+                        <option value="7" <?php if($month_start == 7) {
253
+    echo 'selected="selected"';
254
+}
255
+?> >07</option>
256
+                        <option value="8" <?php if($month_start == 8) {
257
+    echo 'selected="selected"';
258
+}
259
+?> >08</option>
260
+                        <option value="9" <?php if($month_start == 9) {
261
+    echo 'selected="selected"';
262
+}
263
+?> >09</option>
264
+                        <option value="10" <?php if($month_start == 10) {
265
+    echo 'selected="selected"';
266
+}
267
+?> >10</option>
268
+                        <option value="11" <?php if($month_start == 11) {
269
+    echo 'selected="selected"';
270
+}
271
+?> >11</option>
272
+                        <option value="12" <?php if($month_start == 12) {
273
+    echo 'selected="selected"';
274
+}
275
+?> >12</option>
148 276
                   </select>
149 277
                   /
150 278
                 <select name="year_start">
151 279
                         <?php
152 280
                         for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
153 281
                         { ?>
154
-                                <option value="<?php echo $i; ?>" <?php if($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
282
+                                <option value="<?php echo $i; ?>" <?php if($year_start == $i) {
283
+    echo 'selected="selected"';
284
+}
285
+?> ><?php echo $i; ?></option>
155 286
                         <?php
156 287
                         } ?>
157 288
                 </select>
@@ -163,53 +294,182 @@  discard block
 block discarded – undo
163 294
                 <div class="col-sm-6">
164 295
                     <select name="day_end">
165 296
                         <option value="0">--</option>
166
-                        <option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option>
167
-                        <option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option>
168
-                        <option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option>
169
-                        <option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option>
170
-                        <option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option>
171
-                        <option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option>
172
-                        <option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option>
173
-                        <option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option>
174
-                        <option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option>
175
-                        <option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option>
176
-                        <option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option>
177
-                        <option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option>
178
-                        <option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option>
179
-                        <option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option>
180
-                        <option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option>
181
-                        <option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option>
182
-                        <option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option>
183
-                        <option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option>
184
-                        <option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option>
185
-                        <option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option>
186
-                        <option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option>
187
-                        <option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option>
188
-                        <option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option>
189
-                        <option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option>
190
-                        <option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option>
191
-                        <option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option>
192
-                        <option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option>
193
-                        <option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option>
194
-                        <option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option>
195
-                        <option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option>
196
-                        <option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option>
297
+                        <option value="1" <?php if($day_end == 1) {
298
+    echo 'selected="selected"';
299
+}
300
+?> >01</option>
301
+                        <option value="2" <?php if($day_end == 2) {
302
+    echo 'selected="selected"';
303
+}
304
+?> >02</option>
305
+                        <option value="3" <?php if($day_end == 3) {
306
+    echo 'selected="selected"';
307
+}
308
+?> >03</option>
309
+                        <option value="4" <?php if($day_end == 4) {
310
+    echo 'selected="selected"';
311
+}
312
+?> >04</option>
313
+                        <option value="5" <?php if($day_end == 5) {
314
+    echo 'selected="selected"';
315
+}
316
+?> >05</option>
317
+                        <option value="6" <?php if($day_end == 6) {
318
+    echo 'selected="selected"';
319
+}
320
+?> >06</option>
321
+                        <option value="7" <?php if($day_end == 7) {
322
+    echo 'selected="selected"';
323
+}
324
+?> >07</option>
325
+                        <option value="8" <?php if($day_end == 8) {
326
+    echo 'selected="selected"';
327
+}
328
+?> >08</option>
329
+                        <option value="9" <?php if($day_end == 9) {
330
+    echo 'selected="selected"';
331
+}
332
+?> >09</option>
333
+                        <option value="10" <?php if($day_end == 10) {
334
+    echo 'selected="selected"';
335
+}
336
+?> >10</option>
337
+                        <option value="11" <?php if($day_end == 11) {
338
+    echo 'selected="selected"';
339
+}
340
+?> >11</option>
341
+                        <option value="12" <?php if($day_end == 12) {
342
+    echo 'selected="selected"';
343
+}
344
+?> >12</option>
345
+                        <option value="13" <?php if($day_end == 13) {
346
+    echo 'selected="selected"';
347
+}
348
+?> >13</option>
349
+                        <option value="14" <?php if($day_end == 14) {
350
+    echo 'selected="selected"';
351
+}
352
+?> >14</option>
353
+                        <option value="15" <?php if($day_end == 15) {
354
+    echo 'selected="selected"';
355
+}
356
+?> >15</option>
357
+                        <option value="16" <?php if($day_end == 16) {
358
+    echo 'selected="selected"';
359
+}
360
+?> >16</option>
361
+                        <option value="17" <?php if($day_end == 17) {
362
+    echo 'selected="selected"';
363
+}
364
+?> >17</option>
365
+                        <option value="18" <?php if($day_end == 18) {
366
+    echo 'selected="selected"';
367
+}
368
+?> >18</option>
369
+                        <option value="19" <?php if($day_end == 19) {
370
+    echo 'selected="selected"';
371
+}
372
+?> >19</option>
373
+                        <option value="20" <?php if($day_end == 20) {
374
+    echo 'selected="selected"';
375
+}
376
+?> >20</option>
377
+                        <option value="21" <?php if($day_end == 21) {
378
+    echo 'selected="selected"';
379
+}
380
+?> >21</option>
381
+                        <option value="22" <?php if($day_end == 22) {
382
+    echo 'selected="selected"';
383
+}
384
+?> >22</option>
385
+                        <option value="23" <?php if($day_end == 23) {
386
+    echo 'selected="selected"';
387
+}
388
+?> >23</option>
389
+                        <option value="24" <?php if($day_end == 24) {
390
+    echo 'selected="selected"';
391
+}
392
+?> >24</option>
393
+                        <option value="25" <?php if($day_end == 25) {
394
+    echo 'selected="selected"';
395
+}
396
+?> >25</option>
397
+                        <option value="26" <?php if($day_end == 26) {
398
+    echo 'selected="selected"';
399
+}
400
+?> >26</option>
401
+                        <option value="27" <?php if($day_end == 27) {
402
+    echo 'selected="selected"';
403
+}
404
+?> >27</option>
405
+                        <option value="28" <?php if($day_end == 28) {
406
+    echo 'selected="selected"';
407
+}
408
+?> >28</option>
409
+                        <option value="29" <?php if($day_end == 29) {
410
+    echo 'selected="selected"';
411
+}
412
+?> >29</option>
413
+                        <option value="30" <?php if($day_end == 30) {
414
+    echo 'selected="selected"';
415
+}
416
+?> >30</option>
417
+                        <option value="31" <?php if($day_end == 31) {
418
+    echo 'selected="selected"';
419
+}
420
+?> >31</option>
197 421
                   </select>
198 422
                   /
199 423
                   <select name="month_end">
200 424
                         <option value="0">--</option>
201
-                        <option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option>
202
-                        <option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option>
203
-                        <option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option>
204
-                        <option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option>
205
-                        <option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option>
206
-                        <option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option>
207
-                        <option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option>
208
-                        <option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option>
209
-                        <option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option>
210
-                        <option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option>
211
-                        <option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option>
212
-                        <option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option>
425
+                        <option value="1" <?php if($month_end == 1) {
426
+    echo 'selected="selected"';
427
+}
428
+?> >01</option>
429
+                        <option value="2" <?php if($month_end == 2) {
430
+    echo 'selected="selected"';
431
+}
432
+?> >02</option>
433
+                        <option value="3" <?php if($month_end == 3) {
434
+    echo 'selected="selected"';
435
+}
436
+?> >03</option>
437
+                        <option value="4" <?php if($month_end == 4) {
438
+    echo 'selected="selected"';
439
+}
440
+?> >04</option>
441
+                        <option value="5" <?php if($month_end == 5) {
442
+    echo 'selected="selected"';
443
+}
444
+?> >05</option>
445
+                        <option value="6" <?php if($month_end == 6) {
446
+    echo 'selected="selected"';
447
+}
448
+?> >06</option>
449
+                        <option value="7" <?php if($month_end == 7) {
450
+    echo 'selected="selected"';
451
+}
452
+?> >07</option>
453
+                        <option value="8" <?php if($month_end == 8) {
454
+    echo 'selected="selected"';
455
+}
456
+?> >08</option>
457
+                        <option value="9" <?php if($month_end == 9) {
458
+    echo 'selected="selected"';
459
+}
460
+?> >09</option>
461
+                        <option value="10" <?php if($month_end == 10) {
462
+    echo 'selected="selected"';
463
+}
464
+?> >10</option>
465
+                        <option value="11" <?php if($month_end == 11) {
466
+    echo 'selected="selected"';
467
+}
468
+?> >11</option>
469
+                        <option value="12" <?php if($month_end == 12) {
470
+    echo 'selected="selected"';
471
+}
472
+?> >12</option>
213 473
                   </select>
214 474
                   /
215 475
                   <select name="year_end">
@@ -217,7 +477,10 @@  discard block
 block discarded – undo
217 477
                         <?php
218 478
                         for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
219 479
                         { ?>
220
-                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
480
+                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) {
481
+    echo 'selected="selected"';
482
+}
483
+?> ><?php echo $i; ?></option>
221 484
                         <?php
222 485
                         } ?>
223 486
                  </select>
@@ -238,7 +501,10 @@  discard block
 block discarded – undo
238 501
 
239 502
 
240 503
 <script>
241
-<?php if($year_start=="0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
504
+<?php if($year_start=="0000") {
505
+    echo "setDisable(document.form.nolimit);\r\n";
506
+}
507
+?>
242 508
 function setDisable(select){
243 509
 	document.form.day_start.disabled = (select.checked) ? true : false;
244 510
 	document.form.month_start.disabled = (select.checked) ? true : false;
Please login to merge, or discard this patch.