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

Moved git repository storage to store/[data]/git to avoid collision with a channel named git. Fixed bug where temp repo folder was never created.

Browse Source
This commit is contained in:
Andrew Manning 2016-05-21 12:55:17 -04:00
parent 4979a45120
commit 598baa1b32
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Zotlabs/Module/Admin.php
View File

@ -1735,7 +1735,7 @@ class Admin extends \Zotlabs\Web\Controller {
} else { } else {
json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
} }
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
$addonDir = $extendDir . '/addon'; $addonDir = $extendDir . '/addon';
if (!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if (!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
@ -1748,7 +1748,7 @@ class Admin extends \Zotlabs\Web\Controller {
} }
} }
} }
$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName; $repoDir = __DIR__ . '/../../store/[data]/git/sys/extend/addon/' . $repoName;
if (!is_dir($repoDir)) { if (!is_dir($repoDir)) {
logger('Repo directory does not exist: ' . $repoDir); logger('Repo directory does not exist: ' . $repoDir);
json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
@ -1785,7 +1785,7 @@ class Admin extends \Zotlabs\Web\Controller {
} else { } else {
json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
} }
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
$addonDir = $extendDir . '/addon'; $addonDir = $extendDir . '/addon';
if (!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if (!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
@ -1798,7 +1798,7 @@ class Admin extends \Zotlabs\Web\Controller {
} }
} }
} }
$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName; $repoDir = __DIR__ . '/../../store/[data]/git/sys/extend/addon/' . $repoName;
if (!is_dir($repoDir)) { if (!is_dir($repoDir)) {
logger('Repo directory does not exist: ' . $repoDir); logger('Repo directory does not exist: ' . $repoDir);
json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
@ -1818,7 +1818,7 @@ class Admin extends \Zotlabs\Web\Controller {
if (array_key_exists('repoURL', $_REQUEST)) { if (array_key_exists('repoURL', $_REQUEST)) {
require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies
$repoURL = $_REQUEST['repoURL']; $repoURL = $_REQUEST['repoURL'];
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
$addonDir = $extendDir . '/addon'; $addonDir = $extendDir . '/addon';
if (!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if (!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
@ -1846,7 +1846,7 @@ class Admin extends \Zotlabs\Web\Controller {
json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
} }
$repoDir = $addonDir . '/' . $repoName; $repoDir = $addonDir . '/' . $repoName;
$tempRepoBaseDir = __DIR__ . '/../../store/git/sys/temp/'; $tempRepoBaseDir = __DIR__ . '/../../store/[data]/git/sys/temp/';
$tempAddonDir = $tempRepoBaseDir . $repoName; $tempAddonDir = $tempRepoBaseDir . $repoName;
if (!is_writable($addonDir) || !is_writable($tempAddonDir)) { if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
@ -1880,9 +1880,9 @@ class Admin extends \Zotlabs\Web\Controller {
if (array_key_exists('repoURL', $_REQUEST)) { if (array_key_exists('repoURL', $_REQUEST)) {
require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies
$repoURL = $_REQUEST['repoURL']; $repoURL = $_REQUEST['repoURL'];
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
$addonDir = $extendDir . '/addon'; $addonDir = $extendDir . '/addon';
$tempAddonDir = __DIR__ . '/../../store/git/sys/temp'; $tempAddonDir = __DIR__ . '/../../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);
@ -1894,6 +1894,12 @@ class Admin extends \Zotlabs\Web\Controller {
} }
} }
} }
if (!is_dir($tempAddonDir)) {
if (!mkdir($tempAddonDir, 0770, true)) {
logger('Error creating temp plugin repo folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $extendDir, 'success' => false));
}
}
$repoName = null; $repoName = null;
if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];