4.0.0Beta2

PhocaCz · Jan 28, 2022 · 8358bfe · 8358bfe
1 parent 3c101c6
commit 8358bfe
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/README.MD b/README.MD
@@ -65,7 +65,7 @@ Phoca PDF is Joomla! CMS component. It helps to set and create PDF documents in
 
 ## Version (Joomla! 4.x)
 
-4.0.0Beta
+4.0.0Beta2
 
 
 

diff --git a/admin/assets/tcpdf/tcpdf.php b/admin/assets/tcpdf/tcpdf.php
@@ -22914,6 +22914,7 @@ public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $
 			$svgdata = substr($file, 1);
 		} else { // SVG file
             $file = str_replace('\\', '/', $file);//PHOCAEDIT
+
 			$this->svgdir = dirname($file);
             $svgdata = $this->getCachedFileContents($file);
 		}

diff --git a/admin/files/Document/Renderer/Pdf/ModuleRenderer.php b/admin/files/Document/Renderer/Pdf/ModuleRenderer.php
@@ -1,5 +1,3 @@
-use Joomla\CMS\Factory;
-use Joomla\CMS\Helper\ModuleHelper;
 <?php
 /**
  * Joomla! Content Management System
@@ -16,6 +14,8 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Registry\Registry;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\ModuleHelper;
 
 /**
  * HTML document renderer for a single module

diff --git a/admin/files/Document/Renderer/Pdf/ModulesRenderer.php b/admin/files/Document/Renderer/Pdf/ModulesRenderer.php
@@ -1,4 +1,3 @@
-use Joomla\CMS\Factory;
 <?php
 /**
  * Joomla! Content Management System
@@ -14,6 +13,7 @@
 use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Factory;
 
 /**
  * HTML document renderer for a module position

diff --git a/admin/helpers/phocapdf.php b/admin/helpers/phocapdf.php
@@ -159,7 +159,7 @@ public static function renderFTPaccess() {
 	public static function getPhocaInfo($pdf = 1) {
 
 		PluginHelper::importPlugin('phocatools');
-        $results = Factory::getApplication()->triggerEvent('PhocatoolsOnDisplayInfo', array('NjI5NTM4NDcxNzcxMTc='));
+        $results = Factory::getApplication()->triggerEvent('onPhocatoolsOnDisplayInfo', array('NjI5NTM4NDcxNzcxMTc='));
         if (isset($results[0]) && $results[0] === true) {
             return '';
         }
@@ -216,7 +216,7 @@ class PhocaPDFCell
 	public static function setCell($pdf = 1) {
 
 		PluginHelper::importPlugin('phocatools');
-        $results = Factory::getApplication()->triggerEvent('PhocatoolsOnDisplayInfo', array('NjI5NTM4NDcxNzcxMTc='));
+        $results = Factory::getApplication()->triggerEvent('onPhocatoolsOnDisplayInfo', array('NjI5NTM4NDcxNzcxMTc='));
         if (isset($results[0]) && $results[0] === true) {
             return '';
         }

diff --git a/admin/views/phocapdfplugin/tmpl/default_content.php b/admin/views/phocapdfplugin/tmpl/default_content.php
@@ -93,7 +93,7 @@
 
 echo '</div>';
 
-echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
+echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: Joomla.submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
 
 
 

diff --git a/admin/views/phocapdfplugin/tmpl/default_phocacart.php b/admin/views/phocapdfplugin/tmpl/default_phocacart.php
@@ -93,7 +93,7 @@
 
 echo '</div>';
 
-echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
+echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: Joomla.submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
 
 
 

diff --git a/admin/views/phocapdfplugin/tmpl/default_restaurantmenu.php b/admin/views/phocapdfplugin/tmpl/default_restaurantmenu.php
@@ -93,7 +93,7 @@
 
 echo '</div>';
 
-echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
+echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: Joomla.submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>&nbsp;&nbsp;'.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
 
 
 

diff --git a/manifest.xml b/manifest.xml
@@ -29,10 +29,10 @@
 - Phoca PDF plugins. ]]></description>
 		<element>com_phocapdf</element>
 		<type>component</type>
-		<version>4.0.0Beta</version>
-		<infourl title="Phoca PDF 4.0.0Beta">http://www.phoca.cz/version/index.php?phocapdf=4.0.0Beta</infourl>
+		<version>4.0.0Beta2</version>
+		<infourl title="Phoca PDF 4.0.0Beta2">http://www.phoca.cz/version/index.php?phocapdf=4.0.0Beta2</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/PhocaCz/PhocaPDF/releases/download/4.0.0Beta/com_phocapdf_v4.0.0Beta.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/PhocaCz/PhocaPDF/releases/download/4.0.0Beta2/com_phocapdf_v4.0.0Beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

diff --git a/phocapdf-release.png b/phocapdf-release.png
diff --git a/phocapdf.xml b/phocapdf.xml
@@ -2,12 +2,12 @@
 <extension type="component" method="upgrade" version="4.0">
 	<name>com_phocapdf</name>
 	<author>Jan Pavelka (www.phoca.cz)</author>
-	<creationDate>07/12/2021</creationDate>
+	<creationDate>29/01/2022</creationDate>
 	<authorEmail></authorEmail>
 	<authorUrl>https://www.phoca.cz</authorUrl>
 	<copyright>Jan Pavelka</copyright>
 	<license>GNU/GPL</license>
-	<version>4.0.0Beta</version>
+	<version>4.0.0Beta2</version>
 	<description>COM_PHOCAPDF_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 	<projectName>PhocaPDF</projectName>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,7 +65,7 @@ Phoca PDF is Joomla! CMS component. It helps to set and create PDF documents in

		## Version (Joomla! 4.x)

		4.0.0Beta
		4.0.0Beta2



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,7 +93,7 @@

		echo '</div>';

		echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>  '.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';
		echo '<div id="phocapdf-apply"><a href="#" class="btn btn-success" onclick="javascript: Joomla.submitbutton(\'phocapdfplugin.apply\')"><i class="icon-apply icon-white"></i>  '.Text::_('COM_PHOCAPDF_SAVE').'</a></div>';



Expand Down