aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-21 19:02:23 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-21 19:02:23 -0400
commit049147a9d78b981482297c3daf48c67f31754259 (patch)
tree79584e1c5a6153642732852d8e328f210860d178 /Zotlabs
parent5f2baa59f5491f3be964b60fce4bec2ccd840ac1 (diff)
downloadvolse-hubzilla-049147a9d78b981482297c3daf48c67f31754259.tar.gz
volse-hubzilla-049147a9d78b981482297c3daf48c67f31754259.tar.bz2
volse-hubzilla-049147a9d78b981482297c3daf48c67f31754259.zip
Successful new wiki git repo and item table record
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wiki.php25
-rw-r--r--Zotlabs/Storage/GitRepo.php9
2 files changed, 23 insertions, 11 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index ca0dcff82..c4546e5ef 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -62,6 +62,7 @@ class Wiki extends \Zotlabs\Web\Controller {
}
function post() {
+ require_once('include/wiki.php');
// TODO: Implement wiki API
@@ -77,37 +78,39 @@ class Wiki extends \Zotlabs\Web\Controller {
// Create a new wiki
if ((argc() > 3) && (argv(2) === 'create') && (argv(3) === 'wiki')) {
+ $which = argv(1);
// Determine if observer has permission to create wiki
if (local_channel()) {
$channel = \App::get_channel();
} else {
- $which = argv(1);
$channel = get_channel_by_nick($which);
+ $observer_hash = get_observer_hash();
// Figure out who the page owner is.
- $perms = get_all_perms(intval($channel['channel_id']), get_observer_hash());
+ $perms = get_all_perms(intval($channel['channel_id']), $observer_hash);
if (!$perms['write_wiki']) {
notice(t('Permission denied.') . EOL);
json_return_and_die(array('success' => false));
}
}
- $name = escape_tags(urlencode($_REQUEST['name'])); //Get new wiki name
+ $name = escape_tags(urlencode($_REQUEST['wikiName'])); //Get new wiki name
+ if($name === '') {
+ notice('Error creating wiki. Invalid name.');
+ goaway('/wiki');
+ }
// Get ACL for permissions
- $acl = new Zotlabs\Access\AccessList($channel);
+ $acl = new \Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_REQUEST);
-
- $r = wiki_create_wiki($channel, $name, $acl);
+ $r = wiki_create_wiki($channel, $observer_hash, $name, $acl);
if ($r['success']) {
- json_return_and_die(array('success' => true));
+ goaway('/wiki/'.$which.'/'.$name);
} else {
- json_return_and_die(array('success' => false));
+ notice('Error creating wiki');
+ goaway('/wiki');
}
}
-
json_return_and_die(array('success' => false));
-
-
}
}
diff --git a/Zotlabs/Storage/GitRepo.php b/Zotlabs/Storage/GitRepo.php
index 2a24e03c0..f4a129bb3 100644
--- a/Zotlabs/Storage/GitRepo.php
+++ b/Zotlabs/Storage/GitRepo.php
@@ -75,6 +75,15 @@ class GitRepo {
}
}
}
+
+ public function initRepo() {
+ if(!$this->path) return false;
+ try {
+ return $this->git->init($this->path);
+ } catch (\PHPGit\Exception\GitException $ex) {
+ return false;
+ }
+ }
public function pull() {
try {