Skip to content

Commit fdaf7a4

Browse files
cheesegritscheesegrits
committed
3.10 build
1 parent 55982d8 commit fdaf7a4

File tree

304 files changed

+768
-793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+768
-793
lines changed

‎Gruntfile.js‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -313,18 +313,11 @@ var refreshFiles = function () {
313313
var tmpl;
314314
rimraf.sync('./fabrik_build/output/');
315315
fs.mkdirsSync('./fabrik_build/output/component/admin');
316-
fs.mkdirsSync('./fabrik_build/output/component/site/fabrikfeed');
317-
fs.mkdirsSync('./fabrik_build/output/component/site/pdf');
318-
fs.mkdirsSync('./fabrik_build/output/component/site/partial');
319316
fs.mkdirsSync('./fabrik_build/output/component/site/Document');
320317
fs.mkdirsSync('./fabrik_build/output/component/media');
321318
fs.mkdirsSync('./fabrik_build/output/library');
322319

323-
324-
fs.copySync('libraries/joomla/document/fabrikfeed', './fabrik_build/output/component/site/fabrikfeed');
325-
fs.copySync('libraries/joomla/document/pdf', './fabrik_build/output/component/site/pdf');
326-
fs.copySync('libraries/joomla/document/partial', './fabrik_build/output/component/site/partial');
327-
fs.copySync('libraries/src/Document/PartialDocument.php', './fabrik_build/output/component/site/Document/PartialDocument.php');
320+
fs.copySync('libraries/src/Document/PartialDocument.php', './fabrik_build/output/component/site/Document/PartialDocument.php');
328321
fs.copySync('libraries/src/Document/PdfDocument.php', './fabrik_build/output/component/site/Document/PdfDocument.php');
329322
fs.copySync('libraries/src/Document/Renderer/Partial', './fabrik_build/output/component/site/Document/Renderer/Partial');
330323
fs.copySync('libraries/src/Document/Renderer/Pdf', './fabrik_build/output/component/site/Document/Renderer/Pdf');
@@ -561,25 +554,25 @@ var ftp = function (grunt, version) {
561554
console.log('connected');
562555
if (grunt.config.get('upload.zips')) {
563556
promises.push(ftpPromise(c, 'fabrik_build/output/pkg_fabrik_' + version + '.zip',
564-
'/public_html/media/downloads/pkg_fabrik_' + version + '.zip'));
557+
'/fabrikar.com/public_html/media/downloads/pkg_fabrik_' + version + '.zip'));
565558
promises.push(ftpPromise(c, 'fabrik_build/output/pkg_fabrik_sink_' + version + '.zip',
566-
'/public_html/media/downloads/pkg_fabrik_sink_' + version + '.zip'));
559+
'/fabrikar.com/public_html/media/downloads/pkg_fabrik_sink_' + version + '.zip'));
567560
promises.push(ftpPromise(c, 'fabrik_build/output/lib_fabrik_' + version + '.zip',
568-
'/public_html/media/downloads/lib_fabrik_' + version + '.zip'));
561+
'/fabrikar.com/public_html/media/downloads/lib_fabrik_' + version + '.zip'));
569562

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

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

580573
for (i = 0; i < xmlFiles.length; i++) {
581574
promises.push(ftpPromise(c, 'fabrik_build/output/updateserver/' + xmlFiles[i],
582-
'/public_html/update/fabrik31/' + xmlFiles[i]));
575+
'/fabrikar.com/public_html/update/fabrik31/' + xmlFiles[i]));
583576
}
584577
}
585578
Promise.settle(promises)

‎administrator/components/com_fabrik/com_fabrik.manifest.class.php‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ class Com_FabrikInstallerScript
3737
*/
3838
protected $documents38 = array('Partial', 'Pdf');
3939

