v1.11.3

hiteshaggarwal · hiteshaggarwal · commit 1606ca8c5d0f · 2021-03-22T18:20:50.000+05:30
diff --git a/com_jdbuilder/administrator/config.xml b/com_jdbuilder/administrator/config.xml
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+    <fieldset label="COM_JDBUILDER" name="jdbuilder">
+        <field name="key" type="text" default="" label="JDB_ACTIVATION_KEY"></field>
+        <field name="gmapkey" type="text" default="" label="JDB_GOOGLE_MAP_KEY"></field>
+        <field type="spacer" name="gmapkeySpacer" hr="true" />
+        <field name="fbAppId" type="text" default="" description="JDB_FACEBOOK_SDK_ALERT" label="JDB_FB_APP_ID"></field>
+        <field type="spacer" name="fbAppIdSpacer" hr="false" label="JDB_FACEBOOK_SDK_ALERT" />
+        <field name="captchaspacer" type="spacer" label="JDB_FIELD_SPACER"></field>
+        <field name="recaptchaSiteKey" type="text" default="" label="JDB_RECAPTCHA_SITE_KEY"></field>
+        <field name="recaptchaSecretKey" type="text" default="" label="JDB_RECAPTCHA_SECRET_KEY"></field>
+        <field type="spacer" name="mailchimpSpacer" hr="true" />
+        <field name="mailchimp_keys" type="subform" multiple="true" label="MailChimp Key(s)">
+            <form>
+                <field required="true" name="prefix" label="Server Prefix" type="text" description="To find the value for the server prefix, log into your Mailchimp account and look at the URL in your browser. You’ll see something like https://us19.admin.mailchimp.com/ — the us19 part is the server prefix. Note that your specific value may be different." />
+                <field required="true" name="key" label="Key" type="text" />
+            </form>
+        </field>
+        <field name="convertkit_keys" type="subform" multiple="true" label="ConvertKit Key(s)">
+            <form>
+                <field required="true" name="key" label="API Key" type="text" />
+                <field required="true" name="secret" label="API Secret" type="text" />
+            </form>
+        </field>
+        <field name="activecampaign_keys" type="subform" multiple="true" label="ActiveCampaign Key(s)">
+            <form>
+                <field required="true" name="url" label="URL" type="text" />
+                <field required="true" name="key" label="Key" type="text" />
+            </form>
+        </field>
+    </fieldset>
+
     <fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
         <field name="rules" type="rules" component="com_jdbuilder" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
     </fieldset>
@@ -19,4 +49,15 @@
             <option value="1">JDB_YES</option>
         </field>
     </fieldset>
+    <fieldset label="JDB_INTEGRATIONS_TITLE" name="integrations">
+        <field name="article_integration" type="radio" class="btn-group btn-group-yesno" default="1" label="JDB_JOOMLA_ARTICLES_INTEGRATION">
+            <option value="0">JDB_DISABLED</option>
+            <option value="1">JDB_ENABLED</option>
+        </field>
+        <field name="fontawesomepro_integration" type="radio" class="btn-group btn-group-yesno" default="0" label="JDB_JOOMLA_FA_INTEGRATION">
+            <option value="0">JDB_DISABLED</option>
+            <option value="1">JDB_ENABLED</option>
+        </field>
+        <field type="spacer" name="fontawesomepro_integration_spacer" hr="false" label="COM_JDBUILDER_FA_PRO_DESC" />
+    </fieldset>
 </config>
