Merge branch 'dev' into sabre32

2 files changed, 42 insertions, 12 deletions

diff --git a/include/plugin.php b/include/plugin.php
index c95f8cbf9..6dfda1cc9 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -551,15 +551,21 @@ function head_get_css() {
 }
 
 function format_css_if_exists($source) {
-	if (strpos($source[0], '/') !== false)
+	$path_prefix = script_path() . '/';
+
+	if (strpos($source[0], '/') !== false) {
+		// The source is a URL
 		$path = $source[0];
-	else
+		// If the url starts with // then it's an absolute URL
+		if($source[0][0] === '/' && $source[0][1] === '/') $path_prefix = '';
+	} else {
+		// It's a file from the theme
 		$path = theme_include($source[0]);
+	}
 
 	if($path) {
-		$path =  script_path() . '/' . $path;
 		$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-		return '<link rel="stylesheet" href="' . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
+		return '<link rel="stylesheet" href="' . $path_prefix . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
 	}
 }
 
@@ -643,14 +649,20 @@ function head_get_main_js() {
 }
 
 function format_js_if_exists($source) {
-	if(strpos($source,'/') !== false)
+	$path_prefix = script_path() . '/';
+
+	if(strpos($source,'/') !== false) {
+		// The source is a URL
 		$path = $source;
-	else
+		// If the url starts with // then it's an absolute URL
+		if($source[0] === '/' && $source[1] === '/') $path_prefix = '';
+	} else {
+		// It's a file from the theme
 		$path = theme_include($source);
+	}
 	if($path) {
-		$path =  script_path() . '/' . $path;
 		$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-		return '<script src="' . $path . $qstring . '" ></script>' . "\r\n" ;
+		return '<script src="' . $path_prefix . $path . $qstring . '" ></script>' . "\r\n" ;
 	}
 }
 
diff --git a/include/wiki.php b/include/wiki.php
index a89db3358..63cf70f3c 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'];
@@ -240,13 +240,11 @@ function wiki_rename_page($arr) {
 		return array('message' => 'Wiki not found.', 'success' => false);
 	}
 	$page_path_old = $w['path'].'/'.$pageUrlName.'.md';
-	logger('$page_path_old: ' . $page_path_old);
 	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'] ;
-	logger('$page_path_new: ' . $page_path_new);
 	if (is_file($page_path_new)) {
 		return array('message' => 'Page already exists.', 'success' => false);
 	}
@@ -475,4 +473,24 @@ function wiki_generate_page_filename($name) {
 	} else {
 		return $file . '.md';
 	}	
+}
+
+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;
 }
\ No newline at end of file