diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-02-06 22:56:52 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-02-06 22:56:52 +0000 |
| commit | 3c7738bde4f7fa9d7074c42ef6e4fde1b12724b3 (patch) | |
| tree | abbe43c4efc79fa0072b4057bda8025077d7a68b /page_history.php | |
| parent | d9d51734da1bdfd0a08764a4984764da92d0ec6a (diff) | |
| download | wiki-3c7738bde4f7fa9d7074c42ef6e4fde1b12724b3.tar.gz wiki-3c7738bde4f7fa9d7074c42ef6e4fde1b12724b3.tar.bz2 wiki-3c7738bde4f7fa9d7074c42ef6e4fde1b12724b3.zip | |
further paermission renaming and cleanup
Diffstat (limited to 'page_history.php')
| -rw-r--r-- | page_history.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/page_history.php b/page_history.php index 1735a10..92e9b6f 100644 --- a/page_history.php +++ b/page_history.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.6 2006/02/06 00:12:23 squareing Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.7 2006/02/06 22:56:52 squareing Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: page_history.php,v 1.6 2006/02/06 00:12:23 squareing Exp $ + * $Id: page_history.php,v 1.7 2006/02/06 22:56:52 squareing Exp $ * @package wiki * @subpackage functions */ @@ -20,7 +20,7 @@ require_once( '../bit_setup_inc.php' ); include_once( WIKI_PKG_PATH.'BitPage.php'); $gBitSystem->verifyPackage( 'wiki' ); -$gBitSystem->verifyFeature( 'feature_history' ); +$gBitSystem->verifyFeature( 'wiki_history' ); $gBitSystem->verifyPermission( 'bit_p_view', tra( "Permission denied you cannot browse this page history" ) ); // Get the page from the request var or default it to HomePage @@ -43,35 +43,35 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) { } } elseif (isset($_REQUEST['source'])) { $gBitSmarty->assign('source', $_REQUEST['source']); - if ($_REQUEST['source'] == 'current') { - $gBitSmarty->assign('sourcev', nl2br(htmlentities($gContent->mInfo['data']))); - } else { - $version = $gContent->getHistory($_REQUEST["source"]); - $gBitSmarty->assign('sourcev', nl2br(htmlentities($version[0]["data"]))); - } + if ($_REQUEST['source'] == 'current') { + $gBitSmarty->assign('sourcev', nl2br(htmlentities($gContent->mInfo['data']))); + } else { + $version = $gContent->getHistory($_REQUEST["source"]); + $gBitSmarty->assign('sourcev', nl2br(htmlentities($version[0]["data"]))); + } } elseif (isset($_REQUEST["preview"])) { if( $version = $gContent->getHistory( $_REQUEST["preview"] ) ) { $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0]["data"], $version[0]["format_guid"] ) ); $gBitSmarty->assign_by_ref('version', $_REQUEST["preview"]); } } elseif( isset( $_REQUEST["diff2"] ) ) { - $from_version = $_REQUEST["diff2"]; + $from_version = $_REQUEST["diff2"]; $from_page = $gContent->getHistory( $from_version ); $from_lines = explode("\n",$from_page[0]["data"]); $to_version = $gContent->mInfo["version"]; $to_lines = explode("\n",$gContent->mInfo["data"]); - - include_once( WIKI_PKG_PATH.'diff.php'); - $diffx = new WikiDiff($from_lines,$to_lines); - $fmt = new WikiUnifiedDiffFormatter; - $html = $fmt->format($diffx, $from_lines); + + include_once( WIKI_PKG_PATH.'diff.php'); + $diffx = new WikiDiff($from_lines,$to_lines); + $fmt = new WikiUnifiedDiffFormatter; + $html = $fmt->format($diffx, $from_lines); $gBitSmarty->assign('diffdata', $html); $gBitSmarty->assign('diff2', 'y'); $gBitSmarty->assign('version_from', $from_version); $gBitSmarty->assign('version_to', $to_version); } elseif( isset( $_REQUEST["compare"] ) ) { - $from_version = $_REQUEST["compare"]; + $from_version = $_REQUEST["compare"]; $from_page = $gContent->getHistory($from_version); $gBitSmarty->assign('compare', 'y'); $gBitSmarty->assign_by_ref('diff_from', $gContent->parseData( $from_page[0]["data"], $from_page[0]["format_guid"] ) ); |
