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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-05-10 19:42:37 -07:00
commit 9caaa9397e
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zotlabs/Module/Admin.php
View File

@ -1785,6 +1785,21 @@ class Admin extends \Zotlabs\Web\Controller {
$repoDir = $addonDir.'/'.$repoName; $repoDir = $addonDir.'/'.$repoName;
$tempAddonDir = __DIR__ . '/../../store/git/sys/temp/' . $repoName; $tempAddonDir = __DIR__ . '/../../store/git/sys/temp/' . $repoName;
rename($tempAddonDir, $repoDir); 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 = '../extend/addon/'.$repoName.'/'.$file;
$target = realpath(__DIR__ . '/../../addon/').'/'.$file;
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); $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir);
$repo = $git->probeRepo(); $repo = $git->probeRepo();
json_return_and_die(array('repo'=> $repo, 'message' => '', 'success' => true)); json_return_and_die(array('repo'=> $repo, 'message' => '', 'success' => true));