feat(manager): merge with 1.4.x

AgelxNash · AgelxNash · commit 114d75a06ad6 · 2018-12-19T02:44:13.000Z
META: d5827b6 e88614d 4afe717
diff --git a/manager/actions/logging.static.php b/manager/actions/logging.static.php
@@ -17,7 +17,8 @@
         <div class="container container-body">
             <div class="element-edit-message-tab alert alert-warning"><?= $_lang["mgrlog_query_msg"] ?></div>
 
-            <form action="index.php?a=13" name="logging" method="POST" class="form-group">
+            <form name="logging" method="post" action="index.php" class="form-group">
+                <input type="hidden" name="a" value="13">
                 <div class="row form-row">
                     <div class="col-sm-4 col-md-3 col-lg-2"><b><?= $_lang["mgrlog_user"] ?></b></div>
                     <div class="col-sm-8 col-md-5 col-lg-4">
diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php
@@ -236,7 +236,8 @@ function hideSpans(showSpan)
                 }
             }
         </script>
-        <form action="index.php?a=66" method="post" name="messagefrm">
+        <form name="messagefrm" method="post" action="index.php">
+            <input type="hidden" name="a" value="66">
             <b><?= $_lang['messages_send_to'] ?>:</b>
             <div class="form-group form-inline">
                 <div class="row form-row">
diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php
@@ -426,7 +426,7 @@ function SetUrl(url, width, height, alt) {
 
 </script>
 
-<form name="mutate" id="mutate" class="module" method="post" action="index.php?a=109">
+<form name="mutate" method="post" action="index.php" id="mutate" class="module">
 	<?php
 	// invoke OnModFormPrerender event
 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));
