harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #655 from anaqreon/addon-repo-gui

Browse Source 
Addon repo management GUI
This commit is contained in:
zotlabs 2017-01-27 13:27:36 +11:00 committed by GitHub
commit 80e1130bb5
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Zotlabs/Module/Admin/Plugins.php
View File

@ -36,7 +36,7 @@ class Plugins {
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} }
else { else {
if (!symlink('extend/addon', $addonDir)) { if (!symlink(realpath('extend/addon'), $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
@ -57,7 +57,7 @@ class Plugins {
$files = array_diff(scandir($repoDir), array('.', '..')); $files = array_diff(scandir($repoDir), array('.', '..'));
foreach ($files as $file) { foreach ($files as $file) {
if (is_dir($repoDir . '/' . $file) && $file !== '.git') { if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
$source = 'extend/addon/' . $repoName . '/' . $file; $source = '../extend/addon/' . $repoName . '/' . $file;
$target = realpath('addon/') . '/' . $file; $target = realpath('addon/') . '/' . $file;
unlink($target); unlink($target);
if (!symlink($source, $target)) { if (!symlink($source, $target)) {
@ -86,7 +86,7 @@ class Plugins {
logger('Error creating extend folder: ' . $extendDir); logger('Error creating extend folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} else { } else {
if (!symlink('extend/addon', $addonDir)) { if (!symlink(realpath('extend/addon'), $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
@ -119,7 +119,7 @@ class Plugins {
logger('Error creating extend folder: ' . $extendDir); logger('Error creating extend folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} else { } else {
if (!symlink('extend/addon', $addonDir)) { if (!symlink(realpath('extend/addon'), $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
@ -156,7 +156,7 @@ class Plugins {
$files = array_diff(scandir($repoDir), array('.', '..')); $files = array_diff(scandir($repoDir), array('.', '..'));
foreach ($files as $file) { foreach ($files as $file) {
if (is_dir($repoDir . '/' . $file) && $file !== '.git') { if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
$source = 'extend/addon/' . $repoName . '/' . $file; $source = '../extend/addon/' . $repoName . '/' . $file;
$target = realpath('addon/') . '/' . $file; $target = realpath('addon/') . '/' . $file;
unlink($target); unlink($target);
if (!symlink($source, $target)) { if (!symlink($source, $target)) {
@ -176,13 +176,13 @@ class Plugins {
$repoURL = $_REQUEST['repoURL']; $repoURL = $_REQUEST['repoURL'];
$extendDir = 'store/[data]/git/sys/extend'; $extendDir = 'store/[data]/git/sys/extend';
$addonDir = $extendDir . '/addon'; $addonDir = $extendDir . '/addon';
$tempAddonDir = 'store/[data]/git/sys/temp'; $tempAddonDir = realpath('store/[data]') . '/git/sys/temp';
if (!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if (!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
logger('Error creating extend folder: ' . $extendDir); logger('Error creating extend folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} else { } else {
if (!symlink('extend/addon', $addonDir)) { if (!symlink(realpath('extend/addon'), $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
@ -395,6 +395,10 @@ class Plugins {
usort($plugins,'self::plugin_sort'); usort($plugins,'self::plugin_sort');
$allowManageRepos = false;
if(is_writable('extend/addon') && is_writable('store/[data]')) {
$allowManageRepos = true;
}
$admin_plugins_add_repo_form= replace_macros( $admin_plugins_add_repo_form= replace_macros(
get_markup_template('admin_plugins_addrepo.tpl'), array( get_markup_template('admin_plugins_addrepo.tpl'), array(
@ -432,6 +436,7 @@ class Plugins {
'$plugins' => $plugins, '$plugins' => $plugins,
'$disabled' => t('Disabled - version incompatibility'), '$disabled' => t('Disabled - version incompatibility'),
'$form_security_token' => get_form_security_token('admin_plugins'), '$form_security_token' => get_form_security_token('admin_plugins'),
'$allowManageRepos' => $allowManageRepos,
'$managerepos' => t('Manage Repos'), '$managerepos' => t('Manage Repos'),
'$installedtitle' => t('Installed Plugin Repositories'), '$installedtitle' => t('Installed Plugin Repositories'),
'$addnewrepotitle' => t('Install a New Plugin Repository'), '$addnewrepotitle' => t('Install a New Plugin Repository'),

11
doc/context/en/admin/plugins/help.html Normal file
View File

@ -0,0 +1,11 @@
<dl class="dl-horizontal">
<dt>General</dt>
<dd>This page manages which addons (also known as plugins) are installed.</dd>
<dt>Manage Repos</dt>
<dd>If your webserver has the necessary write permissions, you will see a button labeled <b>Manage Repos</b>,
which opens a control panel for managing what addon <i>repositories</i> are installed. These repos are
stored in <span style="font-family: monospace;">extend/addon/[repo name]/</span>. The official Hubzilla
addon repo can be added by entering the repo URL
<span style="font-family: monospace;">https://github.com/redmatrix/hubzilla-addons.git</span>
and choosing a name for the repo such as <b>official</b>.</dd>
</dl>

18
view/tpl/admin_plugins.tpl
View File

@ -1,8 +1,10 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
{{if $allowManageRepos}}
<div class="pull-right"> <div class="pull-right">
<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$managerepos}}</button> <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$managerepos}}</button>
</div> </div>
{{/if}}
<h2 id="title">{{$title}} - {{$page}}</h2> <h2 id="title">{{$title}} - {{$page}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -18,7 +20,7 @@
{{foreach $addonrepos as $repo}} {{foreach $addonrepos as $repo}}
<tr> <tr>
<td style="width: 70%;"> <td style="width: 70%;">
<span class="pull-left">{{$repo.name}}</span> <span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span>
</td> </td>
<td style="width: 15%;"> <td style="width: 15%;">
<button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button> <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
@ -139,10 +141,20 @@
function(response) { function(response) {
if (response.success) { if (response.success) {
window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']); window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
alert('Addon repo updated.'); //alert('Addon repo updated.');
$('#update-message-' + repoName).css('background-color', 'yellow');
$('#update-message-' + repoName).html('Repo updated!');
setTimeout(function () {
$('#update-message-' + repoName).html('');
}, 60000);
} else { } else {
window.console.log('Error updating repo :' + response['message']); window.console.log('Error updating repo :' + response['message']);
alert('Error updating addon repo!'); //alert('Error updating addon repo!');
$('#update-message-' + repoName).css('background-color', 'red');
$('#update-message-' + repoName).html('Error updating repo!');
setTimeout(function () {
$('#update-message-' + repoName).html('');
}, 60000);
} }
return false; return false;
}, },