Merge branch '1.10RC'1.10

1 files changed, 185 insertions, 13 deletions

diff --git a/include/wiki.php b/include/wiki.php
index 4aa3fc1b4..424b2d9a0 100644
--- a/include/wiki.php
+++ b/include/wiki.php
@@ -51,7 +51,7 @@ function wiki_init_wiki($channel, $wiki) {
 		return null;
 	}
 	// Create GitRepo object 	
-	$git = new GitRepo($channel['channel_address'], null, false, $name, __DIR__ . '/../' . $path);	
+	$git = new GitRepo($channel['channel_address'], null, false, $wiki['urlName'], __DIR__ . '/../' . $path);	
 	if(!$git->initRepo()) {
 		logger('Error creating new git repo in ' . $git->path);
 		return null;
@@ -82,7 +82,7 @@ function wiki_create_wiki($channel, $observer_hash, $wiki, $acl) {
 	$ac = $acl->get();
 	$mid = item_message_id();
 	$arr = array();	// Initialize the array of parameters for the post
-	$item_hidden = 0; // TODO: Allow form creator to send post to ACL about new game automatically
+	$item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0); 
 	$wiki_url = z_root() . '/wiki/' . $channel['channel_address'] . '/' . $wiki['urlName'];
 	$arr['aid'] = $channel['channel_account_id'];
 	$arr['uid'] = $channel['channel_id'];
@@ -231,6 +231,32 @@ function wiki_create_page($name, $resource_id) {
 	
 }
 
+function wiki_rename_page($arr) {
+	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
+	$pageNewName = ((array_key_exists('pageNewName',$arr)) ? $arr['pageNewName'] : '');
+	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
+	$w = wiki_get_wiki($resource_id);
+	if (!$w['path']) {
+		return array('message' => 'Wiki not found.', 'success' => false);
+	}
+	$page_path_old = $w['path'].'/'.$pageUrlName.'.md';
+	if (!is_readable($page_path_old) === true) {
+		return array('message' => 'Cannot read wiki page: ' . $page_path_old, 'success' => false);
+	}
+	$page = array('rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), 'urlName' => urlencode(escape_tags($pageNewName)), 'fileName' => urlencode(escape_tags($pageNewName)).'.md');
+	$page_path_new = $w['path'] . '/' . $page['fileName'] ;
+	if (is_file($page_path_new)) {
+		return array('message' => 'Page already exists.', 'success' => false);
+	}
+	// Rename the page file in the wiki repo
+	if(!rename($page_path_old, $page_path_new)) {
+		return array('message' => 'Error renaming page file.', 'success' => false);
+	} else {
+		return array('page' => $page, 'message' => '', 'success' => true);
+	}
+	
+}
+
 function wiki_get_page_content($arr) {
 	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
 	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
@@ -319,7 +345,7 @@ function wiki_revert_page($arr) {
 	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
 	$commitHash = ((array_key_exists('commitHash',$arr)) ? $arr['commitHash'] : null);
 	if (! $commitHash) {
-		return array('content' => $content, 'message' => 'No commit has provided', 'success' => false);
+		return array('content' => $content, 'message' => 'No commit was provided', 'success' => false);
 	}
 	$w = wiki_get_wiki($resource_id);
 	if (!$w['path']) {
@@ -342,7 +368,7 @@ function wiki_revert_page($arr) {
 				}
 			}
 		} catch (\PHPGit\Exception\GitException $e) {
-			json_return_and_die(array('content' => $content, 'message' => 'GitRepo error thrown', 'success' => false));
+			return array('content' => $content, 'message' => 'GitRepo error thrown', 'success' => false);
 		}
 		return array('content' => $content, 'message' => '', 'success' => true);
 	} else {
@@ -350,11 +376,62 @@ function wiki_revert_page($arr) {
 	}
 }
 
+function wiki_compare_page($arr) {
+	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
+	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
+	$currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : 'HEAD');
+	$compareCommit = ((array_key_exists('compareCommit',$arr)) ? $arr['compareCommit'] : null);
+	if (! $compareCommit) {
+		return array('message' => 'No compare commit was provided', 'success' => false);
+	}
+	$w = wiki_get_wiki($resource_id);
+	if (!$w['path']) {
+		return array('message' => 'Error reading wiki', 'success' => false);
+	}
+	$page_path = $w['path'].'/'.$pageUrlName.'.md';
+	if (is_readable($page_path) === true) {
+		$reponame = ((array_key_exists('title', $w['wiki'])) ? urlencode($w['wiki']['title']) : 'repo');
+		if($reponame === '') {
+			$reponame = 'repo';
+		}
+		$git = new GitRepo('', null, false, $w['wiki']['title'], $w['path']);
+		$compareContent = $currentContent = '';
+		try {
+			foreach ($git->git->tree($currentCommit) as $object) {
+				if ($object['type'] == 'blob' && $object['file'] === $pageUrlName.'.md' ) {
+						$currentContent = $git->git->cat->blob($object['hash']);						
+				}
+			}
+			foreach ($git->git->tree($compareCommit) as $object) {
+				if ($object['type'] == 'blob' && $object['file'] === $pageUrlName.'.md' ) {
+						$compareContent = $git->git->cat->blob($object['hash']);						
+				}
+			}
+			require_once('library/class.Diff.php');
+			$diff = Diff::toTable(Diff::compare($currentContent, $compareContent));
+		} catch (\PHPGit\Exception\GitException $e) {
+			return array('message' => 'GitRepo error thrown', 'success' => false);
+		}
+		return array('diff' => $diff, 'message' => '', 'success' => true);
+	} else {
+		return array('message' => 'Page file not writable', 'success' => false);
+	}
+}
+
 function wiki_git_commit($arr) {
 	$files = ((array_key_exists('files', $arr)) ? $arr['files'] : null);
+	$all = ((array_key_exists('all', $arr)) ? $arr['all'] : false);
 	$commit_msg = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : 'Repo updated');
-	$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : json_return_and_die(array('message' => 'Wiki resource_id required for git commit', 'success' => false)));
-	$observer = ((array_key_exists('observer', $arr)) ? $arr['observer'] : json_return_and_die(array('message' => 'Observer required for git commit', 'success' => false)));
+	if(array_key_exists('resource_id', $arr)) {
+		$resource_id = $arr['resource_id'];
+	} else {
+		return array('message' => 'Wiki resource_id required for git commit', 'success' => false);
+	}
+	if(array_key_exists('observer', $arr)) {
+		$observer = $arr['observer'];
+	} else {
+		return array('message' => 'Observer required for git commit', 'success' => false);
+	}	
 	$w = wiki_get_wiki($resource_id);
 	if (!$w['path']) {
 		return array('message' => 'Error reading wiki', 'success' => false);
@@ -369,23 +446,23 @@ function wiki_git_commit($arr) {
 		if ($files === null) {
 			$options = array('all' => true); // git commit option to include all changes
 		} else {
-			$options = array(); // git commit options
+			$options = array('all' => $all); // git commit options\
 			foreach ($files as $file) {
 				if (!$git->git->add($file)) {	// add specified files to the git repo stage
 					if (!$git->git->reset->hard()) {
-						json_return_and_die(array('message' => 'Error adding file to git stage: ' . $file . '. Error resetting git repo.', 'success' => false));
+						return array('message' => 'Error adding file to git stage: ' . $file . '. Error resetting git repo.', 'success' => false);
 					}
-					json_return_and_die(array('message' => 'Error adding file to git stage: ' . $file, 'success' => false));
+					return array('message' => 'Error adding file to git stage: ' . $file, 'success' => false);
 				}
 			}
 		}
 		if ($git->commit($commit_msg, $options)) {
-			json_return_and_die(array('message' => 'Wiki repo commit succeeded', 'success' => true));
+			return array('message' => 'Wiki repo commit succeeded', 'success' => true);
 		} else {
-			json_return_and_die(array('message' => 'Wiki repo commit failed', 'success' => false));
+			return array('message' => 'Wiki repo commit failed', 'success' => false);
 		}
 	} catch (\PHPGit\Exception\GitException $e) {
-		json_return_and_die(array('message' => 'GitRepo error thrown', 'success' => false));
+		return array('message' => 'GitRepo error thrown', 'success' => false);
 	}
 }
 
