diff --git a/install/setup.sql b/install/setup.sql index 43bc956060..2904c1ed5c 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -1066,6 +1066,7 @@ REPLACE INTO `{PREFIX}system_eventnames` ('203','OnManagerWelcomeRender','2',''), ('204','OnBeforeDocDuplicate','1','Documents'), ('205','OnDocDuplicate','1','Documents'), +('206','OnManagerMainFrameHeaderHTMLBlock','2',''), ('999','OnPageUnauthorized','1',''), ('1000','OnPageNotFound','1',''); diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 9e05a71763..07966ca35a 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -455,7 +455,7 @@ function decode(s){ echo "
"; echo "".$row['groupname'].""; } - $evtnames[] = ''.$row['name']; + $evtnames[] = ''.$row['name']; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index d2973a37e9..ec578c2d5b 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -7,11 +7,44 @@ class DocumentParser { var $db; // db object var $event, $Event; // event object - var $pluginEvent; - var $config= null; - var $rs, $result, $sql, $table_prefix, $debug, $documentIdentifier, $documentMethod, $documentGenerated, $documentContent, $tstart, $minParserPasses, $maxParserPasses, $documentObject, $templateObject, $snippetObjects, $stopOnNotice, $executedQueries, $queryTime, $currentSnippet, $documentName, $aliases, $visitor, $entrypage, $documentListing, $dumpSnippets, $chunkCache, $snippetCache, $contentTypes, $dumpSQL, $queryCode, $virtualDir, $placeholders, $sjscripts, $jscripts, $loadedjscripts, $documentMap; + var $rs; + var $result; + var $sql; + var $table_prefix; + var $debug; + var $documentIdentifier; + var $documentMethod; + var $documentGenerated; + var $documentContent; + var $tstart; + var $minParserPasses; + var $maxParserPasses; + var $documentObject; + var $templateObject; + var $snippetObjects; + var $stopOnNotice; + var $executedQueries; + var $queryTime; + var $currentSnippet; + var $documentName; + var $aliases; + var $visitor; + var $entrypage; + var $documentListing; + var $dumpSnippets; + var $chunkCache; + var $snippetCache; + var $contentTypes; + var $dumpSQL; + var $queryCode; + var $virtualDir; + var $placeholders; + var $sjscripts; + var $jscripts; + var $loadedjscripts; + var $documentMap; var $forwards= 3; // constructor diff --git a/manager/includes/header.inc.php b/manager/includes/header.inc.php index f0831e2ecd..b400f07b3a 100755 --- a/manager/includes/header.inc.php +++ b/manager/includes/header.inc.php @@ -1,6 +1,10 @@ INCLUDE_ORDERING_ERROR

Please use the MODx Content Manager instead of accessing this file directly."); $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; + +// invoke OnManagerRegClientStartupHTMLBlock event +$evtOut = $modx->invokeEvent('OnManagerMainFrameHeaderHTMLBlock'); +$onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? '
' . implode('', $evtOut) . '
' : ''; ?> @@ -10,6 +14,9 @@ style.css" /> + + +