Fix some missing ampersands in user role delete links, a=chris

Chris Pollett [2018-05-14 04:May:th]
Fix some missing ampersands in user role delete links, a=chris
Filename
src/views/elements/ManageusersElement.php
diff --git a/src/views/elements/ManageusersElement.php b/src/views/elements/ManageusersElement.php
index 33fee71ca..15a92daf2 100644
--- a/src/views/elements/ManageusersElement.php
+++ b/src/views/elements/ManageusersElement.php
@@ -86,7 +86,7 @@ class ManageusersElement extends Element
             $context = "";
             if ($data['FORM_TYPE'] == 'search' ||
                 !empty($data['context']) && $data['context'] == 'search') {
-                $context = 'context=search&';
+                $context = 'context=search';
             }
             $delete_url = $base_url . "&arg=deleteuser&$context";
             $edit_url = $base_url . "&arg=edituser&$context";
@@ -151,7 +151,7 @@ class ManageusersElement extends Element
                         e('<span class="gray">'.
                             tl('manageusers_element_edit').'</span>');
                     } else {?>
-                        <a href="<?php e($edit_url . 'user_name='.
+                        <a href="<?php e($edit_url . '&amp;user_name='.
                         $user['USER_NAME']); ?>"><?=
                         tl('manageusers_element_edit') ?></a></td>
                         <?php
@@ -164,7 +164,7 @@ class ManageusersElement extends Element
                     ?>
                         <a onclick='javascript:return confirm("<?=
                         tl('manageusers_element_confirm_delete') ?>");'
-                        href="<?= $delete_url . 'user_name='.
+                        href="<?= $delete_url . '&amp;user_name='.
                         $user['USER_NAME'] ?>"><?php
                         e(tl('manageusers_element_delete'));
                     }?></a></td>
@@ -282,7 +282,7 @@ class ManageusersElement extends Element
         if ($edituser) {
             $context = "";
             if (!empty($data['context']) && $data['context'] == 'search') {
-                $context = 'context=search&amp;';
+                $context = 'context=search';
             }
             ?>
             <tr><th class="table-label" style="vertical-align:top"><?=
@@ -295,7 +295,7 @@ class ManageusersElement extends Element
                         if ($data['visible_roles'] == 'true') {
                             $context = "";
                             if (!empty($data['context'])) {
-                                $context = '&amp;context=search';
+                                $context = 'context=search';
                             }
                             $sort_string = urlencode(json_encode(
                                 $data['ROLE_SORTS']));
@@ -360,11 +360,11 @@ class ManageusersElement extends Element
                         } else {
                             e("<td><a href='{$admin_url}a=manageUsers".
                                 "&amp;arg=deleteuserrole&amp;$context".
-                                "role_ids=" . $role_array['ROLE_ID']);
+                                "&amp;role_ids=" . $role_array['ROLE_ID']);
                             e("&amp;user_name=".
                                 $data['CURRENT_USER']['user_name'].
                                 "&amp;".C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN].
-                                "&amp;$visibles&amp;$context$limits'>".
+                                "&amp;$visibles&amp;$limits'>".
                                 tl('manageusers_element_delete').
                                 "</a></td>");
                         }
@@ -388,7 +388,7 @@ class ManageusersElement extends Element
                             if ($limit >= C\NUM_RESULTS_PER_PAGE ) {
                                 ?><a href='<?=
                                 "$action_url&amp;arg=edituser&amp;$context" .
-                                "role_limit=".
+                                "&amp;role_limit=".
                                 ($limit - C\NUM_RESULTS_PER_PAGE) ?>'
                                 >&lt;&lt;</a><?php
                             }
@@ -401,7 +401,7 @@ class ManageusersElement extends Element
                                 C\NUM_RESULTS_PER_PAGE) {
                                 ?><a href='<?=
                                 "$action_url&amp;arg=edituser&amp;$context" .
-                                "role_limit=".
+                                "&amp;role_limit=".
                                 ($limit + C\NUM_RESULTS_PER_PAGE) ?>'
                                 >&gt;&gt;</a>
                             <?php
@@ -440,7 +440,7 @@ class ManageusersElement extends Element
                     if ($data['visible_groups'] == 'true') {
                         $context = "";
                         if (!empty($data['context'])) {
-                            $context = '&amp;context=search';
+                            $context = 'context=search';
                         }
                         $sort_string = urlencode(json_encode(
                             $data['GROUP_SORTS']));
@@ -503,7 +503,7 @@ class ManageusersElement extends Element
                             "</td>");
                         e("<td><a href='{$admin_url}a=manageUsers".
                             "&amp;arg=deleteusergroup&amp;$context".
-                            "group_ids=".
+                            "&amp;group_ids=".
                             $group_array['GROUP_ID']);
                         e("&amp;user_name=".$data['CURRENT_USER']['user_name'].
                             "&amp;".C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN].
@@ -528,7 +528,7 @@ class ManageusersElement extends Element
                             if ($limit >= C\NUM_RESULTS_PER_PAGE ) {
                                 ?><a href='<?=
                                 "$action_url&amp;arg=edituser&amp;$context" .
-                                "group_limit=".
+                                "&amp;group_limit=".
                                 ($limit - C\NUM_RESULTS_PER_PAGE) ?>'
                                 >&lt;&lt;</a><?php
                             }
@@ -542,7 +542,7 @@ class ManageusersElement extends Element
                                 C\NUM_RESULTS_PER_PAGE) {
                                 ?><a href='<?=
                                 "$action_url&amp;arg=edituser&amp;$context" .
-                                "group_limit=".
+                                "&amp;group_limit=".
                                 ($limit + C\NUM_RESULTS_PER_PAGE)
                                 ?>'>&gt;&gt;</a>
                             <?php
@@ -650,4 +650,4 @@ class ManageusersElement extends Element
             $view, $title, $return_form_name, $fields, $dropdowns,
             $postfix);
     }
-}
\ No newline at end of file
+}
ViewGit