From 9619d02be988a5af7746fa5524b17e645f99d40d Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 3 May 2016 06:30:46 -0400 Subject: AJAX and spinner for add repo form submission. Repo info will be displayed below the form. --- Zotlabs/Module/Admin.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 9bc0482c0..ae0a0ad85 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1651,10 +1651,8 @@ class Admin extends \Zotlabs\Web\Controller { if(array_key_exists('repoURL',$_REQUEST)) { require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies - info('Repo URL submitted: ' . $_REQUEST['repoURL']); - //$git = new Git(); + logger('Repo URL submitted: ' . $_REQUEST['repoURL']); $repoURL = $_REQUEST['repoURL']; - //logger('hubsites: new git object created: ' . json_encode($git)); $urlpath = parse_url($repoURL, PHP_URL_PATH); $lastslash = strrpos($urlpath, '/') + 1; $gitext = strrpos($urlpath, '.'); @@ -1666,27 +1664,32 @@ class Admin extends \Zotlabs\Web\Controller { break; } $storepath = realpath(__DIR__ . '/../../store/'); - logger('storepath: ' . $storepath); + //logger('storepath: ' . $storepath); $repopath = $storepath . '/pluginrepos/' . $reponame; if (!file_exists($repopath)) { - logger('epopath does not exist'); + //logger('repopath does not exist'); if (mkdir($repopath, 0770, true)) { - logger('repopath created'); + //logger('repopath created'); $git = new Git(); - logger('new git object created'); + //logger('new git object created'); $cloned = $git->clone($repoURL, $repopath); if (!$cloned) { logger('git clone failed'); notice('Repo coule not be cloned. Filesystem path error.'); - return null; + json_return_and_die(array('message' => 'Repo coule not be cloned. Filesystem path error.', 'success' => false)); } + json_return_and_die(array('message' => 'Successfully cloned to: ' . $repopath , 'success' => true)); } else { logger('repopath could not be created'); notice('Repo coule not be cloned. Filesystem path error.'); - return null; + json_return_and_die(array('message' => 'Repo coule not be cloned. Filesystem path error', 'success' => false)); } - } + } else { + json_return_and_die(array('message' => 'Repo already exists at: ' . $repopath, 'success' => true)); + } + } else { + json_return_and_die(array('message' => 'No repo URL provided', 'success' => false)); } break; default: -- cgit v1.2.3