Initialize default $g_wiki_engine_url in wiki API

Paving the way for removal of $g_path default value definition from config_defaults_inc.php.
mantisbt · Mar 14, 2015 · 662e3fb · 662e3fb
1 parent 60d1f1d
commit 662e3fb
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 25 deletions.
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -3774,10 +3774,15 @@
 $g_wiki_root_namespace = 'mantis';
 
 /**
- * URL under which the wiki engine is hosted.  Must be on the same server.
+ * URL under which the wiki engine is hosted.
+ * Must be on the same server as MantisBT, requires trailing '/'.
+ * By default, this is derived from the global MantisBT path ($g_path),
+ * replacing the URL's path component by the wiki engine string (i.e. if
+ * $g_path = 'http://example.com/mantis/' and $g_wiki_engine = 'dokuwiki',
+ * the wiki URL will be 'http://example.com/dokuwiki/')
  * @global string $g_wiki_engine_url
  */
-$g_wiki_engine_url = $t_protocol . '://' . $t_host . '/%wiki_engine%/';
+$g_wiki_engine_url = '';
 
 ####################
 # Recently Visited #

diff --git a/core/wiki_api.php b/core/wiki_api.php
@@ -49,31 +49,46 @@ function wiki_enabled() {
  * @access public
  */
 function wiki_init() {
-	if( wiki_enabled() ) {
+	if( !wiki_enabled() ) {
+		return;
+	}
+
+	$t_wiki_engine = config_get_global( 'wiki_engine' );
+
+	if( is_blank( config_get_global( 'wiki_engine_url' ) ) ) {
+		# Build default Wiki URL root based on MantisBT path
+		$t_url = parse_url( config_get_global( 'path' ) );
+
+		# Remove unwanted components and set path to Wiki engine name
+		unset( $t_url['query'], $t_url['fragment'] );
+		$t_url['path'] = '/' . $t_wiki_engine . '/';
 
-		# handle legacy style wiki integration
-		require_once( config_get_global( 'class_path' ) . 'MantisCoreWikiPlugin.class.php' );
-		switch( config_get_global( 'wiki_engine' ) ) {
-			case 'dokuwiki':
-				plugin_child( 'MantisCoreDokuwiki' );
-				break;
-			case 'mediawiki':
-				plugin_child( 'MantisCoreMediaWiki' );
-				break;
-			case 'twiki':
-				plugin_child( 'MantisCoreTwiki' );
-				break;
-			case 'WikkaWiki':
-				plugin_child( 'MantisCoreWikkaWiki' );
-				break;
-			case 'xwiki':
-				plugin_child( 'MantisCoreXwiki' );
-				break;
-		}
+		$t_url = http_build_url( $t_url );
+		config_set_global( 'wiki_engine_url', $t_url );
+	}
+
+	# handle legacy style wiki integration
+	require_once( config_get_global( 'class_path' ) . 'MantisCoreWikiPlugin.class.php' );
+	switch( $t_wiki_engine ) {
+		case 'dokuwiki':
+			plugin_child( 'MantisCoreDokuwiki' );
+			break;
+		case 'mediawiki':
+			plugin_child( 'MantisCoreMediaWiki' );
+			break;
+		case 'twiki':
+			plugin_child( 'MantisCoreTwiki' );
+			break;
+		case 'WikkaWiki':
+			plugin_child( 'MantisCoreWikkaWiki' );
+			break;
+		case 'xwiki':
+			plugin_child( 'MantisCoreXwiki' );
+			break;
+	}
 
-		if( is_null( event_signal( 'EVENT_WIKI_INIT' ) ) ) {
-			config_set_global( 'wiki_enable', OFF );
-		}
+	if( is_null( event_signal( 'EVENT_WIKI_INIT' ) ) ) {
+		config_set_global( 'wiki_enable', OFF );
 	}
 }