@@ -440,6 +440,7 @@ function SetUrl(url, width, height, alt) {
 	$docBlockList = $modx->convertDocBlockIntoList($docBlock);
 	$internal = array();
 	?>
+    <input type="hidden" name="a" value="109">
 	<input type="hidden" name="id" value="<?= $content['id'] ?>">
 	<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
 
@@ -541,7 +542,7 @@ function SetUrl(url, width, height, alt) {
 				<span><?= $_lang['module_code'] ?></span>
 			</div>
 			<div class="section-editor clearfix">
-				<textarea dir="ltr" class="phptextarea" name="post" rows="20" wrap="soft" onchange="documentDirty=true;"><?= $modx->getPhpCompat()->htmlspecialchars($content['modulecode']) ?></textarea>
+				<textarea dir="ltr" class="phptextarea" name="post" rows="20" wrap="soft" onchange="documentDirty=true;"><?= $modx->getPhpCompat()->htmlspecialchars($content['post'] ?? $content['modulecode']) ?></textarea>
 			</div>
 			<!-- PHP text editor end -->
 		</div>
diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php
@@ -181,7 +181,8 @@ function openSelector(resource, mode, callback, w, h) {
 	}
 </script>
 
-<form name="mutate" method="post" action="index.php?a=113">
+<form name="mutate" method="post" action="index.php">
+    <input type="hidden" name="a" value="113">
 	<input type="hidden" name="op" value="" />
 	<input type="hidden" name="rt" value="" />
 	<input type="hidden" name="newids" value="" />
diff --git a/manager/actions/mutate_role.dynamic.php b/manager/actions/mutate_role.dynamic.php
@@ -77,7 +77,8 @@ function changestate(element) {
 
 </script>
 
-<form action="index.php?a=36" method="post" name="userform" enctype="multipart/form-data">
+<form name="userform" method="post" action="index.php" enctype="multipart/form-data">
+    <input type="hidden" name="a" value="36">
     <input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
     <input type="hidden" name="id" value="<?= $_GET['id'] ?>">
 
diff --git a/manager/actions/mutate_user.dynamic.php b/manager/actions/mutate_user.dynamic.php
@@ -231,7 +231,7 @@ function showHide(what, onoff) {
 
 </script>
 
-<form action="index.php?a=32" method="post" name="userform">
+<form name="userform" method="post" action="index.php">
 	<?php
 
 	// invoke OnUserFormPrerender event
@@ -242,6 +242,7 @@ function showHide(what, onoff) {
 		echo implode("", $evtOut);
 	}
 	?>
+    <input type="hidden" name="a" value="32">
 	<input type="hidden" name="mode" value="<?php echo $modx->getManagerApi()->action; ?>">
 	<input type="hidden" name="id" value="<?php echo $user ?>">
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php
@@ -215,14 +215,15 @@ function showHide(what, onoff) {
 
 </script>
 
-<form action="index.php?a=89" method="post" name="userform">
+<form name="userform" method="post" action="index.php">
 	<?php
 	// invoke OnWUsrFormPrerender event
 	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));
 	if(is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
+    <input type="hidden" name="a" value="89">
 	<input type="hidden" name="mode" value="<?php echo $modx->getManagerApi()->action; ?>" />
 	<input type="hidden" name="id" value="<?php echo $user ?>" />
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
diff --git a/manager/actions/search.static.php b/manager/actions/search.static.php
@@ -27,7 +27,8 @@
 
     <div class="tab-page">
         <div class="container container-body">
-            <form action="index.php?a=71" method="post" name="searchform" enctype="multipart/form-data" class="form-group">
+            <form name="searchform" method="post" action="index.php" enctype="multipart/form-data" class="form-group">
+                <input type="hidden" name="a" value="71">
                 <div class="row form-row">
                     <div class="col-md-3 col-lg-2"><?= $_lang['search_criteria_top'] ?></div>
                     <div class="col-md-9 col-lg-10">
diff --git a/manager/media/style/default/js/modx.js b/manager/media/style/default/js/modx.js
@@ -1588,7 +1588,7 @@
           if (!!w.main.__alertQuit) {
             w.main.alert = function(a) { };
             var message = w.main.document.body.innerHTML;
-            w.main.document.body.innerHTML = '';
+            w.main.document.body.style.display = 'none';
             history.pushState(null, d.title, modx.getActionFromUrl(w.location.search, 2) ? modx.MODX_MANAGER_URL : '#' + w.location.search);
             w.onpopstate = function() {
               history.go(1);
diff --git a/manager/media/style/default/js/modx.min.js b/manager/media/style/default/js/modx.min.js
diff --git a/manager/views/frame/1.blade.php b/manager/views/frame/1.blade.php
@@ -243,13 +243,6 @@
                                         <i class="fa fa-sign-out"></i><?= $_lang['logout'] ?>
                                     </a>
                                 </li>
-                                <?php
-                                $style = $modx->getConfig('settings_version') !== $modx->getVersionData('version') ? 'style="color:#ffff8a;"' : '';
-                                $version = 'Evolution';
-                                ?>
-                                <?php
-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $modx->getPhpCompat()->entities($modx->getConfig('site_name')), $modx->getVersionData('full_appname'), $style, $modx->getConfig('settings_version'));
-                                ?>
                             </ul>
                         </li>
                         <?php if ($modx->hasPermission('settings') || $modx->hasPermission('view_eventlog') || $modx->hasPermission('logs') || $modx->hasPermission('help')) { ?>
@@ -296,6 +289,14 @@
                                     </a>
                                 </li>
                                 <?php } ?>
+
+                                <?php
+                                $style = $modx->getConfig('settings_version') !== $modx->getVersionData('version') ? 'style="color:#ffff8a;"' : '';
+                                $version = 'Evolution';
+                                ?>
+                                <?php
+                                    echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $modx->getPhpCompat()->entities($modx->getConfig('site_name')), $modx->getVersionData('full_appname'), $style, $modx->getConfig('settings_version'));
+                                ?>
                             </ul>
                         </li>
                         <?php } ?>
diff --git a/manager/views/page/password.blade.php b/manager/views/page/password.blade.php
@@ -23,7 +23,8 @@
 
     <div class="tab-page">
         <div class="contaier container-body">
-            <form action="index.php?a=34" method="post" name="userform">
+            <form name="userform" method="post" action="index.php">
+                <input type="hidden" name="a" value="34">
                 <p>{{ ManagerTheme::getLexicon('change_password_message') }}</p>
                 @include('manager::form.input', [
                     'name' => 'pass1',
@@ -41,4 +42,4 @@
             </form>
         </div>
     </div>
-@endsection
+@endsection
diff --git a/manager/views/page/plugin.blade.php b/manager/views/page/plugin.blade.php
@@ -394,9 +394,10 @@ function contains(a, obj)
         </script>
     @endpush
 
-    <form name="mutate" method="post" action="index.php?a=103" enctype="multipart/form-data">
+    <form name="mutate" method="post" action="index.php" enctype="multipart/form-data">
         {!! get_by_key($events, 'OnPluginFormPrerender') !!}
 
+        <input type="hidden" name="a" value="103">
         <input type="hidden" name="id" value="{{ $data->getKey() }}">
         <input type="hidden" name="mode" value="{{ $action }}">
 
diff --git a/manager/views/page/snippet.blade.php b/manager/views/page/snippet.blade.php
@@ -352,9 +352,9 @@ function contains(a, obj)
         </script>
     @endpush
 
-    <form name="mutate" method="post" action="index.php?a=24">
+    <form name="mutate" method="post" action="index.php">
         {!! get_by_key($events, 'OnSnipFormPrerender') !!}
-
+        <input type="hidden" name="a" value="24">
         <input type="hidden" name="id" value="{{ $data->getKey() }}">
         <input type="hidden" name="mode" value="{{ $action }}">
 
diff --git a/manager/views/page/system_settings.blade.php b/manager/views/page/system_settings.blade.php
@@ -17,7 +17,8 @@
         </script>
         <script src="media/script/mutate_settings.js"></script>
     @endpush
-    <form name="settings" action="index.php?a=30" method="post">
+    <form name="settings" method="post" action="index.php">
+        <input type="hidden" name="a" value="30">
         <!-- this field is used to check site settings have been entered/ updated after install or upgrade -->
         <input type="hidden" name="site_id" value="{{ get_by_key($modx->config, 'site_id') }}" />
         <input type="hidden" name="settings_version" value="{{ $modx->getVersionData('version') }}" />

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,8 @@ function hideSpans(showSpan)`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`</script>`
`239`		`- <form action="index.php?a=66" method="post" name="messagefrm">`
	`239`	`+ <form name="messagefrm" method="post" action="index.php">`
	`240`	`+ <input type="hidden" name="a" value="66">`
`240`	`241`	`<b><?= $_lang['messages_send_to'] ?>:</b>`
`241`	`242`	`<div class="form-group form-inline">`
`242`	`243`	`<div class="row form-row">`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,8 @@ function openSelector(resource, mode, callback, w, h) {`
`181`	`181`	`}`
`182`	`182`	`</script>`
`183`	`183`
`184`		`-<form name="mutate" method="post" action="index.php?a=113">`
	`184`	`+<form name="mutate" method="post" action="index.php">`
	`185`	`+ <input type="hidden" name="a" value="113">`
`185`	`186`	`<input type="hidden" name="op" value="" />`
`186`	`187`	`<input type="hidden" name="rt" value="" />`
`187`	`188`	`<input type="hidden" name="newids" value="" />`