Skip to content

Commit

Permalink
3.10 build
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheesegrits
cheesegrits committed Aug 18, 2021
1 parent 55982d8 commit fdaf7a4
Show file tree
Hide file tree
Showing 304 changed files with 768 additions and 793 deletions.
19 changes: 6 additions & 13 deletions Gruntfile.js
View file
Expand Up @@ -313,18 +313,11 @@ var refreshFiles = function () {
var tmpl;
rimraf.sync('./fabrik_build/output/');
fs.mkdirsSync('./fabrik_build/output/component/admin');
fs.mkdirsSync('./fabrik_build/output/component/site/fabrikfeed');
fs.mkdirsSync('./fabrik_build/output/component/site/pdf');
fs.mkdirsSync('./fabrik_build/output/component/site/partial');
fs.mkdirsSync('./fabrik_build/output/component/site/Document');
fs.mkdirsSync('./fabrik_build/output/component/media');
fs.mkdirsSync('./fabrik_build/output/library');


fs.copySync('libraries/joomla/document/fabrikfeed', './fabrik_build/output/component/site/fabrikfeed');
fs.copySync('libraries/joomla/document/pdf', './fabrik_build/output/component/site/pdf');
fs.copySync('libraries/joomla/document/partial', './fabrik_build/output/component/site/partial');
fs.copySync('libraries/src/Document/PartialDocument.php', './fabrik_build/output/component/site/Document/PartialDocument.php');
fs.copySync('libraries/src/Document/PartialDocument.php', './fabrik_build/output/component/site/Document/PartialDocument.php');
fs.copySync('libraries/src/Document/PdfDocument.php', './fabrik_build/output/component/site/Document/PdfDocument.php');
fs.copySync('libraries/src/Document/Renderer/Partial', './fabrik_build/output/component/site/Document/Renderer/Partial');
fs.copySync('libraries/src/Document/Renderer/Pdf', './fabrik_build/output/component/site/Document/Renderer/Pdf');
Expand Down Expand Up @@ -561,25 +554,25 @@ var ftp = function (grunt, version) {
console.log('connected');
if (grunt.config.get('upload.zips')) {
promises.push(ftpPromise(c, 'fabrik_build/output/pkg_fabrik_' + version + '.zip',
'/public_html/media/downloads/pkg_fabrik_' + version + '.zip'));
'/fabrikar.com/public_html/media/downloads/pkg_fabrik_' + version + '.zip'));
promises.push(ftpPromise(c, 'fabrik_build/output/pkg_fabrik_sink_' + version + '.zip',
'/public_html/media/downloads/pkg_fabrik_sink_' + version + '.zip'));
'/fabrikar.com/public_html/media/downloads/pkg_fabrik_sink_' + version + '.zip'));
promises.push(ftpPromise(c, 'fabrik_build/output/lib_fabrik_' + version + '.zip',
'/public_html/media/downloads/lib_fabrik_' + version + '.zip'));
'/fabrikar.com/public_html/media/downloads/lib_fabrik_' + version + '.zip'));

var plugins = fs.readdirSync('fabrik_build/output/pkg_fabrik_sink/packages');

for (i = 0; i < plugins.length; i++) {
promises.push(ftpPromise(c, 'fabrik_build/output/pkg_fabrik_sink/packages/' + plugins[i],
'/public_html/media/downloads/' + plugins[i]));
'/fabrikar.com/public_html/media/downloads/' + plugins[i]));
}
}
if (grunt.config.get('upload.xml')) {
var xmlFiles = fs.readdirSync('fabrik_build/output/updateserver');

for (i = 0; i < xmlFiles.length; i++) {
promises.push(ftpPromise(c, 'fabrik_build/output/updateserver/' + xmlFiles[i],
'/public_html/update/fabrik31/' + xmlFiles[i]));
'/fabrikar.com/public_html/update/fabrik31/' + xmlFiles[i]));
}
}
Promise.settle(promises)
Expand Down
31 changes: 5 additions & 26 deletions administrator/components/com_fabrik/com_fabrik.manifest.class.php
View file
Expand Up @@ -37,13 +37,6 @@ class Com_FabrikInstallerScript
*/
protected $documents38 = array('Partial', 'Pdf');

