Adding language settings to config.php so that people can control the language output...

[viewsvn.git] / view.php

diff --git a/view.php b/view.php
index 8aaf1d5cee4d3561d3bfcba5b29c6e7954af51ea..b2aa13bebb64c89a75deab12832f804b1f674d0e 100644 (file)
--- a/view.php
+++ b/view.php
@@ -2,7 +2,7 @@
 /*=====================================================================*\
 || ###################################################################
 || # ViewSVN [#]version[#]
-|| # Copyright ©2002-[#]year[#] Iris Studios, Inc.
+|| # Copyright ©2002-[#]year[#] Blue Static
 || #
 || # This program is free software; you can redistribute it and/or modify
 || # it under the terms of the GNU General Public License as published by
@@ -20,42 +20,55 @@
 \*=====================================================================*/
 
 $fetchtemplates = array(
-       'view'
+       'view',
+       'property'
 );
 
+define('SVN', '$Id$');
+
 require_once('./global.php');
 
-$navbar = $viewsvn->paths->construct_breadcrumb($path);
+$navbar = ConstructNavbar();
 
 // ###################################################################
 
-$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $path);
-
-$show['head'] = ($viewsvn->svn->common->fetch_head_rev($path) != $viewsvn->paths->fetch_rev_num() AND $viewsvn->paths->fetch_rev_num() != 'HEAD');
-if ($show['head'])
+$revision = $headRev = new Revision($input->in['repos'], $input->in['rev'], $input->in['path']);
+if ($input->in['rev'])
 {
-       $link['gohead'] = $viewsvn->paths->out('browse.php' . $viewsvn->paths->fetch_rev_str(false, 'HEAD'), $path);
-       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->fetch_rev_num()), $path);
+       $headRev = new Revision($input->in['repos'], 0, $input->in['path']);
+       if ($headRev->revision != $revision->revision)
+       {
+               $show['head'] = true;
+               $link['gohead'] = ConstructLink('view', $input->in['repos'], $input->in['path'], 0);
+       }
 }
 
-$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($path, $viewsvn->paths->fetch_rev_num())) != -1 ? true : false);
-if ($show['prev'])
+if ($revision->revision - 1 > 0)
 {
-       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->fetch_rev_num(), $prev), $path);
+       $show['diff'] = true;
+       $link['diff'] = ConstructLink('diff', $input->in['repos'], $input->in['path'], $revision->revision);
 }
 
+$link['log'] = ConstructLink('log', $input->in['repos'], $input->in['path'], 0);
+
 // ###################################################################
 
-$logmsg = $viewsvn->svn->common->fetch_log($path, $viewsvn->paths->fetch_rev_num());
-unset($logmsg['files']);
+$revision->getRevisionInfo();
+
+$catdata = $lib->run('cat -r' . $revision->revision . ' ' . $lib->arg($repos->fetchPath($input->in['repos']) . $input->in['path']), true);
 
-$logmsg['message_clean'] = nl2br(htmlspecialchars($logmsg['message']));
+// ###################################################################
+
+$props = $revision->getPropsForPath($input->in['path']);
+$show['props'] = (sizeof($props) > 0);
+$proplist = FormatPropList($props);
 
-$catdata = implode("\n", $viewsvn->svn->cat($repos, $relpath, $viewsvn->paths->fetch_rev_num()));
+// ###################################################################
 
 // get language information
 require_once('./includes/file_types.php');
-$language = $filetypes[ $funct->fetch_extension($relpath) ];
+$extension = BSFunctions::FetchExtension($input->in['path']);
+$language = (isset($filetypes["$extension"]) ? $filetypes["$extension"] : null);
 
 // initialize GeSHi
 $mtstart = microtime();
@@ -66,18 +79,15 @@ $geshi = new Geshi($catdata, $language[MIMES_GESHI_LANGUAGE]);
 $geshi->enable_classes();
 
 // header
-$geshi->set_header_type(GESHI_HEADER_NONE);
+$geshi->set_header_type(GESHI_HEADER_DIV);
 
 // disable links
-$urls = array_keys($geshi->language_data['URLS']);
+$urls = (isset($geshi->language_data['URLS']) ? array_keys($geshi->language_data['URLS']) : array());
 foreach ($urls AS $key)
 {
        $geshi->set_url_for_keyword_group($key, '');
 }
 
-// css info
-$geshi->set_overall_class('code');
-
 // don't do anything stupid
 $geshi->set_case_keywords(GESHI_CAPS_NO_CHANGE);
 
@@ -90,7 +100,7 @@ $geshi->set_tab_width(5);
 // parse the code
 $catdata = $geshi->parse_code();
 
-$viewsvn->debug("time in GeSHi = " . $funct->fetch_microtime_diff($mtstart));
+BSRegister::Debug("time in GeSHi = " . BSFunctions::FetchMicrotimeDiff($mtstart));
 
 // ###################################################################