From 2882eef42fd7665d00c745276fb4315da29cadff Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 10 May 2016 21:00:10 -0400 Subject: Link plugins in the newly installed addon repo to /addon so they are accessible --- Zotlabs/Module/Admin.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 1b98a2ced..a9f06b7ef 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1785,6 +1785,25 @@ class Admin extends \Zotlabs\Web\Controller { $repoDir = $addonDir.'/'.$repoName; $tempAddonDir = __DIR__ . '/../../store/git/sys/temp/' . $repoName; rename($tempAddonDir, $repoDir); + + $files = array_diff(scandir($repoDir), array('.', '..')); + logger('files: ' . json_encode($files)); + foreach ($files as $file) + { + if(is_dir($repoDir.'/'.$file) && $file !== '.git') { + $source = realpath(__DIR__ . '/../../extend/addon/'.$repoName.'/'.$file.'/'); + $source = '../extend/addon/'.$repoName.'/'.$file; + $target = realpath(__DIR__ . '/../../addon/').'/'.$file; + logger('file: ' . json_encode($file)); + logger('source: ' . $source); + logger('target: ' . $target); + unlink($target); + if(!symlink($source, $target)) { + logger('Error linking addons to /addon'); + json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); + } + } + } $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir); $repo = $git->probeRepo(); json_return_and_die(array('repo'=> $repo, 'message' => '', 'success' => true)); -- cgit v1.2.3 From 40e3d37a723f28a8957f3a844f9470c274c330e9 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 10 May 2016 21:01:47 -0400 Subject: Remove debugging lines --- Zotlabs/Module/Admin.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index a9f06b7ef..0e3ee68c4 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1791,12 +1791,8 @@ class Admin extends \Zotlabs\Web\Controller { foreach ($files as $file) { if(is_dir($repoDir.'/'.$file) && $file !== '.git') { - $source = realpath(__DIR__ . '/../../extend/addon/'.$repoName.'/'.$file.'/'); $source = '../extend/addon/'.$repoName.'/'.$file; $target = realpath(__DIR__ . '/../../addon/').'/'.$file; - logger('file: ' . json_encode($file)); - logger('source: ' . $source); - logger('target: ' . $target); unlink($target); if(!symlink($source, $target)) { logger('Error linking addons to /addon'); -- cgit v1.2.3