Merge pull request #1103 from modxcms/develop

1.2.1

Author: Dmi3yy

assets/cache/images/.htaccess

@@ -1,9 +1,2 @@
-<IfModule !mod_authz_core.c>
-Order allow,deny
-Allow from all
-</IfModule>
-
-<IfModule mod_authz_core.c>
-## configuration for Apache 2.4
-Require all granted
-</IfModule>
+order deny,allow
+allow from all

assets/docs/changelog.txt

@@ -552,11 +552,11 @@ public function save($fire_events = false, $clearCache = false)
                 $this->field[$key] = $value;
             }
             switch (true) {
-                case $key == 'parent' || (!$this->newDoc && $this->isChanged($key)):
+                case $key == 'parent':
                     $parent = (int)$this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
                     if ($this->modx->db->getValue($q) != 1) {
-                        $parent = $value;
+                        $parent = 0;
                     }
                     $this->field[$key] = $parent;
                     $this->Uset($key);

assets/images/logo.png

@@ -52,7 +52,7 @@ public function __construct(\DocumentParser $modx)
         $this->FS = \Helpers\FS::getInstance();
         $this->modx = $modx;
         $this->params = $modx->event->params;
-        $this->rid = isset($_POST[$this->rfName]) ? (int)$_POST[$this->rfName] : 0;
+        $this->rid = isset($_REQUEST[$this->rfName]) ? (int)$_REQUEST[$this->rfName] : 0;
     }
 
     public function callExit()

assets/js/jquery.min.js

@@ -573,10 +573,10 @@ public function getModxSettings()
             $row['default'] = isset($this->gSettingsDefaultValues[$name]) ? '<span class="default-val" style="margin:0.5em 0;float:left;">' . $this->lang('default') . '<i>' . $this->gSettingsDefaultValues[$name] . '</i></span>' : '';
 
             // Simple nested parsing
-            $output = $modx->parseText($settingsRowTpl, $row); // Replace general translations
-            $output = $modx->parseText($output, $ph);          // Replace values / settings
-            $output = $modx->parseText($output, $row);         // Replace new PHs from values / settings
-            $output = $modx->parseText($output, $ph);          // Replace last values / settings
+            $output = $this->parsePlaceholders($settingsRowTpl, $row); // Replace general translations
+            $output = $this->parsePlaceholders($output, $ph);          // Replace values / settings
+            $output = $this->parsePlaceholders($output, $row);         // Replace new PHs from values / settings
+            $output = $this->parsePlaceholders($output, $ph);          // Replace last values / settings
 
             $ph['rows'] .= $output . "\n";
         };
@@ -585,12 +585,17 @@ public function getModxSettings()
 
         $ph['editorLogo'] = !empty($this->pluginParams['editorLogo']) ? '<img src="' . $this->pluginParams['base_url'] . $this->pluginParams['editorLogo'] . '" style="max-height:50px;width:auto;margin-right:50px;" />' : '';
 
-        $settingsBody = $modx->parseText($settingsBody, $ph);
+        $settingsBody = $this->parsePlaceholders($settingsBody, $ph);
         $settingsBody = $this->replaceTranslations($settingsBody);
 
         return $settingsBody;
     }
 
+    public function parsePlaceholders($content, $ph) {
+        foreach($ph as $key=>$value) $content = str_replace('[+'.$key.'+]', $value, $content);
+        return $content;
+    }
+    
     // Replace all translation-placeholders
     public function replaceTranslations($output)
     {

assets/js/jquery/jquery.min.js

@@ -72,15 +72,19 @@ function getFileContents($file) {
     function loadTemplates() {
     	$this->fileGetContents('main.tpl');
     }
-    
+
     function parseTemplate($tpl, $values = array()) {
     	$tpl = array_key_exists($tpl, $this->fileRegister) ? $this->fileRegister[$tpl] : $this->getFileContents($tpl);
     	if($tpl) {
     		if(strpos($tpl,'</body>')!==false) {
     			if(!isset($this->modx->config['mgr_date_picker_path']))   $this->modx->config['mgr_date_picker_path']   = 'media/script/air-datepicker/datepicker.inc.php';
     			$dp = $this->modx->manager->loadDatePicker($this->modx->config['mgr_date_picker_path']);
     			$tpl = str_replace('</body>',$dp.'</body>',$tpl);
-    		}
+                global $modx;
+                $evtOut = $modx->invokeEvent('OnManagerMainFrameHeaderHTMLBlock');
+                $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';
+                $tpl = str_replace('[+onManagerMainFrameHeaderHTMLBlock+]',$onManagerMainFrameHeaderHTMLBlock,$tpl);
+      		}
     		if(!isset($this->modx->config['mgr_jquery_path']))  $this->modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';
     		$tpl = $this->modx->mergeSettingsContent($tpl);
     		foreach ($values as $key => $value) {

assets/lib/MODxAPI/modResource.php

@@ -1,7 +1,7 @@
-<br /><h3>[+lang.DM_adjust_authors_header+]</h3><br />
+<br /><h3><i class="fa fa-user" aria-hidden="true"></i> [+lang.DM_adjust_authors_header+]</h3><br />
 <p>[+lang.DM_adjust_authors_desc+]</p><br />
 
-<form style="margin-left:50px;" name="authors" method="post" action="">
+<form name="authors" method="post" action="">
     <label for="author_createdby">[+lang.DM_adjust_authors_createdby+]</label>
     <select name="author_createdby" style="width:50%">
         <option value="0">[+lang.DM_adjust_authors_noselection+]</option>