diff --git a/com_jdbuilder/administrator/controllers/integrations.php b/com_jdbuilder/administrator/controllers/integrations.php
@@ -73,7 +73,7 @@ public function faToggle()
         }
         try {
             $params = JComponentHelper::getParams('com_jdbuilder');
-            $fontawesomepro_integration = $params->get('fontawesomepro_integration',  1);
+            $fontawesomepro_integration = 0;
 
             $fontawesomepro_integration = $fontawesomepro_integration ? 0 : 1;
             $params->set('fontawesomepro_integration', $fontawesomepro_integration);
diff --git a/com_jdbuilder/administrator/helpers/jdbuilder.php b/com_jdbuilder/administrator/helpers/jdbuilder.php
@@ -127,14 +127,14 @@ public static function versionMessage()
    public static function updateMessage()
    {
       $latest = Helper::getJDBuilderLatestVersion();
-      if ($latest == 'v' . JDB_VERSION) return '';
+      if ($latest == JDB_VERSION) return '';
       $isPro = file_exists(JPATH_PLUGINS . '/system/jdbuilder/options/default-pro.xml');
 
       $document = JFactory::getDocument();
       $document->addStyleDeclaration('.jdb-update-message{background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);box-shadow:8px 8px 8px rgba(221, 221, 221, 0.81);overflow:hidden;border-radius:4px;display:flex;color:#fff;margin-bottom:25px;line-height: 1.5rem;font-size:14px;}.jdb-update-message h4{font-size:16px;margin:0 0 10px;}body.admin.com_jdbuilder #content .jdb-update-message a{color:#fff;}.jdb-update-logo{color: white;width: 100px;display: grid;align-items: center;padding: 15px;box-sizing: border-box;background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);margin-right:10px;}.jdb-content{padding:20px 10px;align-self:center;}.jdb-content p{color:#f1f1f1;margin:0;}.jdb-content strong{color:#fff;}');
 
       $link = $isPro ? 'https://www.joomdev.com/my-downloads/jd-builder-pro' : 'https://github.com/joomdev/JD-Builder/releases/tag/' . $latest;
       return '<div style="padding-right: 10px;" class="alert alert-danger">
-         <div style="display:flex;justify-content:space-between;align-items:center">' . JText::sprintf('COM_JDBUILDER_UPDATE_MSG', ('v' . JDB_VERSION), $latest, $link) . '</div></div>';
+         <div style="display:flex;justify-content:space-between;align-items:center">' . JText::sprintf('COM_JDBUILDER_UPDATE_MSG', ('v' . JDB_VERSION), 'v' . $latest, $link) . '</div></div>';
    }
 }
diff --git a/com_jdbuilder/administrator/views/integrations/tmpl/default.php b/com_jdbuilder/administrator/views/integrations/tmpl/default.php
@@ -19,7 +19,7 @@
 $article_integration = $buiderConfig->get('article_integration',  1);
 $article_integration = defined('JDB_PRO') && !JDB_PRO ? 0 : $article_integration;
 
-$fa_integration = $buiderConfig->get('fontawesomepro_integration',  0);
+$fa_integration = 0;
 $fa_integration = defined('JDB_PRO') && !JDB_PRO ? 0 : $fa_integration;
 
 ?>
diff --git a/com_jdbuilder/jdbuilder.xml b/com_jdbuilder/jdbuilder.xml
@@ -8,7 +8,7 @@
    <author>Team Joomdev</author>
    <authorEmail>info@joomdev.com</authorEmail>
    <authorUrl>https://www.joomdev.com</authorUrl>
-   <version>1.11.2</version>
+   <version>1.11.3</version>
    <description>{jdbcomdesc}</description>
    <install> <!-- Runs on install -->
       <sql>
diff --git a/mod_jdbuilder/mod_jdbuilder.xml b/mod_jdbuilder/mod_jdbuilder.xml
@@ -7,7 +7,7 @@
     <authorUrl>https://www.joomdev.com</authorUrl>
     <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-    <version>1.11.2</version>
+    <version>1.11.3</version>
     <description>This Module allows you to create your own Module using the JD Builder.</description>
     <files>
         <filename>mod_jdbuilder.xml</filename>
diff --git a/pkg_jdbuilder.xml b/pkg_jdbuilder.xml
@@ -7,7 +7,7 @@
    <packagerurl>https://www.joomdev.com</packagerurl>
    <author>Team JoomDev</author>
    <creationDate>Oct 2020</creationDate>
-   <version>1.11.2</version>
+   <version>1.11.3</version>
    <url>https://www.joomdev.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/plg_jdbuilder/elements/inner-row/inner-row.xml b/plg_jdbuilder/elements/inner-row/inner-row.xml
@@ -83,6 +83,10 @@
                <option value="">JDB_INHERIT</option>
                <option value="cover">JDB_BACKGROUND_SIZE_COVER</option>
                <option value="contain">JDB_BACKGROUND_SIZE_CONTAIN</option>
+               <option value="custom">JDB_CUSTOM</option>
+            </field>
+
+            <field type="slider" name="backgroundWidth" label="Background Width" description="" default='{"value":100,"unit":"%"}' max="1600" min="0" units="px,%,vw" showon="params.background=='image'[AND]params.backgroundImage!=''[AND]params.backgroundSize=='custom'" group="background" responsive="true">
             </field>
 
             <field type="list" search="false" name="backgroundAttachment" label="JDB_BACKGROUND_ATTACHMENT" group="background" showon="params.background=='image'[AND]params.backgroundImage!=''" width="6" default="">