@@ -396,4 +473,99 @@ function wiki_generate_page_filename($name) {
 	} else {
 		return $file . '.md';
 	}	
-}
\ No newline at end of file
+}
+
+function wiki_convert_links($s, $wikiURL) {
+	
+	if (strpos($s,'[[') !== false) {
+		preg_match_all("/\[\[(.*?)\]\]/", $s, $match);
+		$pages = $pageURLs = array();
+		foreach ($match[1] as $m) {
+			// TODO: Why do we need to double urlencode for this to work?
+			$pageURLs[] = urlencode(urlencode(escape_tags($m)));
+			$pages[] = $m;
+		}
+		$idx = 0;
+		while(strpos($s,'[[') !== false) {
+		$replace = '<a href="'.$wikiURL.'/'.$pageURLs[$idx].'">'.$pages[$idx].'</a>';
+			$s = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1);
+			$idx++;
+		}
+	}
+	return $s;
+}
+
+function wiki_generate_toc($s) {
+	
+	if (strpos($s,'[toc]') !== false) {
+		//$toc_md = wiki_toc($s);	// Generate Markdown-formatted list prior to HTML render
+		$toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/
+		$s = preg_replace("/\[toc\]/", $toc_md, $s, -1);
+	}
+	return $s;
+}
+
+// This function is derived from 
+// http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
+function wiki_toc($content) {
+  // ensure using only "\n" as line-break
+  $source = str_replace(["\r\n", "\r"], "\n", $content);
+
+  // look for markdown TOC items
+  preg_match_all(
+    '/^(?:=|-|#).*$/m',
+    $source,
+    $matches,
+    PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
+  );
+
+  // preprocess: iterate matched lines to create an array of items
+  // where each item is an array(level, text)
+  $file_size = strlen($source);
+  foreach ($matches[0] as $item) {
+    $found_mark = substr($item[0], 0, 1);
+    if ($found_mark == '#') {
+      // text is the found item
+      $item_text = $item[0];
+      $item_level = strrpos($item_text, '#') + 1;
+      $item_text = substr($item_text, $item_level);
+    } else {
+      // text is the previous line (empty if <hr>)
+      $item_offset = $item[1];
+      $prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2));
+      $item_text =
+        substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1);
+      $item_text = trim($item_text);
+      $item_level = $found_mark == '=' ? 1 : 2;
+    }
+    if (!trim($item_text) OR strpos($item_text, '|') !== FALSE) {
+      // item is an horizontal separator or a table header, don't mind
+      continue;
+    }
+    $raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)];
+  }
+	$o = '';
+	foreach($raw_toc as $t) {
+		$level = intval($t['level']);
+		$text = $t['text'];
+		switch ($level) {
+			case 1:
+				$li = '* ';
+				break;
+			case 2:
+				$li = '  * ';
+				break;
+			case 3:
+				$li = '    * ';
+				break;
+			case 4:
+				$li = '      * ';
+				break;
+			default:
+				$li = '* ';
+				break;
+		}
+		$o .= $li . $text . "\n";
+	}
+  return $o;
+}