/**
* Documents <= 3.7
*
* @var array
*/
protected $documents37 = array('fabrikfeed', 'partial', 'pdf');

/**
* Run when the component is installed
*
Expand Down Expand Up @@ -139,25 +132,11 @@ protected function moveFiles(&$installer, $upgrade = false)
$componentFrontend = 'components/com_fabrik';

if (version_compare($this->getVersion(), '3.8', '<')) {
$docTypes = array('fabrikfeed', 'pdf', 'partial');

foreach ($docTypes as $docType) {
$dest = 'libraries/joomla/document/' . $docType;

if (!JFolder::exists(JPATH_ROOT . '/' . $dest)) {
JFolder::create(JPATH_ROOT . '/' . $dest);
}
// $$$ hugh - have to use false as last arg (use_streams) on JFolder::copy(), otherwise
// it bypasses FTP layer, and will fail if web server does not have write access to J! folders
$moveRes = JFolder::copy($componentFrontend . '/' . $docType, $dest, JPATH_SITE, true, false);

if ($moveRes !== true) {
echo "<p style=\"color:red\">failed to moved " . $componentFrontend . '/fabrikfeed to ' . $dest . '</p>';

return false;
}
}
}
throw new RuntimeException('Fabrik can no longer be installed on versions of Joomla older than 3.8');
}
else if (version_compare($this->getVersion(), '4.0', '>=')) {
throw new RuntimeException('Fabrik can not yet be installed on Joomla 4.x');
}
else
{
$dest = 'libraries/src/Document';
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_fabrik/fabrik.xml
View file
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<extension client="site" method="upgrade" type="component" version="3">
<name>com_fabrik</name>
<creationDate>June 2020</creationDate>
<creationDate>August 2021</creationDate>
<author>Media A-Team, Inc.</author>
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>rob@pollen-8.co.uk</authorEmail>
<authorUrl>www.pollen-8.co.uk</authorUrl>
<version>3.9.2</version>
<version>3.10</version>
<description>COM_FABRIK_XML_DESCRIPTION</description>

<scriptfile>com_fabrik.manifest.class.php</scriptfile>
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_fabrik/pkg_fabrik.xml
View file
Expand Up @@ -2,10 +2,10 @@
<extension type="package" version="3" method="upgrade">
<name>Fabrik Package</name>
<packagename>fabrik</packagename>
<version>3.9.2</version>
<version>3.10</version>
<url>http://www.fabrikar.com</url>
<creationDate>June 2020</creationDate>
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
<creationDate>August 2021</creationDate>
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
<author>Media A-Team, Inc.</author>
<packager>Rob Clayburn</packager>
<packagerurl>http://www.fabrikar.com</packagerurl>
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_fabrik/pkg_fabrik_sink.xml
View file
Expand Up @@ -2,12 +2,12 @@
<extension type="package" version="3">
<name>Fabrik Package</name>
<packagename>fabrik</packagename>
<version>3.9.2</version>
<version>3.10</version>
<url>http://www.joomla.org</url>
<packager>Rob Clayburn</packager>
<packagerurl>http://www.fabrikar.com</packagerurl>
<creationDate>June 2020</creationDate>
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
<creationDate>August 2021</creationDate>
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
<description>Fabrik Free Package</description>
<update>http://fabrikar.com/update/packages/free</update>
<files folder="packages">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fabrik/update/fabrik31/com_fabrik.xml
View file
Expand Up @@ -146,4 +146,4 @@
</update>


<update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4.3</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.3.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.6</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.6.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.7</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.7.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.8</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.8.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.8.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.8.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update></updates>
<update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.4.3</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.4.3.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.5.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.5.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.6</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.6.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.7</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.7.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.8</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.8.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.8.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.8.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9.1</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.1.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.9.2</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.9.2.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update><update><name>Fabrik</name><description>Fabrik Component</description><element>com_fabrik</element><type>component</type><version>3.10</version><downloads><downloadurl type="full" format="zip">http://fabrikar.com/media/downloads/com_fabrik_3.10.zip</downloadurl></downloads><maintainer>Fabrikar.com</maintainer><maintainerurl>http://fabrikar.com</maintainerurl><targetplatform name="joomla" version="3"/></update></updates>

0 comments on commit fdaf7a4

Please sign in to comment.