Skip to content

Commit

Permalink
Update MarketplaceConnector.php
Browse files Browse the repository at this point in the history
  • Loading branch information
bobimicroweber committed Mar 19, 2024
1 parent a52fff3 commit c73d4a5
Showing 1 changed file with 36 additions and 18 deletions.
54 changes: 36 additions & 18 deletions plib/library/MarketplaceConnector.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Modules_Microweber_MarketplaceConnector
*
* @var array
*/
public $package_urls = [
public $package_urls = [
'https://packages.microweberapi.com/packages.json'
];

Expand All @@ -29,7 +29,7 @@ public function set_license($license)
{
$this->licenses = $license;
}

public function add_license($license)
{
$this->licenses[] = $license;
Expand All @@ -41,25 +41,25 @@ public function set_whmcs_url($url) {
$this->update_package_urls();
}
}

public function update_package_urls() {

$whmcsUrl = $this->whmcs_url . '/index.php?m=microweber_addon&function=get_package_manager_urls';
$whmcsPackageUrls = $this->_get_content_from_url($whmcsUrl);
$whmcsPackageUrls = json_decode($whmcsPackageUrls, TRUE);
if (is_array($whmcsPackageUrls) && !empty($whmcsPackageUrls)) {
$this->set_package_urls($whmcsPackageUrls);
}
}

public function add_package_urls($urls) {
if (is_array($urls) && !empty($urls)) {
foreach($urls as $url) {
$this->add_package_url($url);
}
}
}

public function set_package_urls($urls) {
if (is_array($urls) && !empty($urls)) {
$this->package_urls = [];
Expand All @@ -68,13 +68,13 @@ public function set_package_urls($urls) {
}
}
}

public function add_package_url($originalUrl) {
$url = trim($originalUrl);
$this->package_urls[] = $url;
$this->package_urls[] = $url;
}


/**
* Get package urls
* @return string[]
Expand All @@ -83,7 +83,7 @@ public function get_packages_urls()
{
return $this->package_urls;
}

/**
* Get available packages
*
Expand Down Expand Up @@ -129,7 +129,7 @@ public function get_packages()
}
return $packages_by_type;
}

/**
* Get available templates
*
Expand All @@ -145,14 +145,14 @@ public function get_templates()
$return[$pk] = $template;
}
}

return $return;
}

public function get_templates_download_urls()
{
$download_urls = [];

$templates = $this->get_templates();

if (is_array($templates) && !empty($templates)) {
Expand All @@ -169,11 +169,29 @@ public function get_templates_download_urls()
'target_dir'=>$template['latest_version']['target-dir'],
'download_url'=>$template['latest_version']['dist']['url']
];

}
}
}


// Fix for BIG premium and BIG free template
$big_premium_found = false;
foreach ($download_urls as $download_url) {
if ($download_url['name'] == 'microweber-templates/big') {
$big_premium_found = true;
}
}
if ($big_premium_found) {
$new_download_urls = [];
foreach ($download_urls as &$download_url) {
if ($download_url['name'] == 'microweber-templates/big-free') {
continue;
}
$new_download_urls[] = $download_url;
}
$download_urls = $new_download_urls;
}

return $download_urls;
}

Expand Down Expand Up @@ -242,7 +260,7 @@ private function _get_content_from_url($url)
curl_setopt_array($ch, $opts);

$data = curl_exec($ch);

curl_close($ch);
return $data;
} else {
Expand Down

0 comments on commit c73d4a5

Please sign in to comment.