Ticket #1713 - move Attach uploaders in Base Text module.

modules/base/text/classes/BxBaseModTextUploaderHTML5.php

@@ -19,12 +19,6 @@ class BxBaseModTextUploaderHTML5 extends BxTemplUploaderHTML5
         $this->_oModule = BxDolModule::getInstance($this->_sModule);
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $this->_oModule->_oTemplate);
-
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
-            'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
-        ));
     }
 }
 

modules/base/text/classes/BxBaseModTextUploaderHTML5Attach.php

@@ -0,0 +1,33 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    BaseText Base classes for text modules
+ * @ingroup     UnaModules
+ *
+ * @{
+ */
+
+class BxBaseModTextUploaderHTML5Attach extends BxTemplUploaderHTML5
+{
+    protected $_sModule;
+    protected $_oModule;
+
+    public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
+    {
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
+
+        parent::__construct($aObject, $sStorageObject, $sUniqId, $this->_oModule->_oTemplate);
+
+        $this->_sButtonTemplate = 'uploader_button_html5_attach.html';
+
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
+            'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
+        ));
+    }
+}
+
+/** @} */

modules/base/text/classes/BxBaseModTextUploaderSimple.php

@@ -19,12 +19,6 @@ class BxBaseModTextUploaderSimple extends BxTemplUploaderSimple
         $this->_oModule = BxDolModule::getInstance($this->_sModule);
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $this->_oModule->_oTemplate);
-
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
-            'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
-        ));
     }
 }
 

modules/base/text/classes/BxBaseModTextUploaderSimpleAttach.php

@@ -0,0 +1,33 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    BaseText Base classes for text modules
+ * @ingroup     UnaModules
+ *
+ * @{
+ */
+
+class BxBaseModTextUploaderSimpleAttach extends BxTemplUploaderSimple
+{
+    protected $_sModule;
+    protected $_oModule;
+
+    public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
+    {
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
+
+        parent::__construct($aObject, $sStorageObject, $sUniqId, $this->_oModule->_oTemplate);
+
+        $this->_sButtonTemplate = 'uploader_button_simple_attach.html';
+
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
+            'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
+        ));
+    }
+}
+
+/** @} */

modules/base/text/template/uploader_button_html5_attach.html

@@ -0,0 +1 @@
+<bx_include_auto:uploader_button_html5_js.html />

modules/base/text/template/uploader_button_simple_attach.html

@@ -0,0 +1 @@
+<bx_include_auto:uploader_button_simple_js.html />

modules/boonex/posts/classes/BxPostsUploaderHTML5Attach.php

@@ -9,15 +9,13 @@
  * @{
  */
 
-class BxPostsUploaderHTML5Attach extends BxBaseModTextUploaderHTML5
+class BxPostsUploaderHTML5Attach extends BxBaseModTextUploaderHTML5Attach
 {
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
         $this->_sModule = 'bx_posts';
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
-
-        $this->_sButtonTemplate = 'uploader_button_html5_attach.html';
     }
 
     protected function isAdmin ($iContentId = 0)

modules/boonex/posts/classes/BxPostsUploaderSimpleAttach.php

@@ -9,15 +9,13 @@
  * @{
  */
 
-class BxPostsUploaderSimpleAttach extends BxBaseModTextUploaderSimple
+class BxPostsUploaderSimpleAttach extends BxBaseModTextUploaderSimpleAttach
 {
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
         $this->_sModule = 'bx_posts';
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
-
-        $this->_sButtonTemplate = 'uploader_button_simple_attach.html';
     }
 
     protected function isAdmin ($iContentId = 0)

modules/boonex/posts/template/uploader_button_html5_attach.html

@@ -1 +1 @@
-<bx_include_auto:uploader_button_html5_js.html />
+<bx_include_base:../modules/base/text/template/uploader_button_html5_attach.html />

modules/boonex/posts/template/uploader_button_simple_attach.html

@@ -1 +1 @@
-<bx_include_auto:uploader_button_simple_js.html />
+<bx_include_base:../modules/base/text/template/uploader_button_simple_attach.html />

modules/boonex/timeline/classes/BxTimelineUploaderHTML5Attach.php

@@ -9,15 +9,13 @@
  * @{
  */
 
-class BxTimelineUploaderHTML5Attach extends BxBaseModTextUploaderHTML5
+class BxTimelineUploaderHTML5Attach extends BxBaseModTextUploaderHTML5Attach
 {
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
         $this->_sModule = 'bx_timeline';
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
-
-        $this->_sButtonTemplate = 'uploader_button_html5_attach.html';
     }
 }
 

modules/boonex/timeline/classes/BxTimelineUploaderSimpleAttach.php

@@ -9,15 +9,13 @@
  * @{
  */
 
-class BxTimelineUploaderSimpleAttach extends BxBaseModTextUploaderSimple
+class BxTimelineUploaderSimpleAttach extends BxBaseModTextUploaderSimpleAttach
 {
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
         $this->_sModule = 'bx_timeline';
 
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
-
-        $this->_sButtonTemplate = 'uploader_button_simple_attach.html';
     }
 }
 

modules/boonex/timeline/template/uploader_button_html5_attach.html

@@ -1 +1 @@
-<bx_include_auto:uploader_button_html5_js.html />
+<bx_include_base:../modules/base/text/template/uploader_button_html5_attach.html />

modules/boonex/timeline/template/uploader_button_simple_attach.html

@@ -1 +1 @@
-<bx_include_auto:uploader_button_simple_js.html />
+<bx_include_base:../modules/base/text/template/uploader_button_simple_attach.html />