@@ -101,6 +105,13 @@
                <option value="center top">JDB_BACKGROUND_POSITION_CENTER_TOP</option>
                <option value="center center">JDB_BACKGROUND_POSITION_LABEL_CENTER_CENTER</option>
                <option value="center bottom">JDB_BACKGROUND_POSITION_CENTER_BOTTOM</option>
+               <option value="custom">JDB_CUSTOM</option>
+            </field>
+
+            <field type="slider" name="backgroundXPosition" label="JDB_BACKGROUND_OVERLAY_X_POSITION" default='{"value":0,"unit":"px"}' max="1600" min="-1600" units="px,%,vw" showon="params.backgroundPosition=='custom'" group="background" responsive="true">
+            </field>
+
+            <field type="slider" name="backgroundYPosition" label="JDB_BACKGROUND_OVERLAY_Y_POSITION" default='{"value":0,"unit":"px"}' max="1600" min="-1600" units="px,%,vh" showon="params.backgroundPosition=='custom'" group="background" responsive="true">
             </field>
 
             <!--  Background Video -->
diff --git a/plg_jdbuilder/jdbuilder.php b/plg_jdbuilder/jdbuilder.php
@@ -29,7 +29,7 @@ public function onAfterRoute()
       define('JDB_JOOMLA_VERSION', Helper::getJoomlaVersion());
       \JDPageBuilder\Builder::init($this->app);
       $stat = stat(JDBPATH_PLUGIN . '/jdbuilder.php');
-      define('JDB_MEDIA_VERSION', JDB_DEV ? 149 : md5($stat['mtime']));
+      define('JDB_MEDIA_VERSION', JDB_DEV ? 151 : md5($stat['mtime']));
       if ($this->app->isClient('administrator')) {
          $buiderConfig = JComponentHelper::getParams('com_jdbuilder');
 
@@ -508,10 +508,19 @@ public function addAdminMenu()
          $adminMenu = '<ul class="nav"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">' . \JText::_('COM_JDBUILDER') . '' . \JText::_('JDBUILDER_VERSION_LABEL') . '<span class="caret"></span></a><ul class="dropdown-menu scroll-menu"><li><a class="no-dropdown"  href="index.php?option=com_jdbuilder&view=pages">' . \JText::_('COM_JDBUILDER_TITLE_PAGES') . '</a></li><li><a class="no-dropdown"  href="index.php?option=com_categories&extension=com_jdbuilder">' . \JText::_('JCATEGORIES') . '</a></li><li><a class="no-dropdown"  href="index.php?option=com_jdbuilder&view=integrations">' . \JText::_('COM_JDBUILDER_TITLE_INTEGRATIONS') . '</a></li><li><a class="no-dropdown"  href="index.php?option=com_config&view=component&component=com_jdbuilder">' . \JText::_('COM_JDBUILDER_TITLE_SETTINGS') . '</a></li></ul></li></ul>';
       }
       $body = $this->app->getBody();
-      $body = str_replace('<ul id="nav-empty"', $adminMenu . '<ul id="nav-empty"', $body);
+      $body = preg_replace('/' . preg_quote('<ul id="nav-empty"', '/') . '/', $adminMenu . '<ul id="nav-empty"', $body, 1);
       $this->app->setBody($body);
    }
 
