[Web-erp-svn] SF.net SVN: web-erp:[5807] trunk

[<dai...@us...>]

Revision: 5807
          http://sourceforge.net/p/web-erp/reponame/5807
Author:   daintree
Date:     2013-02-01 07:51:23 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
fix wiki links

Modified Paths:
--------------
    trunk/config.distrib.php
    trunk/doc/Change.log
    trunk/includes/MiscFunctions.php

Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php	2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/config.distrib.php	2013-02-01 07:51:23 UTC (rev 5807)
@@ -11,10 +11,6 @@
 // Whether to display the demo login and password or not on the login screen
 $AllowDemoMode = True;
 
-// webERP version
-
-// $Version = '3.13-rc0 UTF-8 capable';
-
 // The timezone of the business - this allows the possibility of having
 // the web-server on a overseas machine but record local time
 // this is not necessary if you have your own server locally
@@ -58,9 +54,9 @@
 //$SessionSavePath = '/tmp';
 
 // which encryption function should be used
-//$CryptFunction = "md5"; // MD5 Hash
-$CryptFunction = "sha1"; // SHA1 Hash
-//$CryptFunction = ""; // Plain Text
+//$CryptFunction = 'md5'; // MD5 Hash
+$CryptFunction = 'sha1'; // SHA1 Hash
+//$CryptFunction = ''; // Plain Text
 
 //Setting to 12 or 24 determines the format of the clock display at the end of all screens
 $DefaultClock = 12;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/doc/Change.log	2013-02-01 07:51:23 UTC (rev 5807)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+31/1/13 Phil: includes/MiscFunctions.php fix wiki links
 29/1/13 Tim: Fix sql injection security hole in session.inc.
 
 27/1/13 Version 4.10.0 Released

Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php	2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/includes/MiscFunctions.php	2013-02-01 07:51:23 UTC (rev 5807)
@@ -248,16 +248,14 @@
 		$WikiPath='../' . $_SESSION['WikiPath'] . '/';
 	}
 	if ($_SESSION['WikiApp']==_('WackoWiki')){
-		echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath .
-$WikiType .  $WikiPageID . '>  <br />';
+		echo '<a href="' . $WikiPath . $WikiType .  $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' </a>  <br />';
 	} elseif ($_SESSION['WikiApp']==_('MediaWiki')){
-		echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath .
-'index.php/' . $WikiType . '/' .  $WikiPageID . '>  <br />';
+		echo '<a href="' . $WikiPath . 'index.php?title=' .  $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . '</a><br />';
 	} elseif ($_SESSION['WikiApp']==_('DokuWiki')){
-		echo $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . ' ' . _('Wiki ' .
-$WikiType . ' Knowlege Base') . ' <br />';
+		echo '<a href="' . $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . '" target="_blank">' . _('Wiki ' .$WikiType . ' Knowlege Base') . '</a><br />';
 	}
 }
+
 //  Lindsay debug stuff
 function LogBackTrace( $dest = 0 ) {
     error_log( "***BEGIN STACK BACKTRACE***", $dest );