From d9a5b11c9a1b5e400e83130306bd375b22887201 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 26 Jan 2017 21:20:15 -0500 Subject: Fixed numerous bugs with the addon repo management GUI. Only show Manage Repos button if webserver has write permission on extend/addon/. --- Zotlabs/Module/Admin/Plugins.php | 19 ++++++++++++------- doc/context/en/admin/plugins/help.html | 11 +++++++++++ view/tpl/admin_plugins.tpl | 18 +++++++++++++++--- 3 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 doc/context/en/admin/plugins/help.html diff --git a/Zotlabs/Module/Admin/Plugins.php b/Zotlabs/Module/Admin/Plugins.php index 9e48b4b86..527e96496 100644 --- a/Zotlabs/Module/Admin/Plugins.php +++ b/Zotlabs/Module/Admin/Plugins.php @@ -36,7 +36,7 @@ class Plugins { json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); } else { - if (!symlink('extend/addon', $addonDir)) { + if (!symlink(realpath('extend/addon'), $addonDir)) { logger('Error creating symlink to addon folder: ' . $addonDir); 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('.', '..')); foreach ($files as $file) { if (is_dir($repoDir . '/' . $file) && $file !== '.git') { - $source = 'extend/addon/' . $repoName . '/' . $file; + $source = '../extend/addon/' . $repoName . '/' . $file; $target = realpath('addon/') . '/' . $file; unlink($target); if (!symlink($source, $target)) { @@ -86,7 +86,7 @@ class Plugins { logger('Error creating extend folder: ' . $extendDir); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); } else { - if (!symlink('extend/addon', $addonDir)) { + if (!symlink(realpath('extend/addon'), $addonDir)) { logger('Error creating symlink to addon folder: ' . $addonDir); 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); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); } else { - if (!symlink('extend/addon', $addonDir)) { + if (!symlink(realpath('extend/addon'), $addonDir)) { logger('Error creating symlink to addon folder: ' . $addonDir); 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('.', '..')); foreach ($files as $file) { if (is_dir($repoDir . '/' . $file) && $file !== '.git') { - $source = 'extend/addon/' . $repoName . '/' . $file; + $source = '../extend/addon/' . $repoName . '/' . $file; $target = realpath('addon/') . '/' . $file; unlink($target); if (!symlink($source, $target)) { @@ -176,13 +176,13 @@ class Plugins { $repoURL = $_REQUEST['repoURL']; $extendDir = 'store/[data]/git/sys/extend'; $addonDir = $extendDir . '/addon'; - $tempAddonDir = 'store/[data]/git/sys/temp'; + $tempAddonDir = realpath('store/[data]') . '/git/sys/temp'; if (!file_exists($extendDir)) { if (!mkdir($extendDir, 0770, true)) { logger('Error creating extend folder: ' . $extendDir); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); } else { - if (!symlink('extend/addon', $addonDir)) { + if (!symlink(realpath('extend/addon'), $addonDir)) { logger('Error creating symlink to addon folder: ' . $addonDir); 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'); + $allowManageRepos = false; + if(is_writable('extend/addon') && is_writable('store/[data]')) { + $allowManageRepos = true; + } $admin_plugins_add_repo_form= replace_macros( get_markup_template('admin_plugins_addrepo.tpl'), array( @@ -432,6 +436,7 @@ class Plugins { '$plugins' => $plugins, '$disabled' => t('Disabled - version incompatibility'), '$form_security_token' => get_form_security_token('admin_plugins'), + '$allowManageRepos' => $allowManageRepos, '$managerepos' => t('Manage Repos'), '$installedtitle' => t('Installed Plugin Repositories'), '$addnewrepotitle' => t('Install a New Plugin Repository'), diff --git a/doc/context/en/admin/plugins/help.html b/doc/context/en/admin/plugins/help.html new file mode 100644 index 000000000..3ea821a71 --- /dev/null +++ b/doc/context/en/admin/plugins/help.html @@ -0,0 +1,11 @@ +
+
General
+
This page manages which addons (also known as plugins) are installed.
+
Manage Repos
+
If your webserver has the necessary write permissions, you will see a button labeled Manage Repos, + which opens a control panel for managing what addon repositories are installed. These repos are + stored in extend/addon/[repo name]/. The official Hubzilla + addon repo can be added by entering the repo URL + https://github.com/redmatrix/hubzilla-addons.git + and choosing a name for the repo such as official.
+
\ No newline at end of file diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 993a4dea2..4360aa30c 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,8 +1,10 @@
+ {{if $allowManageRepos}}
+ {{/if}}

{{$title}} - {{$page}}

@@ -18,7 +20,7 @@ {{foreach $addonrepos as $repo}} - {{$repo.name}} + {{$repo.name}} @@ -139,10 +141,20 @@ function(response) { if (response.success) { 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 { 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; }, -- cgit v1.2.3