Merge pull request #41 from 64j/3.1.x

3.1.7

Author: 64j

assets/plugins/templatesedit/class/templatesedit.class.php

@@ -405,7 +405,7 @@ protected function renderTabs(): string
             $this->richtexteditorOptions[$this->evo->getConfig('which_editor')]['ta'] = '';
         }
 
-        foreach ($this->config as $tabName => &$tab) {
+        foreach ($this->config as $tabName => $tab) {
             if ($tab['title'] && $tabName != '#Static') {
                 $tabContent = $this->renderTab($tab);
                 if ($tabContent) {
@@ -620,7 +620,7 @@ protected function renderField(string $key, array $data, array $settings = []):
                     $editor = $this->evo->getConfig('which_editor');
                     if (!empty($tvOptions)) {
                         $editor = $tvOptions['editor'] ?? $this->evo->getConfig('which_editor');
-                    };
+                    }
                     $this->richtexteditorIds[$editor][] = $key;
                     $this->richtexteditorOptions[$editor][$key] = $tvOptions;
                 }
@@ -724,7 +724,7 @@ protected function renderField(string $key, array $data, array $settings = []):
                             ]);
                             $field .= $this->form('input', [
                                 'name' => 'ta',
-                                'value' => !empty($this->doc['content']) ? stripslashes($this->doc['content']) : 'http://',
+                                'value' => !empty($this->doc['content']) ? stripslashes($this->doc['content']) : 'https://',
                                 'class' => $data['class']
                             ]);
                         }
@@ -898,7 +898,7 @@ protected function renderField(string $key, array $data, array $settings = []):
                 $editor = $this->evo->getConfig('which_editor');
                 if (!empty($tvOptions)) {
                     $editor = $tvOptions['editor'] ?? $this->evo->getConfig('which_editor');
-                };
+                }
                 $this->richtexteditorIds[$editor][] = 'tv' . $data['id'];
                 $this->richtexteditorOptions[$editor]['tv' . $data['id']] = $tvOptions;
             }
@@ -1214,7 +1214,7 @@ public function OnDocFormSave(int $id, string $mode): void
                         if (!empty($v['save'])) {
                             if (isset($_REQUEST[$k])) {
                                 if (!empty($v['prepareSave'])) {
-                                    $v = $this->prepare($v['prepareSave'], $_REQUEST[$k]);
+                                    $v = $this->prepare($v['prepareSave'], $_REQUEST[$k], $mode);
                                 } else {
                                     $v = $_REQUEST[$k];
                                 }
@@ -1241,15 +1241,17 @@ public function OnDocFormSave(int $id, string $mode): void
     /**
      * @param string $name
      * @param array $data
+     * @param string|null $mode
      * @return array|false|mixed|string
      */
-    protected function prepare(string $name = 'prepare', array $data = [])
+    protected function prepare(string $name = 'prepare', array $data = [], string $mode = null)
     {
         if (!empty($name)) {
             $params = [
                 'data' => $data,
                 'modx' => $this->evo,
-                '_MF' => $this
+                '_TE' => $this,
+                'mode' => $mode
             ];
 
             if ((is_object($name)) || is_callable($name)) {

assets/plugins/templatesedit/plugin.templatesedit.php

@@ -3,41 +3,40 @@
     die('HACK???');
 }
 
+spl_autoload_register(function ($class) {
+    if (file_exists($class = __DIR__ . '/class/' . $class . '.class.php')) {
+        require_once $class;
+    }
+});
+
 $e = evolutionCMS()->event;
-$templateEditClass = __DIR__ . '/class/templatesedit.class.php';
-$templateEditBuilderClass = __DIR__ . '/class/templateseditbuilder.class.php';
-
-if ($e->name == 'OnDocFormTemplateRender') {
-    global $content;
-    require_once $templateEditClass;
-    $e->addOutput(templatesedit::getInstance($content)
-        ->renderTemplate());
-}
 
-if ($e->name == 'OnDocFormRender') {
-    global $content;
-    require_once $templateEditClass;
-    $e->addOutput(templatesedit::getInstance($content)
-        ->renderAfterTemplate());
-}
+switch ($e->name) {
+    case 'OnDocFormTemplateRender':
+        global $content;
+        $e->addOutput(templatesedit::getInstance($content)
+            ->renderTemplate());
+        break;
 
-if ($e->name == 'OnDocFormSave') {
-    global $content;
-    require_once $templateEditClass;
-    (new templatesedit())->OnDocFormSave((int) $id, (string) $mode);
-}
+    case 'OnDocFormRender':
+        global $content;
+        $e->addOutput(templatesedit::getInstance($content)
+            ->renderAfterTemplate());
+        break;
 
-if ($e->name == 'OnTempFormRender') {
-    require_once $templateEditBuilderClass;
-    $e->addOutput((new templateseditbuilder())->renderTemplate());
-}
+    case 'OnDocFormSave':
+        (new templatesedit())->OnDocFormSave((int) $id, (string) $mode);
+        break;
 
-if ($e->name == 'OnTempFormSave') {
-    require_once $templateEditBuilderClass;
-    (new templateseditbuilder())->saveTemplate();
-}
+    case 'OnTempFormRender':
+        $e->addOutput((new templateseditbuilder())->renderTemplate());
+        break;
+
+    case 'OnTempFormSave':
+        (new templateseditbuilder())->saveTemplate();
+        break;
 
-if ($e->name == 'OnTempFormDelete') {
-    require_once $templateEditBuilderClass;
-    (new templateseditbuilder())->deleteTemplate((int) $id);
+    case 'OnTempFormDelete':
+        (new templateseditbuilder())->deleteTemplate((int) $id);
+        break;
 }

install/assets/plugins/templatesedit.tpl

@@ -5,7 +5,7 @@
  * Кастомизация полей при редактировании документов
  *
  * @category    plugin
- * @version     3.1.6
+ * @version     3.1.7
  * @package     evo
  * @internal    @properties &showTvImage=Show TV thumbnail;list;yes,no;yes &showTvName=Show TV titles;list;yes,no;no &excludeTvCategory=Exclude TV from categories;text
  * @internal    @events OnDocFormTemplateRender,OnDocFormRender,OnDocFormSave,OnTempFormRender,OnTempFormSave,OnTempFormDelete
@@ -14,4 +14,4 @@
  * @author      64j
  */
 
-require MODX_BASE_PATH.'assets/plugins/templatesedit/plugin.templatesedit.php';
+require MODX_BASE_PATH.'assets/plugins/templatesedit/plugin.templatesedit.php';