40-
/**
41-
* Documents <= 3.7
42-
*
43-
* @var array
44-
*/
45-
protected $documents37 = array('fabrikfeed', 'partial', 'pdf');
46-
4740
/**
4841
* Run when the component is installed
4942
*
@@ -139,25 +132,11 @@ protected function moveFiles(&$installer, $upgrade = false)
139132
$componentFrontend = 'components/com_fabrik';
140133

141134
if (version_compare($this->getVersion(), '3.8', '<')) {
142-
$docTypes = array('fabrikfeed', 'pdf', 'partial');
143-
144-
foreach ($docTypes as $docType) {
145-
$dest = 'libraries/joomla/document/' . $docType;
146-
147-
if (!JFolder::exists(JPATH_ROOT . '/' . $dest)) {
148-
JFolder::create(JPATH_ROOT . '/' . $dest);
149-
}
150-
// $$$ hugh - have to use false as last arg (use_streams) on JFolder::copy(), otherwise
151-
// it bypasses FTP layer, and will fail if web server does not have write access to J! folders
152-
$moveRes = JFolder::copy($componentFrontend . '/' . $docType, $dest, JPATH_SITE, true, false);
153-
154-
if ($moveRes !== true) {
155-
echo "<p style=\"color:red\">failed to moved " . $componentFrontend . '/fabrikfeed to ' . $dest . '</p>';
156-
157-
return false;
158-
}
159-
}
160-
}
135+
throw new RuntimeException('Fabrik can no longer be installed on versions of Joomla older than 3.8');
136+
}
137+
else if (version_compare($this->getVersion(), '4.0', '>=')) {
138+
throw new RuntimeException('Fabrik can not yet be installed on Joomla 4.x');
139+
}
161140
else
162141
{
163142
$dest = 'libraries/src/Document';

‎administrator/components/com_fabrik/fabrik.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<extension client="site" method="upgrade" type="component" version="3">
33
<name>com_fabrik</name>
4-
<creationDate>June 2020</creationDate>
4+
<creationDate>August 2021</creationDate>
55
<author>Media A-Team, Inc.</author>
6-
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
6+
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
77
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.pollen-8.co.uk</authorUrl>
10-
<version>3.9.2</version>
10+
<version>3.10</version>
1111
<description>COM_FABRIK_XML_DESCRIPTION</description>
1212

1313
<scriptfile>com_fabrik.manifest.class.php</scriptfile>

‎administrator/components/com_fabrik/pkg_fabrik.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<extension type="package" version="3" method="upgrade">
33
<name>Fabrik Package</name>
44
<packagename>fabrik</packagename>
5-
<version>3.9.2</version>
5+
<version>3.10</version>
66
<url>http://www.fabrikar.com</url>
7-
<creationDate>June 2020</creationDate>
8-
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
7+
<creationDate>August 2021</creationDate>
8+
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
99
<author>Media A-Team, Inc.</author>
1010
<packager>Rob Clayburn</packager>
1111
<packagerurl>http://www.fabrikar.com</packagerurl>

‎administrator/components/com_fabrik/pkg_fabrik_sink.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<extension type="package" version="3">
33
<name>Fabrik Package</name>
44
<packagename>fabrik</packagename>
5-
<version>3.9.2</version>
5+
<version>3.10</version>
66
<url>http://www.joomla.org</url>
77
<packager>Rob Clayburn</packager>
88
<packagerurl>http://www.fabrikar.com</packagerurl>
9-
<creationDate>June 2020</creationDate>
10-
<copyright>Copyright (C) 2005-2020 Media A-Team, Inc. - All rights reserved.</copyright>
9+
<creationDate>August 2021</creationDate>
10+
<copyright>Copyright (C) 2005-2021 Media A-Team, Inc. - All rights reserved.</copyright>
1111
<description>Fabrik Free Package</description>
1212
<update>http://fabrikar.com/update/packages/free</update>
1313
<files folder="packages">

‎administrator/components/com_fabrik/update/fabrik31/com_fabrik.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,4 @@
146146
</update>
147147

148148

149-
<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>
149+
<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 commit comments

Comments
 (0)