+   public function onContentBeforeSave($context, $article, $isNew)
+   {
+      if ($context == 'com_advancedmodules.module') {
+         return $this->onExtensionBeforeSave($context, $article, $isNew);
+      }
+
+      return true;
+   }
+
    public function onExtensionBeforeSave($context, $item, $isNew)
    {
       if (($context !== 'com_modules.module' && $context != 'com_advancedmodules.module') || $item->module !== 'mod_jdbuilder') {
diff --git a/plg_jdbuilder/jdbuilder.xml b/plg_jdbuilder/jdbuilder.xml
@@ -7,7 +7,7 @@
    <authorUrl>https://www.joomdev.com</authorUrl>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-   <version>1.11.2</version>
+   <version>1.11.3</version>
    <description>{jdbplgdesc}</description>
    <files>
       <filename plugin="jdbuilder">jdbuilder.php</filename>
diff --git a/plg_jdbuilder/language/en-GB/en-GB.jdbuilder.ini b/plg_jdbuilder/language/en-GB/en-GB.jdbuilder.ini
@@ -399,7 +399,7 @@ JDB_VERTICAL="Vertical"
 
 ; Link Options
 JDB_LINK_LABEL="Link"
-JDB_LINK_TARGET_LBL="Open in new window"
+JDB_LINK_TARGET_LBL="Open in new tab"
 JDB_LINK_NOFOLLOW_LBL="Add nofollow"
 JDB_APPLY_LINK_ON="Apply Link On"
 JDB_ENABLE_LINK_ON_LBL="Enable Link on"
@@ -641,7 +641,7 @@ JDB_LANGUAGE="Language"
 JDB_CUSTOM_CODE="Custom Code"
 JDB_PERMISSIONS="Permissions"
 JDB_CSS="CSS"
-JDB_PAGE_CUSTOM_JS_ALERT="Attention: Custom JS may not work in live preview. Please open in new window to make JS working."
+JDB_PAGE_CUSTOM_JS_ALERT="Attention: Custom JS may not work in live preview. Please open in new tab to make JS working."
 JDB_PAGE_JAVASCRIPT="JavaScript"
 JDB_PAGE_CUSTOM_CSS="Custom CSS"
 
diff --git a/plg_jdbuilder/libraries/jdpagebuilder/Helper.php b/plg_jdbuilder/libraries/jdpagebuilder/Helper.php
@@ -2279,23 +2279,7 @@ public static function JDBParams($object, $prefix = '', $postfix = '')
 
    public static function getJDBuilderLatestVersion()
    {
-      /* $client = new CurlHttpClient();
-      $response = $client->request('GET', 'https://api.github.com/repos/joomdev/JD-Builder/releases', [
-         'headers' => [
-            'User-Agent' => 'JOOMDEV-API',
-            'Accept'     => 'application/json'
-         ],
-         'verify_peer' => false,
-         'verify_host' => false
-      ]);
-      $status = $response->getStatusCode();
-      if ($status !== 200) {
-         throw new \Exception((string) $response->getContent(), $status);
-      }
-
-      $releases = (string) $response->getContent();
-      $releases = \json_decode($releases, true);
-      return $releases[0]['tag_name']; */
-	  return '1.11.2';
+      $data = self::jdApiRequest('GET', 'latest-release/jd_builder', []);
+      return $data['data'];
    }
 }
diff --git a/plg_jdbuilder/libraries/jdpagebuilder/Helpers/AuditHelper.php b/plg_jdbuilder/libraries/jdpagebuilder/Helpers/AuditHelper.php
@@ -154,60 +154,6 @@ public static function getJDBArticlesForAudit($onlyActive = false)
         return $articles;
     }
 
