From 8abe0ca677c2ffaa11032ed622b708e13822dc7e Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 15 Apr 2013 16:54:46 +0200 Subject: [PATCH] updated GeSHi to 1.0.8.11 (issue #60) --- htdocs/application/config/geshi_languages.php | 21 + .../libraries/geshi/contrib/aliased.php | 119 +- .../libraries/geshi/contrib/cssgen.php | 16 +- .../libraries/geshi/contrib/example.php | 2 +- .../libraries/geshi/contrib/langcheck.php | 74 +- .../libraries/geshi/contrib/langwiz.php | 36 +- htdocs/application/libraries/geshi/geshi.php | 68 +- .../application/libraries/geshi/geshi/4cs.php | 2 +- .../libraries/geshi/geshi/6502acme.php | 2 +- .../libraries/geshi/geshi/6502kickass.php | 2 +- .../libraries/geshi/geshi/6502tasm.php | 2 +- .../libraries/geshi/geshi/68000devpac.php | 2 +- .../libraries/geshi/geshi/abap.php | 2 +- .../libraries/geshi/geshi/actionscript.php | 2 +- .../libraries/geshi/geshi/actionscript3.php | 4 +- .../application/libraries/geshi/geshi/ada.php | 2 +- .../libraries/geshi/geshi/algol68.php | 2 +- .../libraries/geshi/geshi/apache.php | 2 +- .../libraries/geshi/geshi/applescript.php | 2 +- .../libraries/geshi/geshi/apt_sources.php | 2 +- .../application/libraries/geshi/geshi/arm.php | 3318 +++++++++++++++++ .../application/libraries/geshi/geshi/asm.php | 534 ++- .../application/libraries/geshi/geshi/asp.php | 2 +- .../libraries/geshi/geshi/asymptote.php | 194 + .../libraries/geshi/geshi/autoconf.php | 2 +- .../libraries/geshi/geshi/autohotkey.php | 2 +- .../libraries/geshi/geshi/autoit.php | 2 +- .../libraries/geshi/geshi/avisynth.php | 2 +- .../application/libraries/geshi/geshi/awk.php | 2 +- .../libraries/geshi/geshi/bascomavr.php | 2 +- .../libraries/geshi/geshi/bash.php | 6 +- .../libraries/geshi/geshi/basic4gl.php | 2 +- .../application/libraries/geshi/geshi/bf.php | 15 +- .../libraries/geshi/geshi/bibtex.php | 2 +- .../libraries/geshi/geshi/blitzbasic.php | 4 +- .../application/libraries/geshi/geshi/bnf.php | 2 +- .../application/libraries/geshi/geshi/boo.php | 2 +- .../application/libraries/geshi/geshi/c.php | 2 +- .../libraries/geshi/geshi/c_loadrunner.php | 2 +- .../libraries/geshi/geshi/c_mac.php | 2 +- .../libraries/geshi/geshi/caddcl.php | 2 +- .../libraries/geshi/geshi/cadlisp.php | 2 +- .../libraries/geshi/geshi/cfdg.php | 2 +- .../application/libraries/geshi/geshi/cfm.php | 2 +- .../libraries/geshi/geshi/chaiscript.php | 4 +- .../application/libraries/geshi/geshi/cil.php | 2 +- .../libraries/geshi/geshi/clojure.php | 2 +- .../libraries/geshi/geshi/cmake.php | 2 +- .../libraries/geshi/geshi/cobol.php | 2 +- .../libraries/geshi/geshi/coffeescript.php | 2 +- .../libraries/geshi/geshi/cpp-qt.php | 6 +- .../application/libraries/geshi/geshi/cpp.php | 2 +- .../libraries/geshi/geshi/csharp.php | 19 +- .../application/libraries/geshi/geshi/css.php | 7 +- .../libraries/geshi/geshi/cuesheet.php | 2 +- .../application/libraries/geshi/geshi/d.php | 68 +- .../application/libraries/geshi/geshi/dcl.php | 192 + .../libraries/geshi/geshi/dcpu16.php | 131 + .../application/libraries/geshi/geshi/dcs.php | 2 +- .../libraries/geshi/geshi/delphi.php | 46 +- .../libraries/geshi/geshi/diff.php | 2 +- .../application/libraries/geshi/geshi/div.php | 2 +- .../application/libraries/geshi/geshi/dos.php | 8 +- .../application/libraries/geshi/geshi/dot.php | 2 +- .../application/libraries/geshi/geshi/e.php | 2 +- .../libraries/geshi/geshi/ecmascript.php | 2 +- .../libraries/geshi/geshi/eiffel.php | 2 +- .../libraries/geshi/geshi/email.php | 16 +- .../application/libraries/geshi/geshi/epc.php | 2 +- .../libraries/geshi/geshi/erlang.php | 2 +- .../libraries/geshi/geshi/euphoria.php | 2 +- .../application/libraries/geshi/geshi/f1.php | 2 +- .../libraries/geshi/geshi/falcon.php | 2 +- .../application/libraries/geshi/geshi/fo.php | 2 +- .../libraries/geshi/geshi/fortran.php | 2 +- .../libraries/geshi/geshi/freebasic.php | 2 +- .../libraries/geshi/geshi/freeswitch.php | 168 + .../libraries/geshi/geshi/fsharp.php | 4 +- .../libraries/geshi/geshi/gambas.php | 2 +- .../application/libraries/geshi/geshi/gdb.php | 2 +- .../libraries/geshi/geshi/genero.php | 2 +- .../libraries/geshi/geshi/genie.php | 2 +- .../libraries/geshi/geshi/gettext.php | 2 +- .../libraries/geshi/geshi/glsl.php | 2 +- .../application/libraries/geshi/geshi/gml.php | 2 +- .../libraries/geshi/geshi/gnuplot.php | 2 +- .../application/libraries/geshi/geshi/go.php | 2 +- .../libraries/geshi/geshi/groovy.php | 2 +- .../libraries/geshi/geshi/gwbasic.php | 2 +- .../libraries/geshi/geshi/haskell.php | 8 +- .../libraries/geshi/geshi/haxe.php | 161 + .../libraries/geshi/geshi/hicest.php | 2 +- .../libraries/geshi/geshi/hq9plus.php | 2 +- .../libraries/geshi/geshi/html4strict.php | 4 +- .../libraries/geshi/geshi/html5.php | 8 +- .../libraries/geshi/geshi/icon.php | 2 +- .../application/libraries/geshi/geshi/idl.php | 2 +- .../application/libraries/geshi/geshi/ini.php | 2 +- .../libraries/geshi/geshi/inno.php | 2 +- .../libraries/geshi/geshi/intercal.php | 2 +- .../application/libraries/geshi/geshi/io.php | 2 +- .../application/libraries/geshi/geshi/j.php | 2 +- .../libraries/geshi/geshi/java.php | 4 +- .../libraries/geshi/geshi/java5.php | 328 +- .../libraries/geshi/geshi/javascript.php | 62 +- .../libraries/geshi/geshi/jquery.php | 2 +- .../libraries/geshi/geshi/kixtart.php | 2 +- .../libraries/geshi/geshi/klonec.php | 2 +- .../libraries/geshi/geshi/klonecpp.php | 2 +- .../libraries/geshi/geshi/latex.php | 6 +- .../application/libraries/geshi/geshi/lb.php | 2 +- .../libraries/geshi/geshi/ldif.php | 116 + .../libraries/geshi/geshi/lisp.php | 2 +- .../libraries/geshi/geshi/llvm.php | 2 +- .../libraries/geshi/geshi/locobasic.php | 2 +- .../libraries/geshi/geshi/logtalk.php | 2 +- .../libraries/geshi/geshi/lolcode.php | 2 +- .../libraries/geshi/geshi/lotusformulas.php | 2 +- .../libraries/geshi/geshi/lotusscript.php | 2 +- .../libraries/geshi/geshi/lscript.php | 2 +- .../libraries/geshi/geshi/lsl2.php | 2 +- .../application/libraries/geshi/geshi/lua.php | 6 +- .../libraries/geshi/geshi/m68k.php | 2 +- .../libraries/geshi/geshi/magiksf.php | 2 +- .../libraries/geshi/geshi/make.php | 2 +- .../libraries/geshi/geshi/mapbasic.php | 2 +- .../libraries/geshi/geshi/matlab.php | 2 +- .../libraries/geshi/geshi/mirc.php | 2 +- .../libraries/geshi/geshi/mmix.php | 66 +- .../libraries/geshi/geshi/modula2.php | 2 +- .../libraries/geshi/geshi/modula3.php | 4 +- .../libraries/geshi/geshi/mpasm.php | 2 +- .../libraries/geshi/geshi/mxml.php | 2 +- .../libraries/geshi/geshi/mysql.php | 34 +- .../libraries/geshi/geshi/nagios.php | 225 ++ .../libraries/geshi/geshi/netrexx.php | 163 + .../libraries/geshi/geshi/newlisp.php | 2 +- .../libraries/geshi/geshi/nsis.php | 2 +- .../libraries/geshi/geshi/oberon2.php | 2 +- .../libraries/geshi/geshi/objc.php | 2 +- .../libraries/geshi/geshi/objeck.php | 2 +- .../libraries/geshi/geshi/ocaml-brief.php | 2 +- .../libraries/geshi/geshi/ocaml.php | 2 +- .../libraries/geshi/geshi/octave.php | 515 +++ .../libraries/geshi/geshi/oobas.php | 2 +- .../libraries/geshi/geshi/oorexx.php | 171 + .../libraries/geshi/geshi/oracle11.php | 2 +- .../libraries/geshi/geshi/oracle8.php | 2 +- .../libraries/geshi/geshi/oxygene.php | 6 +- .../application/libraries/geshi/geshi/oz.php | 2 +- .../libraries/geshi/geshi/parasail.php | 133 + .../libraries/geshi/geshi/parigp.php | 277 ++ .../libraries/geshi/geshi/pascal.php | 53 +- .../libraries/geshi/geshi/pcre.php | 2 +- .../application/libraries/geshi/geshi/per.php | 2 +- .../libraries/geshi/geshi/perl.php | 2 +- .../libraries/geshi/geshi/perl6.php | 2 +- .../application/libraries/geshi/geshi/pf.php | 2 +- .../libraries/geshi/geshi/php-brief.php | 4 +- .../application/libraries/geshi/geshi/php.php | 21 +- .../libraries/geshi/geshi/pic16.php | 2 +- .../libraries/geshi/geshi/pike.php | 2 +- .../libraries/geshi/geshi/pixelbender.php | 2 +- .../application/libraries/geshi/geshi/pli.php | 2 +- .../libraries/geshi/geshi/plsql.php | 2 +- .../libraries/geshi/geshi/postgresql.php | 2 +- .../libraries/geshi/geshi/povray.php | 2 +- .../libraries/geshi/geshi/powerbuilder.php | 2 +- .../libraries/geshi/geshi/powershell.php | 2 +- .../libraries/geshi/geshi/proftpd.php | 2 +- .../libraries/geshi/geshi/progress.php | 2 +- .../libraries/geshi/geshi/prolog.php | 2 +- .../libraries/geshi/geshi/properties.php | 2 +- .../libraries/geshi/geshi/providex.php | 2 +- .../libraries/geshi/geshi/purebasic.php | 2 +- .../libraries/geshi/geshi/pycon.php | 2 +- .../libraries/geshi/geshi/pys60.php | 273 ++ .../libraries/geshi/geshi/python.php | 2 +- .../application/libraries/geshi/geshi/q.php | 2 +- .../libraries/geshi/geshi/qbasic.php | 6 +- .../libraries/geshi/geshi/rails.php | 2 +- .../libraries/geshi/geshi/rebol.php | 2 +- .../application/libraries/geshi/geshi/reg.php | 2 +- .../libraries/geshi/geshi/rexx.php | 162 + .../libraries/geshi/geshi/robots.php | 2 +- .../libraries/geshi/geshi/rpmspec.php | 2 +- .../libraries/geshi/geshi/rsplus.php | 20 +- .../libraries/geshi/geshi/ruby.php | 2 +- .../application/libraries/geshi/geshi/sas.php | 2 +- .../libraries/geshi/geshi/scala.php | 26 +- .../libraries/geshi/geshi/scheme.php | 2 +- .../libraries/geshi/geshi/scilab.php | 2 +- .../libraries/geshi/geshi/sdlbasic.php | 2 +- .../libraries/geshi/geshi/smalltalk.php | 2 +- .../libraries/geshi/geshi/smarty.php | 2 +- .../libraries/geshi/geshi/spark.php | 132 + .../libraries/geshi/geshi/sparql.php | 155 + .../application/libraries/geshi/geshi/sql.php | 2 +- .../libraries/geshi/geshi/stonescript.php | 307 ++ .../libraries/geshi/geshi/systemverilog.php | 6 +- .../application/libraries/geshi/geshi/tcl.php | 2 +- .../libraries/geshi/geshi/teraterm.php | 2 +- .../libraries/geshi/geshi/text.php | 2 +- .../libraries/geshi/geshi/thinbasic.php | 2 +- .../libraries/geshi/geshi/tsql.php | 6 +- .../libraries/geshi/geshi/typoscript.php | 20 +- .../libraries/geshi/geshi/unicon.php | 2 +- .../application/libraries/geshi/geshi/upc.php | 270 ++ .../libraries/geshi/geshi/urbi.php | 200 + .../libraries/geshi/geshi/uscript.php | 2 +- .../libraries/geshi/geshi/vala.php | 2 +- .../application/libraries/geshi/geshi/vb.php | 2 +- .../libraries/geshi/geshi/vbnet.php | 125 +- .../libraries/geshi/geshi/vedit.php | 103 + .../libraries/geshi/geshi/verilog.php | 4 +- .../libraries/geshi/geshi/vhdl.php | 105 +- .../application/libraries/geshi/geshi/vim.php | 2 +- .../libraries/geshi/geshi/visualfoxpro.php | 2 +- .../libraries/geshi/geshi/visualprolog.php | 2 +- .../libraries/geshi/geshi/whitespace.php | 2 +- .../libraries/geshi/geshi/whois.php | 2 +- .../libraries/geshi/geshi/winbatch.php | 2 +- .../libraries/geshi/geshi/xbasic.php | 2 +- .../application/libraries/geshi/geshi/xml.php | 2 +- .../libraries/geshi/geshi/xorg_conf.php | 2 +- .../application/libraries/geshi/geshi/xpp.php | 2 +- .../libraries/geshi/geshi/yaml.php | 2 +- .../application/libraries/geshi/geshi/z80.php | 2 +- .../libraries/geshi/geshi/zxbasic.php | 2 +- 229 files changed, 8797 insertions(+), 904 deletions(-) create mode 100644 htdocs/application/libraries/geshi/geshi/arm.php create mode 100644 htdocs/application/libraries/geshi/geshi/asymptote.php create mode 100644 htdocs/application/libraries/geshi/geshi/dcl.php create mode 100644 htdocs/application/libraries/geshi/geshi/dcpu16.php create mode 100644 htdocs/application/libraries/geshi/geshi/freeswitch.php create mode 100644 htdocs/application/libraries/geshi/geshi/haxe.php create mode 100644 htdocs/application/libraries/geshi/geshi/ldif.php create mode 100644 htdocs/application/libraries/geshi/geshi/nagios.php create mode 100644 htdocs/application/libraries/geshi/geshi/netrexx.php create mode 100644 htdocs/application/libraries/geshi/geshi/octave.php create mode 100644 htdocs/application/libraries/geshi/geshi/oorexx.php create mode 100644 htdocs/application/libraries/geshi/geshi/parasail.php create mode 100644 htdocs/application/libraries/geshi/geshi/parigp.php create mode 100644 htdocs/application/libraries/geshi/geshi/pys60.php create mode 100644 htdocs/application/libraries/geshi/geshi/rexx.php create mode 100644 htdocs/application/libraries/geshi/geshi/spark.php create mode 100644 htdocs/application/libraries/geshi/geshi/sparql.php create mode 100644 htdocs/application/libraries/geshi/geshi/stonescript.php create mode 100644 htdocs/application/libraries/geshi/geshi/upc.php create mode 100644 htdocs/application/libraries/geshi/geshi/urbi.php create mode 100644 htdocs/application/libraries/geshi/geshi/vedit.php diff --git a/htdocs/application/config/geshi_languages.php b/htdocs/application/config/geshi_languages.php index c39c58d..f98b42d 100644 --- a/htdocs/application/config/geshi_languages.php +++ b/htdocs/application/config/geshi_languages.php @@ -39,7 +39,9 @@ $config['geshi_languages'] = array( 'apache' => 'Apache', 'applescript' => 'AppleScript', 'apt_sources' => 'Apt sources.list', + 'arm' => 'ARM Assembler', 'asm' => 'x86 Assembler', + 'asymptote' => 'asymptote', 'asp' => 'ASP', 'autoconf' => 'autoconf', 'autohotkey' => 'Autohotkey', @@ -69,6 +71,8 @@ $config['geshi_languages'] = array( 'cuesheet' => 'Cuesheet', 'd' => 'D', 'dcs' => 'DCS', + 'dcl' => 'DCL', + 'dcpu16' => 'DCPU/16 Assembly', 'delphi' => 'Delphi (Object Pascal)', 'div' => 'DIV', 'dos' => 'DOS', @@ -84,6 +88,7 @@ $config['geshi_languages'] = array( 'fo' => 'fo', 'fortran' => 'Fortran', 'freebasic' => 'FreeBasic', + 'freeswitch' => 'FreeSWITCH', 'fsharp' => 'F#', 'gambas' => 'GAMBAS', 'gdb' => 'GDB', @@ -96,6 +101,7 @@ $config['geshi_languages'] = array( 'groovy' => 'Groovy', 'gwbasic' => 'GwBasic', 'haskell' => 'Haskell', + 'haxe' => 'Haxe', 'hicest' => 'HicEst', 'hq9plus' => 'HQ9+', 'html4strict' => 'HTML 4.01 strict', @@ -114,6 +120,7 @@ $config['geshi_languages'] = array( 'klonec' => 'KLone with C', 'klonecpp' => 'KLone with C++', 'lb' => 'Liberty BASIC', + 'ldif' => 'LDIF', 'lisp' => 'Generic Lisp', 'llvm' => 'LLVM', 'locobasic' => 'Locomotive Basic (Amstrad CPC series)', @@ -135,17 +142,23 @@ $config['geshi_languages'] = array( 'mpasm' => 'Microchip Assembler', 'mxml' => 'MXML', 'mysql' => 'MySQL', + 'nagios' => 'Nagios', + 'netrexx' => 'NetRexx', 'newlisp' => 'newLISP', 'nsis' => 'Nullsoft Scriptable Install System', 'oberon2' => 'Oberon-2', 'objc' => 'Objective-C', 'objeck' => 'Objeck Programming Language', 'ocaml' => 'OCaml (Objective Caml)', + 'octave' => 'GNU Octave M-file', 'oobas' => 'OpenOffice.org Basic', + 'oorexx' => 'ooRexx', 'oracle11' => 'Oracle 11i', 'oracle8' => 'Oracle 8', 'oxygene' => 'Delphi Prism (Oxygene)', 'oz' => 'Oz', + 'parasail' => 'ParaSail', + 'parigp' => 'PARI/GP', 'pascal' => 'Pascal', 'pcre' => 'PCRE', 'per' => 'Per (forms)', @@ -167,11 +180,13 @@ $config['geshi_languages'] = array( 'properties' => 'Property', 'providex' => 'ProvideX', 'purebasic' => 'PureBasic', + 'pys60' => 'Python for S60', 'q' => 'q/kdb+', 'qbasic' => 'QBasic/QuickBASIC', 'rails' => 'Ruby (with Ruby on Rails Framework)', 'rebol' => 'Rebol', 'reg' => 'Microsoft Registry Editor', + 'rexx' => 'Rexx', 'robots' => 'robots.txt', 'rpmspec' => 'RPM Spec', 'rsplus' => 'R', @@ -182,6 +197,9 @@ $config['geshi_languages'] = array( 'sdlbasic' => 'sdlBasic', 'smalltalk' => 'Smalltalk', 'smarty' => 'Smarty template', + 'spark' => 'SPARK', + 'sparql' => 'SPARQL', + 'stonescript' => 'StoneScript', 'systemverilog' => 'SystemVerilog IEEE 1800-2009(draft8)', 'tcl' => 'TCL/iTCL', 'teraterm' => 'Tera Term Macro', @@ -190,9 +208,12 @@ $config['geshi_languages'] = array( 'typoscript' => 'TypoScript', 'unicon' => 'Unicon', 'uscript' => 'UnrealScript', + 'upc' => 'UPC', + 'urbi' => 'Urbi', 'vala' => 'Vala', 'vb' => 'Visual Basic', 'vbnet' => 'VB.NET', + 'vedit' => 'Vedit macro language', 'verilog' => 'Verilog', 'vhdl' => 'VHDL', 'vim' => 'Vim scripting', diff --git a/htdocs/application/libraries/geshi/contrib/aliased.php b/htdocs/application/libraries/geshi/contrib/aliased.php index e57b495..cee3128 100644 --- a/htdocs/application/libraries/geshi/contrib/aliased.php +++ b/htdocs/application/libraries/geshi/contrib/aliased.php @@ -13,7 +13,7 @@ * aliased.php/file.name.ext. * * @author Ross Golder - * @version $Id: aliased.php 881 2007-01-10 11:14:38Z oracleshinoda $ + * @version $Id: aliased.php 2533 2012-08-15 18:49:04Z benbe $ */ // Your config here @@ -29,19 +29,18 @@ $path = SOURCE_ROOT.$_SERVER['PATH_INFO']; $base_path_len = strlen(SOURCE_ROOT); $real_path = realpath($path); if(strncmp($real_path, SOURCE_ROOT, $base_path_len)) { - exit("Stop that."); + exit("Access outside acceptable path."); } // Check file exists if(!file_exists($path)) { - exit("File not found ($path)."); + exit("File not found ($path)."); } -// Gather contents -$contents = file_get_contents($path); - // Prepare GeSHi instance -$geshi =& new GeSHi($contents, "PHP"); +$geshi = new GeSHi(); +$geshi->set_language('text'); +$geshi->load_from_file($path); $geshi->set_header_type(GESHI_HEADER_PRE); $geshi->enable_classes(); $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 10); @@ -50,7 +49,7 @@ $geshi->set_line_style('font: normal normal 95% \'Courier New\', Courier, monosp $geshi->set_code_style('color: #000020;', 'color: #000020;'); $geshi->set_link_styles(GESHI_LINK, 'color: #000060;'); $geshi->set_link_styles(GESHI_HOVER, 'background-color: #f0f000;'); -$geshi->set_header_content('Source code viewer'); +$geshi->set_header_content('Source code viewer - ' . $path . ' - ' . $geshi->get_language_name()); $geshi->set_header_content_style('font-family: Verdana, Arial, sans-serif; color: #808080; font-size: 70%; font-weight: bold; background-color: #f0f0ff; border-bottom: 1px solid #d0d0d0; padding: 2px;'); $geshi->set_footer_content('Parsed in