Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-06 02:16:25 +02:00
Code Issues Packages Projects Releases Activity

Cleanup

Browse Source
This commit is contained in:
Djamil Legato
2017-01-20 13:55:03 -08:00
parent 39ef71f5d2
commit 81b7dd10c7
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
classes/gpm.php
View File

@@ -1,4 +1,5 @@
<?php
namespace Grav\Plugin\Admin;
use Grav\Common\Grav;
@@ -13,6 +14,7 @@ use Grav\Plugin\Admin\Admin;
/**
* Class Gpm
*
* @package Grav\Plugin\Admin
*/
class Gpm
@@ -32,6 +34,7 @@ class Gpm
/**
* Default options for the install
*
* @var array
*/
protected static $options = [
@@ -54,14 +57,14 @@ class Gpm
$options = array_merge(self::$options, $options);
if (
!Installer::isGravInstance($options['destination']) ||
!Installer::isValidDestination($options['destination'], [Installer::EXISTS, Installer::IS_LINK])
!Installer::isGravInstance($options['destination'])
|| !Installer::isValidDestination($options['destination'], [Installer::EXISTS, Installer::IS_LINK])
) {
return false;
}
$packages = is_array($packages) ? $packages : [$packages];
$count = count($packages);
$count = count($packages);
$packages = array_filter(array_map(function ($p) {
return !is_string($p) ? $p instanceof Package ? $p : false : self::GPM()->findPackage($p);
@@ -94,7 +97,7 @@ class Gpm
}
$license = Licenses::get($package->slug);
$local = static::download($package, $license);
$local = static::download($package, $license);
Installer::install($local, $options['destination'],
['install_path' => $package->install_path, 'theme' => $options['theme']]);
@@ -143,14 +146,14 @@ class Gpm
$options = array_merge(self::$options, $options);
$packages = is_array($packages) ? $packages : [$packages];
$count = count($packages);
$count = count($packages);
$packages = array_filter(array_map(function ($p) {
if (is_string($p)) {
$p = strtolower($p);
$p = strtolower($p);
$plugin = static::GPM()->getInstalledPlugin($p);
$p = $plugin ?: static::GPM()->getInstalledTheme($p);
$p = $plugin ?: static::GPM()->getInstalledTheme($p);
}
return $p instanceof Package ? $p : false;
@@ -204,8 +207,8 @@ class Gpm
$query = \json_encode(array_merge(
$package->premium,
[
'slug' => $package->slug,
'filename' => $package->premium['filename'],
'slug' => $package->slug,
'filename' => $package->premium['filename'],
'license_key' => $license
]
));
@@ -266,11 +269,12 @@ class Gpm
}
if (method_exists($upgrader, 'meetsRequirements') && !$upgrader->meetsRequirements()) {
$error = [];
$error = [];
$error[] = '<p>Grav has increased the minimum PHP requirement.<br />';
$error[] = 'You are currently running PHP <strong>' . PHP_VERSION . '</strong>';
$error[] = ', but PHP <strong>' . GRAV_PHP_MIN . '</strong> is required.</p>';
$error[] = '<p><a href="http://getgrav.org/blog/changing-php-requirements-to-5.5" class="button button-small secondary">Additional information</a></p>';
$error[] =
'<p><a href="http://getgrav.org/blog/changing-php-requirements-to-5.5" class="button button-small secondary">Additional information</a></p>';
Installer::setError(implode("\n", $error));
@@ -278,8 +282,8 @@ class Gpm
}
$update = $upgrader->getAssets()['grav-update'];
$tmp = Admin::getTempDir() . '/Grav-' . uniqid();
$file = self::_downloadSelfupgrade($update, $tmp);
$tmp = Admin::getTempDir() . '/Grav-' . uniqid();
$file = self::_downloadSelfupgrade($update, $tmp);
Installer::install($file, GRAV_ROOT,
['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true]);