-    public static function auditArticles()
-    {
-        $db = \JFactory::getDbo();
-        $JDBArticles = self::getJDBArticlesForAudit();
-
-        $layouts = [];
-        $articles = [];
-        foreach ($JDBArticles as $article) {
-            $articles[$article->id] = $article;
-            $articleParams = \json_decode($article->attribs, true);
-            $layoutId = @$articleParams['jdbuilder_layout_id'];
-            if (!empty($layoutId)) {
-                if (!isset($layouts[$layoutId])) {
-                    $layouts[$layoutId] = [];
-                }
-                $layouts[$layoutId][] = $article->id;
-            }
-        }
-
-        $checkedArticles = [];
-        foreach ($layouts as $layoutId => $articlesID) {
-            if (count($articlesID) > 1) {
-                sort($articlesID);
-                foreach ($articlesID as $index => $articleID) {
-                    if ($index !== 0 && empty($articles[$articleID]->audit_status)) {
-                        self::fixArticle($articleID, $layoutId, $articles[$articleID]->attribs);
-                    } else if (empty($articles[$articleID]->audit_status)) {
-                        $checkedArticles[] = $articleID;
-                    }
-                }
-            } else {
-                if (empty($articles[$articlesID[0]]->audit_status)) {
-                    $checkedArticles[] = $articlesID[0];
-                }
-            }
-        }
-
-        $values = [];
-        $time = time();
-        foreach ($checkedArticles as $mid) {
-            $values[] = "(null, {$mid}, 'article', 1, '{}', {$time}, {$time})";
-        }
-        if (!empty($values)) {
-            $values = implode(', ', $values);
-            $query = "INSERT INTO `#__jdbuilder_audit` (id, itemid, itemtype, status, data, created, updated) VALUES {$values}";
-            $db->setQuery($query);
-            if (JDB_JOOMLA_VERSION == 3) {
-                $db->query();
-            } else {
-                $db->execute();
-            }
-        }
-    }
-
     public static function fixArticle($articleID, $layoutId = 0, $articleParams = null)
     {
         $params = new \JRegistry();
diff --git a/plg_jdbuilder/media/js/builder/main.js b/plg_jdbuilder/media/js/builder/main.js
diff --git a/plg_jdbuilder/media/js/jdb.js b/plg_jdbuilder/media/js/jdb.js
diff --git a/plg_jdbuilder/media/js/jdb.min.js b/plg_jdbuilder/media/js/jdb.min.js
diff --git a/plg_jdbuilder/media/js/jdvideo.js b/plg_jdbuilder/media/js/jdvideo.js
@@ -265,12 +265,20 @@
         this.videoWidth = this.wrapper.offsetWidth;
 
         if (_this.options.lightbox != '') {
-            setTimeout(function () {
-                jdLightboxInstances[_this.options.lightbox].props.onOpen = function () {
+            var initLightbox = function (_this, lightboxVideoEl, callback) {
+                if (window.jdLightboxInstances[_this.options.lightbox] == undefined) {
+                    setTimeout(function () {
+                        initLightbox(_this, lightboxVideoEl, callback);
+                    }, 100)
+                    return false;
+                }
+                window.jdLightboxInstances[_this.options.lightbox].props.onOpen = function () {
                     lightboxVideoEl.play();
                 }
-                doSticky();
-            }, 100);
+                callback();
+            }
+
+            initLightbox(_this, lightboxVideoEl, doSticky);
         }
     }
 
diff --git a/plg_jdbuilder/media/js/jdvideo.min.js b/plg_jdbuilder/media/js/jdvideo.min.js

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function faToggle()`
`73`	`73`	`}`
`74`	`74`	`try {`
`75`	`75`	`$params = JComponentHelper::getParams('com_jdbuilder');`
`76`		`- $fontawesomepro_integration = $params->get('fontawesomepro_integration', 1);`
	`76`	`+ $fontawesomepro_integration = 0;`
`77`	`77`
`78`	`78`	`$fontawesomepro_integration = $fontawesomepro_integration ? 0 : 1;`
`79`	`79`	`$params->set('fontawesomepro_integration', $fontawesomepro_integration);`
Original file line number	Diff line number	Diff line change
`@@ -127,14 +127,14 @@ public static function versionMessage()`
`127`	`127`	`public static function updateMessage()`
`128`	`128`	`{`
`129`	`129`	`$latest = Helper::getJDBuilderLatestVersion();`
`130`		`- if ($latest == 'v' . JDB_VERSION) return '';`
	`130`	`+ if ($latest == JDB_VERSION) return '';`
`131`	`131`	`$isPro = file_exists(JPATH_PLUGINS . '/system/jdbuilder/options/default-pro.xml');`
`132`	`132`
`133`	`133`	`$document = JFactory::getDocument();`
`134`	`134`	$document->addStyleDeclaration('.jdb-update-message{background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);box-shadow:8px 8px 8px rgba(221, 221, 221, 0.81);overflow:hidden;border-radius:4px;display:flex;color:#fff;margin-bottom:25px;line-height: 1.5rem;font-size:14px;}.jdb-update-message h4{font-size:16px;margin:0 0 10px;}body.admin.com_jdbuilder #content .jdb-update-message a{color:#fff;}.jdb-update-logo{color: white;width: 100px;display: grid;align-items: center;padding: 15px;box-sizing: border-box;background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);margin-right:10px;}.jdb-content{padding:20px 10px;align-self:center;}.jdb-content p{color:#f1f1f1;margin:0;}.jdb-content strong{color:#fff;}');
`135`	`135`
`136`	`136`	`$link = $isPro ? 'https://www.joomdev.com/my-downloads/jd-builder-pro' : 'https://github.com/joomdev/JD-Builder/releases/tag/' . $latest;`
`137`	`137`	`return '<div style="padding-right: 10px;" class="alert alert-danger">`
`138`		`- <div style="display:flex;justify-content:space-between;align-items:center">' . JText::sprintf('COM_JDBUILDER_UPDATE_MSG', ('v' . JDB_VERSION), $latest, $link) . '</div></div>';`
	`138`	`+ <div style="display:flex;justify-content:space-between;align-items:center">' . JText::sprintf('COM_JDBUILDER_UPDATE_MSG', ('v' . JDB_VERSION), 'v' . $latest, $link) . '</div></div>';`
`139`	`139`	`}`
`140`	`140`	`}`