bug fix on admin_init and code cleanup
This commit is contained in:
parent
bf32f439e6
commit
d1275eb680
5 changed files with 592 additions and 538 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1 +1,3 @@
|
||||||
*~
|
*~
|
||||||
|
*.iml
|
||||||
|
.idea
|
||||||
|
|
@ -1,36 +1,25 @@
|
||||||
jQuery(document).ready(function($) {
|
jQuery(document).ready(function ($) {
|
||||||
|
|
||||||
// $('#show-tokens').on('click', function() {
|
$('input.token').each(function () {
|
||||||
// if ($('input.token').attr('type') == 'password') {
|
var token = $(this);
|
||||||
// $('input.token').attr('type', 'text');
|
|
||||||
// $(this).addClass('dashicons-hidden').removeClass('dashicons-visibility')
|
|
||||||
// } else {
|
|
||||||
// $('input.token').attr('type', 'password');
|
|
||||||
// $(this).addClass('dashicons-visibility').removeClass('dashicons-hidden')
|
|
||||||
// }
|
|
||||||
// return false;
|
|
||||||
// });
|
|
||||||
|
|
||||||
$('input.token').each(function() {
|
|
||||||
var token = $(this)
|
|
||||||
var toggle = $('<a href="#" class="token-toggle dashicons dashicons-visibility"></a>');
|
var toggle = $('<a href="#" class="token-toggle dashicons dashicons-visibility"></a>');
|
||||||
token.wrap('<span class="token-box"></span>').after(toggle);
|
token.wrap('<span class="token-box"></span>').after(toggle);
|
||||||
toggle.on('click', function() {
|
toggle.on('click', function () {
|
||||||
if (token.attr('type') == 'password') {
|
if (token.attr('type') === 'password') {
|
||||||
token.attr('type', 'text')
|
token.attr('type', 'text');
|
||||||
toggle.addClass('dashicons-hidden').removeClass('dashicons-visibility')
|
toggle.addClass('dashicons-hidden').removeClass('dashicons-visibility');
|
||||||
} else {
|
} else {
|
||||||
token.attr('type', 'password')
|
token.attr('type', 'password');
|
||||||
toggle.addClass('dashicons-visibility').removeClass('dashicons-hidden')
|
toggle.addClass('dashicons-visibility').removeClass('dashicons-hidden');
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.repo-toggle').on('click', function() {
|
$('.repo-toggle').on('click', function () {
|
||||||
var id = $(this).data('repo');
|
var id = $(this).data('repo');
|
||||||
$('.repo-'+id).toggleClass('open')
|
$('.repo-' + id).toggleClass('open');
|
||||||
$('.repo-'+id+' > ul.packages').slideToggle(400)
|
$('.repo-' + id + ' > ul.packages').slideToggle(400);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
.wrap {
|
.wrap {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
#show-tokens {
|
#show-tokens {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box {
|
.box {
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
|
|
@ -11,18 +13,21 @@
|
||||||
position: relative;
|
position: relative;
|
||||||
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
|
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
|
||||||
}
|
}
|
||||||
|
|
||||||
.box .title {
|
.box .title {
|
||||||
border-bottom: 1px solid #EEEEEE;
|
border-bottom: 1px solid #EEEEEE;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box .title h3 {
|
.box .title h3 {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 1em;
|
line-height: 1em;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box .inner {
|
.box .inner {
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
}
|
}
|
||||||
|
|
@ -32,47 +37,56 @@
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-top: 1px solid #e5e5e5;
|
border-top: 1px solid #e5e5e5;
|
||||||
box-shadow: 0 1px 1px rgba(0,0,0,.04);
|
box-shadow: 0 1px 1px rgba(0, 0, 0, .04);
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea > li {
|
.gitea > li {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
border-bottom: 1px solid #e5e5e5;
|
border-bottom: 1px solid #e5e5e5;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea > li > ul {
|
.gitea > li > ul {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea > li li {
|
.gitea > li li {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 8px 15px;
|
padding: 8px 15px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
// width: 100%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea ul.packages > li {
|
.gitea ul.packages > li {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea li.repository,
|
.gitea li.repository,
|
||||||
.gitea li.package {
|
.gitea li.package {
|
||||||
width: 210px;
|
width: 210px;
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea a {
|
.gitea a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea a:focus,
|
.gitea a:focus,
|
||||||
.gitea a:active {
|
.gitea a:active {
|
||||||
outline: 0;
|
outline: 0;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea a.repo-toggle {
|
.gitea a.repo-toggle {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 14px;
|
line-height: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea > li:hover .row-actions {
|
.gitea > li:hover .row-actions {
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gitea input.token {
|
.gitea input.token {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
}
|
}
|
||||||
|
|
@ -89,24 +103,26 @@
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-table input[type=text],
|
.form-table input[type=text],
|
||||||
.form-table input[type=password] {
|
.form-table input[type=password] {
|
||||||
width: 75%;
|
width: 75%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.repo-row > ul.packages {
|
.repo-row > ul.packages {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repo-row > ul:first-child {
|
.repo-row > ul:first-child {
|
||||||
transition: all 0.4s;
|
transition: all 0.4s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repo-row.open > ul:first-child {
|
.repo-row.open > ul:first-child {
|
||||||
background: #2a9bd9;
|
background: #2a9bd9;
|
||||||
border-color: #2a9bd9;
|
border-color: #2a9bd9;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repo-row.open > ul:first-child a {
|
.repo-row.open > ul:first-child a {
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
@ -114,6 +130,7 @@
|
||||||
.token-box {
|
.token-box {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.token-toggle {
|
.token-toggle {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
@ -122,9 +139,11 @@
|
||||||
margin-top: -10px;
|
margin-top: -10px;
|
||||||
color: #aaa !important;
|
color: #aaa !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.token-toggle:hover {
|
.token-toggle:hover {
|
||||||
color: #aaa !important;
|
color: #aaa !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.token-toggle:focus,
|
.token-toggle:focus,
|
||||||
.token-toggle:active {
|
.token-toggle:active {
|
||||||
outline: 0;
|
outline: 0;
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,45 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
defined( 'ABSPATH' ) or exit;
|
defined('ABSPATH') or exit;
|
||||||
|
|
||||||
include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
|
include_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php');
|
||||||
|
|
||||||
class Gitea_Options {
|
class Gitea_Options
|
||||||
|
{
|
||||||
|
|
||||||
private static $_instance;
|
private static $_instance;
|
||||||
var $page = false;
|
var $page = false;
|
||||||
|
|
||||||
public static function getInstance() {
|
public static function getInstance()
|
||||||
|
{
|
||||||
if (!(self::$_instance instanceof self)) {
|
if (!(self::$_instance instanceof self)) {
|
||||||
self::$_instance = new self();
|
self::$_instance = new self();
|
||||||
}
|
}
|
||||||
return self::$_instance;
|
return self::$_instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
function __construct() {
|
function __construct()
|
||||||
|
{
|
||||||
add_action('admin_menu', array($this, 'admin_menu'));
|
add_action('admin_menu', array($this, 'admin_menu'));
|
||||||
add_action('admin_enqueue_scripts', array($this, 'enqueue_assets'));
|
add_action('admin_enqueue_scripts', array($this, 'enqueue_assets'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function admin_menu() {
|
function admin_menu()
|
||||||
|
{
|
||||||
$this->page = add_options_page('Gitea Updater', 'Gitea Updater', 'manage_options', 'gitea-updater', array($this, 'options_page'));
|
$this->page = add_options_page('Gitea Updater', 'Gitea Updater', 'manage_options', 'gitea-updater', array($this, 'options_page'));
|
||||||
add_action('load-'.$this->page, array($this, 'options_post'));
|
add_action('load-' . $this->page, array($this, 'options_post'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function enqueue_assets($hook) {
|
function enqueue_assets($hook)
|
||||||
|
{
|
||||||
if ($hook != $this->page) return;
|
if ($hook != $this->page) return;
|
||||||
|
|
||||||
wp_enqueue_style('gitea-updater', plugins_url('/assets/style.css', __FILE__));
|
wp_enqueue_style('gitea-updater', plugins_url('/assets/style.css', __FILE__));
|
||||||
wp_enqueue_script('gitea-js', plugins_url('/assets/script.js', __FILE__), array('jquery'), null, true);
|
wp_enqueue_script('gitea-js', plugins_url('/assets/script.js', __FILE__), array('jquery'), null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function options_post() {
|
function options_post()
|
||||||
|
{
|
||||||
|
|
||||||
if (isset($_GET['force-check'])) {
|
if (isset($_GET['force-check'])) {
|
||||||
Gitea_Updater::getInstance()->get_all();
|
Gitea_Updater::getInstance()->get_all();
|
||||||
|
|
@ -46,7 +52,8 @@ class Gitea_Options {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function options_page() {
|
function options_page()
|
||||||
|
{
|
||||||
$options = (array)get_option('gitea_options');
|
$options = (array)get_option('gitea_options');
|
||||||
$repositories = $this->get_repositories();
|
$repositories = $this->get_repositories();
|
||||||
$types = array(
|
$types = array(
|
||||||
|
|
@ -61,7 +68,7 @@ class Gitea_Options {
|
||||||
<?php if (isset($_POST['gitea_install'])) : ?>
|
<?php if (isset($_POST['gitea_install'])) : ?>
|
||||||
<div class="box install">
|
<div class="box install">
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<h3><?=__('Install Results', 'gitea')?></h3>
|
<h3><?= __('Install Results', 'gitea') ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<?php $this->install($_POST['gitea_install']); ?>
|
<?php $this->install($_POST['gitea_install']); ?>
|
||||||
|
|
@ -69,25 +76,31 @@ class Gitea_Options {
|
||||||
</div>
|
</div>
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
|
|
||||||
<form action="<?=admin_url('options-general.php?page=gitea-updater')?>" method="post" class="box access">
|
<form action="<?= admin_url('options-general.php?page=gitea-updater') ?>" method="post"
|
||||||
|
class="box access">
|
||||||
|
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<h3><?=__('Access Tokens', 'gitea')?></h3>
|
<h3><?= __('Access Tokens', 'gitea') ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<p><?=__('The access token from a repository always have priority over the global.', 'gitea')?></p>
|
<p><?= __('The access token from a repository always have priority over the global.', 'gitea') ?></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul class="gitea">
|
<ul class="gitea">
|
||||||
<?php $r = 0; foreach ($repositories as $repository => $packages) : $r++;?>
|
<?php $r = 0;
|
||||||
<li class="repo-row repo-<?=$r?>">
|
foreach ($repositories as $repository => $packages) : $r++; ?>
|
||||||
|
<li class="repo-row repo-<?= $r ?>">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="repository">
|
<li class="repository">
|
||||||
<strong><a href="#" class="repo-toggle" data-repo="<?=$r?>"><?=parse_url($repository)['host']?></a></strong>
|
<strong><a href="#" class="repo-toggle"
|
||||||
<a href="<?=$repository?>"><span class="dashicons dashicons-external"></span></a>
|
data-repo="<?= $r ?>"><?= parse_url($repository)['host'] ?></a></strong>
|
||||||
|
<a href="<?= $repository ?>"><span class="dashicons dashicons-external"></span></a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="password" class="token" name="gitea_options[host_token][<?=$repository?>]" value="<?=@$options['host_token'][$repository]?>" placeholder="<?=__('Global Access Token', 'gitea')?>">
|
<input type="password" class="token"
|
||||||
|
name="gitea_options[host_token][<?= $repository ?>]"
|
||||||
|
value="<?= @$options['host_token'][$repository] ?>"
|
||||||
|
placeholder="<?= __('Global Access Token', 'gitea') ?>">
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="striped packages">
|
<ul class="striped packages">
|
||||||
|
|
@ -96,11 +109,14 @@ class Gitea_Options {
|
||||||
<li>
|
<li>
|
||||||
<ul>
|
<ul>
|
||||||
<li class="package">
|
<li class="package">
|
||||||
<span class="dashicons dashicons-admin-<?=($type == 'plugin' ? 'plugins' : 'appearance')?>"></span>
|
<span class="dashicons dashicons-admin-<?= ($type == 'plugin' ? 'plugins' : 'appearance') ?>"></span>
|
||||||
<a href="<?=$package['url']?>"><?=$package['name']?></a>
|
<a href="<?= $package['url'] ?>"><?= $package['name'] ?></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="input">
|
<li class="input">
|
||||||
<input type="password" class="token" name="gitea_options[repo_token][<?=$package['url']?>]" value="<?=@$options['repo_token'][$package['url']]?>" placeholder="<?=__('Access Token', 'gitea')?>">
|
<input type="password" class="token"
|
||||||
|
name="gitea_options[repo_token][<?= $package['url'] ?>]"
|
||||||
|
value="<?= @$options['repo_token'][$package['url']] ?>"
|
||||||
|
placeholder="<?= __('Access Token', 'gitea') ?>">
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
@ -114,45 +130,49 @@ class Gitea_Options {
|
||||||
|
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<p class="submit">
|
<p class="submit">
|
||||||
<input type="submit" name="submit" id="submit" class="button button-primary" value="<?=__('Save Changes', 'gitea')?>">
|
<input type="submit" name="submit" id="submit" class="button button-primary"
|
||||||
<a href="<?=admin_url('options-general.php?page=gitea-updater&force-check=1')?>" class="button button-primary"><?=__('Reset Cache', 'gitea')?></a>
|
value="<?= __('Save Changes', 'gitea') ?>">
|
||||||
|
<a href="<?= admin_url('options-general.php?page=gitea-updater&force-check=1') ?>"
|
||||||
|
class="button button-primary"><?= __('Reset Cache', 'gitea') ?></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<form action="<?=admin_url('options-general.php?page=gitea-updater')?>" method="post" class="box install">
|
<form action="<?= admin_url('options-general.php?page=gitea-updater') ?>" method="post"
|
||||||
|
class="box install">
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<h3><?=__('Install from URL', 'gitea')?></h3>
|
<h3><?= __('Install from URL', 'gitea') ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
|
|
||||||
<p><?=__('Only with <code>http://</code> or <code>https://</code> links, It\'s not working with <code>ssh://</code> links!', 'gitea')?></p>
|
<p><?= __('Only with <code>http://</code> or <code>https://</code> links, It\'s not working with <code>ssh://</code> links!', 'gitea') ?></p>
|
||||||
|
|
||||||
<table class="form-table">
|
<table class="form-table">
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<label><?=__('Type', 'gitea')?></label>
|
<label><?= __('Type', 'gitea') ?></label>
|
||||||
</th>
|
</th>
|
||||||
<td>
|
<td>
|
||||||
<select name="gitea_install[type]">
|
<select name="gitea_install[type]">
|
||||||
<option value="plugin"><?=__('Plugins', 'gitea')?></option>
|
<option value="plugin"><?= __('Plugins', 'gitea') ?></option>
|
||||||
<option value="theme"><?=__('Themes', 'gitea')?></option>
|
<option value="theme"><?= __('Themes', 'gitea') ?></option>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<label><?=__('Repository URL', 'gitea')?></label>
|
<label><?= __('Repository URL', 'gitea') ?></label>
|
||||||
</th>
|
</th>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" name="gitea_install[url]" placeholder="<?=__('https://host/org/repo or https://host/org/repo.git', 'gitea')?>">
|
<input type="text" name="gitea_install[url]"
|
||||||
|
placeholder="<?= __('https://host/org/repo or https://host/org/repo.git', 'gitea') ?>">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<label><?=__('Access Token', 'gitea')?></label>
|
<label><?= __('Access Token', 'gitea') ?></label>
|
||||||
</th>
|
</th>
|
||||||
<td>
|
<td>
|
||||||
<input type="password" class="token" name="gitea_install[access_token]">
|
<input type="password" class="token" name="gitea_install[access_token]">
|
||||||
|
|
@ -161,7 +181,8 @@ class Gitea_Options {
|
||||||
<tr>
|
<tr>
|
||||||
<th></th>
|
<th></th>
|
||||||
<td>
|
<td>
|
||||||
<input type="submit" name="submit" id="submit" class="button button-primary" value="<?=__('Install Now', 'gitea')?>">
|
<input type="submit" name="submit" id="submit" class="button button-primary"
|
||||||
|
value="<?= __('Install Now', 'gitea') ?>">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -172,29 +193,30 @@ class Gitea_Options {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="times">
|
<div class="times">
|
||||||
<?=__('Plugins', 'gitea')?>: <?=date('d/m/Y H:i:s', get_option('gitea_plugins_updated'))?>
|
<?= __('Plugins', 'gitea') ?>: <?= date('d/m/Y H:i:s', get_option('gitea_plugins_updated')) ?>
|
||||||
<br>
|
<br>
|
||||||
<?=__('Themes', 'gitea')?>: <?=date('d/m/Y H:i:s', get_option('gitea_themes_updated'))?>
|
<?= __('Themes', 'gitea') ?>: <?= date('d/m/Y H:i:s', get_option('gitea_themes_updated')) ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php /* <textarea style="width:100%" rows="2" onfocus="this.rows=30;" onblur="this.rows=2;" readonly><?php var_dump($repositories); ?></textarea> */ ?>
|
<?php /* <textarea style="width:100%" rows="2" onfocus="this.rows=30;" onblur="this.rows=2;" readonly><?php var_dump($repositories); ?></textarea> */ ?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_repositories() {
|
function get_repositories()
|
||||||
|
{
|
||||||
$plugins = (array)get_option('gitea_plugins');
|
$plugins = (array)get_option('gitea_plugins');
|
||||||
$themes = (array)get_option('gitea_themes');
|
$themes = (array)get_option('gitea_themes');
|
||||||
|
|
||||||
$repositories = array();
|
$repositories = array();
|
||||||
|
|
||||||
foreach ($plugins as $slug => $plugin) {
|
foreach ($plugins as $slug => $plugin) {
|
||||||
$plugin['url'] = $plugin['gitea_host'].$plugin['gitea_repo'];
|
$plugin['url'] = $plugin['gitea_host'] . $plugin['gitea_repo'];
|
||||||
$repositories[$plugin['gitea_host']]['plugin'][$slug] = $plugin;
|
$repositories[$plugin['gitea_host']]['plugin'][$slug] = $plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($themes as $slug => $theme) {
|
foreach ($themes as $slug => $theme) {
|
||||||
$theme['url'] = $theme['gitea_host'].$theme['gitea_repo'];
|
$theme['url'] = $theme['gitea_host'] . $theme['gitea_repo'];
|
||||||
$repositories[$theme['gitea_host']]['theme'][$slug] = $theme;
|
$repositories[$theme['gitea_host']]['theme'][$slug] = $theme;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -202,13 +224,15 @@ class Gitea_Options {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static function get() {
|
static function get()
|
||||||
|
{
|
||||||
return (array)get_option('gitea_options');
|
return (array)get_option('gitea_options');
|
||||||
}
|
}
|
||||||
|
|
||||||
function install($data) {
|
function install($data)
|
||||||
|
{
|
||||||
$url = parse_url($data['url']);
|
$url = parse_url($data['url']);
|
||||||
$host = $url['scheme'].'://'.$url['host'].'/';
|
$host = $url['scheme'] . '://' . $url['host'] . '/';
|
||||||
$repo = str_replace('.git', '', trim($url['path'], '/'));
|
$repo = str_replace('.git', '', trim($url['path'], '/'));
|
||||||
|
|
||||||
$updater = Gitea_Updater::getInstance();
|
$updater = Gitea_Updater::getInstance();
|
||||||
|
|
@ -218,7 +242,7 @@ class Gitea_Options {
|
||||||
|
|
||||||
add_filter('install_plugin_complete_actions', array($this, 'install_actions'));
|
add_filter('install_plugin_complete_actions', array($this, 'install_actions'));
|
||||||
|
|
||||||
$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
|
$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
|
||||||
$upgrader->install($package);
|
$upgrader->install($package);
|
||||||
|
|
||||||
remove_filter('install_plugin_complete_actions', array($this, 'install_actions'));
|
remove_filter('install_plugin_complete_actions', array($this, 'install_actions'));
|
||||||
|
|
@ -227,7 +251,7 @@ class Gitea_Options {
|
||||||
|
|
||||||
add_filter('install_theme_complete_actions', array($this, 'install_actions'));
|
add_filter('install_theme_complete_actions', array($this, 'install_actions'));
|
||||||
|
|
||||||
$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'theme', 'api') ) );
|
$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('title', 'url', 'nonce', 'theme', 'api')));
|
||||||
$upgrader->install($package);
|
$upgrader->install($package);
|
||||||
|
|
||||||
remove_filter('install_theme_complete_actions', array($this, 'install_actions'));
|
remove_filter('install_theme_complete_actions', array($this, 'install_actions'));
|
||||||
|
|
@ -236,9 +260,10 @@ class Gitea_Options {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_actions($install_actions) {
|
function install_actions($install_actions)
|
||||||
|
{
|
||||||
unset($install_actions['plugins_page'], $install_actions['themes_page']);
|
unset($install_actions['plugins_page'], $install_actions['themes_page']);
|
||||||
$install_actions['gitea_page'] = '<a href="' . admin_url('options-general.php?page=gitea-updater') . '" target="_parent">' . __( 'Return', 'gitea' ) . '</a>';
|
$install_actions['gitea_page'] = '<a href="' . admin_url('options-general.php?page=gitea-updater') . '" target="_parent">' . __('Return', 'gitea') . '</a>';
|
||||||
return $install_actions;
|
return $install_actions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
* Plugin Name: Gitea Updater
|
* Plugin Name: Gitea Updater
|
||||||
* Plugin URI: http://www.paucapo.com
|
* Plugin URI: http://www.paucapo.com
|
||||||
* Description: Plugins updater
|
* Description: Plugins updater
|
||||||
* Version: 0.2.2
|
* Version: 0.3
|
||||||
* Author: Pau Capó
|
* Author: Pau Capó
|
||||||
* Author URI: http://www.paucapo.com
|
* Author URI: http://www.paucapo.com
|
||||||
* Text Domain: gitea
|
* Text Domain: gitea
|
||||||
|
|
@ -17,17 +17,18 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
defined('ABSPATH') or exit;
|
||||||
defined( 'ABSPATH' ) or exit;
|
|
||||||
|
|
||||||
|
|
||||||
require 'gitea-options.php';
|
require 'gitea-options.php';
|
||||||
|
|
||||||
class Gitea_Updater {
|
class Gitea_Updater
|
||||||
|
{
|
||||||
|
|
||||||
private static $_instance;
|
private static $_instance;
|
||||||
|
|
||||||
public static function getInstance() {
|
public static function getInstance()
|
||||||
|
{
|
||||||
if (!(self::$_instance instanceof self)) {
|
if (!(self::$_instance instanceof self)) {
|
||||||
self::$_instance = new self();
|
self::$_instance = new self();
|
||||||
}
|
}
|
||||||
|
|
@ -37,7 +38,8 @@ class Gitea_Updater {
|
||||||
public $plugins = array();
|
public $plugins = array();
|
||||||
public $themes = array();
|
public $themes = array();
|
||||||
|
|
||||||
function __construct() {
|
function __construct()
|
||||||
|
{
|
||||||
|
|
||||||
add_action('plugins_loaded', array($this, 'plugins_loaded'));
|
add_action('plugins_loaded', array($this, 'plugins_loaded'));
|
||||||
|
|
||||||
|
|
@ -58,21 +60,27 @@ class Gitea_Updater {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function admin_init() {
|
function admin_init()
|
||||||
if (!get_option('gitea_plugins') || !get_option('gitea_plugins'))
|
{
|
||||||
|
if (get_option('gitea_plugins_updated') === false || get_option('gitea_themes_updated') === false)
|
||||||
|
{
|
||||||
$this->get_all();
|
$this->get_all();
|
||||||
}
|
}
|
||||||
|
|
||||||
function plugins_loaded() {
|
|
||||||
load_plugin_textdomain('gitea', FALSE, basename( dirname( __FILE__ ) ) . '/languages/');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_all() {
|
function plugins_loaded()
|
||||||
|
{
|
||||||
|
load_plugin_textdomain('gitea', FALSE, basename(dirname(__FILE__)) . '/languages/');
|
||||||
|
}
|
||||||
|
|
||||||
|
function get_all()
|
||||||
|
{
|
||||||
$this->get_plugins();
|
$this->get_plugins();
|
||||||
$this->get_themes();
|
$this->get_themes();
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_plugins() {
|
function get_plugins()
|
||||||
|
{
|
||||||
$this->plugins = array();
|
$this->plugins = array();
|
||||||
$plugins = get_plugins();
|
$plugins = get_plugins();
|
||||||
|
|
||||||
|
|
@ -88,7 +96,7 @@ class Gitea_Updater {
|
||||||
$repo = $plugin['Gitea URI'];
|
$repo = $plugin['Gitea URI'];
|
||||||
$local_version = strtolower($plugin['Version']);
|
$local_version = strtolower($plugin['Version']);
|
||||||
|
|
||||||
$url = $this->get_url($host, $repo, '/raw/master/'.$file);
|
$url = $this->get_url($host, $repo, '/raw/master/' . $file);
|
||||||
if ($url != false) {
|
if ($url != false) {
|
||||||
$new_version = $this->get_version($url, 'plugin');
|
$new_version = $this->get_version($url, 'plugin');
|
||||||
}
|
}
|
||||||
|
|
@ -105,7 +113,7 @@ class Gitea_Updater {
|
||||||
'gitea_host' => $host,
|
'gitea_host' => $host,
|
||||||
'gitea_repo' => $repo,
|
'gitea_repo' => $repo,
|
||||||
'description' => $plugin['Description'],
|
'description' => $plugin['Description'],
|
||||||
'url' => $host.$repo,
|
'url' => $host . $repo,
|
||||||
'local_version' => $local_version,
|
'local_version' => $local_version,
|
||||||
'new_version' => $new_version,
|
'new_version' => $new_version,
|
||||||
'package' => $this->get_url($host, $repo, '/archive/master.zip'),
|
'package' => $this->get_url($host, $repo, '/archive/master.zip'),
|
||||||
|
|
@ -121,11 +129,12 @@ class Gitea_Updater {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_themes() {
|
function get_themes()
|
||||||
|
{
|
||||||
$this->themes = array();
|
$this->themes = array();
|
||||||
$themes = wp_get_themes();
|
$themes = wp_get_themes();
|
||||||
|
|
||||||
foreach ( $themes as $theme ) {
|
foreach ($themes as $theme) {
|
||||||
|
|
||||||
if ($theme->get('Gitea Host') != '' && $theme->get('Gitea URI')) {
|
if ($theme->get('Gitea Host') != '' && $theme->get('Gitea URI')) {
|
||||||
|
|
||||||
|
|
@ -168,17 +177,19 @@ class Gitea_Updater {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_host($host) {
|
function get_host($host)
|
||||||
return rtrim($host, '/').'/';
|
{
|
||||||
|
return rtrim($host, '/') . '/';
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_token($host, $repo) {
|
function get_token($host, $repo)
|
||||||
|
{
|
||||||
$options = Gitea_Options::get();
|
$options = Gitea_Options::get();
|
||||||
$token = '';
|
$token = '';
|
||||||
|
|
||||||
// get repo token
|
// get repo token
|
||||||
if (isset($options['repo_token'][$host.$repo]))
|
if (isset($options['repo_token'][$host . $repo]))
|
||||||
$token = $options['repo_token'][$host.$repo];
|
$token = $options['repo_token'][$host . $repo];
|
||||||
|
|
||||||
// get host token if repo is empty
|
// get host token if repo is empty
|
||||||
if (empty($token) && isset($options['host_token'][$host]))
|
if (empty($token) && isset($options['host_token'][$host]))
|
||||||
|
|
@ -188,17 +199,19 @@ class Gitea_Updater {
|
||||||
return !empty($token) ? $token : false;
|
return !empty($token) ? $token : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_url($host, $repo, $args = '', $access_token = false) {
|
function get_url($host, $repo, $args = '', $access_token = false)
|
||||||
|
{
|
||||||
|
|
||||||
if ($access_token === false) {
|
if ($access_token === false) {
|
||||||
$access_token = $this->get_token($host, $repo);
|
$access_token = $this->get_token($host, $repo);
|
||||||
if (!$access_token) return false;
|
if (!$access_token) return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $host.'api/v1/repos/'.$repo.$args.'?access_token='.$access_token;
|
return $host . 'api/v1/repos/' . $repo . $args . '?access_token=' . $access_token;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_file($url) {
|
function get_file($url)
|
||||||
|
{
|
||||||
$request = wp_remote_get($url);
|
$request = wp_remote_get($url);
|
||||||
|
|
||||||
if (is_wp_error($request) || 200 != wp_remote_retrieve_response_code($request)) {
|
if (is_wp_error($request) || 200 != wp_remote_retrieve_response_code($request)) {
|
||||||
|
|
@ -209,7 +222,8 @@ class Gitea_Updater {
|
||||||
return $request;
|
return $request;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_version($url, $type) {
|
function get_version($url, $type)
|
||||||
|
{
|
||||||
|
|
||||||
$request = $this->get_file($url);
|
$request = $this->get_file($url);
|
||||||
|
|
||||||
|
|
@ -221,7 +235,8 @@ class Gitea_Updater {
|
||||||
return isset($headers['Version']) ? $headers['Version'] : false;
|
return isset($headers['Version']) ? $headers['Version'] : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function plugins_api($default = false, $action, $args) {
|
function plugins_api($default = false, $action, $args)
|
||||||
|
{
|
||||||
if ('plugin_information' != $action)
|
if ('plugin_information' != $action)
|
||||||
return $default;
|
return $default;
|
||||||
|
|
||||||
|
|
@ -232,7 +247,7 @@ class Gitea_Updater {
|
||||||
|
|
||||||
$plugin = $this->plugins[$args->slug];
|
$plugin = $this->plugins[$args->slug];
|
||||||
|
|
||||||
return (object) array(
|
return (object)array(
|
||||||
'name' => $plugin['name'],
|
'name' => $plugin['name'],
|
||||||
'slug' => $plugin['plugin'],
|
'slug' => $plugin['plugin'],
|
||||||
'version' => $plugin['new_version'],
|
'version' => $plugin['new_version'],
|
||||||
|
|
@ -245,7 +260,8 @@ class Gitea_Updater {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function pre_set_site_transient_update_plugins($transient) {
|
function pre_set_site_transient_update_plugins($transient)
|
||||||
|
{
|
||||||
// check if some plugin needs update
|
// check if some plugin needs update
|
||||||
|
|
||||||
$this->get_plugins();
|
$this->get_plugins();
|
||||||
|
|
@ -263,7 +279,8 @@ class Gitea_Updater {
|
||||||
return $transient;
|
return $transient;
|
||||||
}
|
}
|
||||||
|
|
||||||
function pre_set_site_transient_update_themes($transient) {
|
function pre_set_site_transient_update_themes($transient)
|
||||||
|
{
|
||||||
// check if some theme needs update
|
// check if some theme needs update
|
||||||
|
|
||||||
$this->get_themes();
|
$this->get_themes();
|
||||||
|
|
@ -281,7 +298,8 @@ class Gitea_Updater {
|
||||||
return $transient;
|
return $transient;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_file_headers($contents, $type) {
|
function get_file_headers($contents, $type)
|
||||||
|
{
|
||||||
|
|
||||||
$gitea_headers = array(
|
$gitea_headers = array(
|
||||||
'GiteaHost' => 'Gitea Host',
|
'GiteaHost' => 'Gitea Host',
|
||||||
|
|
@ -324,11 +342,11 @@ class Gitea_Updater {
|
||||||
|
|
||||||
$file_data = str_replace("\r", "\n", $contents);
|
$file_data = str_replace("\r", "\n", $contents);
|
||||||
|
|
||||||
$all_headers = array_merge($gitea_headers, (array) $all_headers);
|
$all_headers = array_merge($gitea_headers, (array)$all_headers);
|
||||||
$all_headers = array_unique($all_headers);
|
$all_headers = array_unique($all_headers);
|
||||||
|
|
||||||
foreach ($all_headers as $field => $regex) {
|
foreach ($all_headers as $field => $regex) {
|
||||||
if (preg_match( '/^[ \t\/*#@]*'.preg_quote($regex, '/').':(.*)$/mi', $file_data, $match) && $match[1]) {
|
if (preg_match('/^[ \t\/*#@]*' . preg_quote($regex, '/') . ':(.*)$/mi', $file_data, $match) && $match[1]) {
|
||||||
$all_headers[$field] = _cleanup_header_comment($match[1]);
|
$all_headers[$field] = _cleanup_header_comment($match[1]);
|
||||||
} else {
|
} else {
|
||||||
$all_headers[$field] = '';
|
$all_headers[$field] = '';
|
||||||
|
|
@ -336,14 +354,15 @@ class Gitea_Updater {
|
||||||
}
|
}
|
||||||
|
|
||||||
$all_headers = array_filter($all_headers,
|
$all_headers = array_filter($all_headers,
|
||||||
function($e) use (&$all_headers) {
|
function ($e) use (&$all_headers) {
|
||||||
return !empty($e);
|
return !empty($e);
|
||||||
});
|
});
|
||||||
|
|
||||||
return $all_headers;
|
return $all_headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
function extra_headers($headers) {
|
function extra_headers($headers)
|
||||||
|
{
|
||||||
$headers[] = 'Gitea URI';
|
$headers[] = 'Gitea URI';
|
||||||
$headers[] = 'Gitea Host';
|
$headers[] = 'Gitea Host';
|
||||||
return $headers;
|
return $headers;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue