First dirty try of usage

Author: Crizz0

controller/main.php

@@ -66,9 +66,6 @@ class main
 	/** @var \phpbb\captcha\factory */
 	protected $captcha_factory;
 
-	/** @var string */
-	protected $geshi_lang;
-
 	/** @var string */
 	protected $pastebin_table;
 
@@ -105,7 +102,6 @@ public function __construct(
 		\phpbbde\pastebin\functions\pastebin $pastebin,
 		$root_path,
 		$php_ext,
-		$geshi_lang,
 		$pastebin_table)
 	{
 		$this->auth = $auth;
@@ -125,7 +121,6 @@ public function __construct(
 		$this->captcha_factory = $captcha_factory;
 
 		$this->pastebin_table = $pastebin_table;
-		$this->geshi_lang = $geshi_lang;
 	}
 
 	public function handle()
@@ -294,10 +289,10 @@ private function display_pb()
 					$error[] = $this->language->lang('PASTEBIN_ERR_NO_TITLE');
 				}
 
-				if (!$this->util->geshi_check($data['snippet_highlight']))
+				/*if (!$this->util->geshi_check($data['snippet_highlight']))
 				{
 					$data['snippet_highlight'] = 'text';
-				}
+				}*/
 
 				$filedata = $this->request->file('fileupload');
 
@@ -415,21 +410,15 @@ private function display_pb()
 
 					$highlight = ($this->request->is_set('highlight')) ? $this->request->variable('highlight', '') : $data['snippet_highlight'];
 
-					if (!$this->util->geshi_check($highlight))
-					{
-						$highlight = 'php';
-					}
-
 					$code = $snippet_text;
 
-					$geshi = new \GeSHi($code, $highlight, $this->util->geshi_dir);
-					$geshi->set_header_type(GESHI_HEADER_NONE);
-					$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS, 100);
-
-					$code = $geshi->parse_code();
+                    $highlighter = new \Tempest\Highlight\Highlighter();
+                    // TODO: Add option to change language used at this point html,css etc. 
+                    $code = $highlighter->parse($code, 'php');
 
 					$snippet_text_display = &$code;
 
+
 					$s_hidden_fields = array_merge($s_hidden_fields, array(
 							's'		=> $snippet_id,
 					));

functions/pastebin.php

@@ -38,90 +38,21 @@ function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user, $
 		$this->empty_data();
 
 		$this->file_ext = array(
-			'text'				=> 'txt',
-			'php'				=> 'php',
-			'sql'				=> 'sql',
-			'html4strict'		=> 'htm',
-			'css'				=> 'css',
-			'javascript'		=> 'js',
-			'java'				=> 'java',
-			'xml'				=> 'xml',
-			'asp'				=> 'asp',
-			'c'					=> 'c',
-			'cpp'				=> 'cpp',
-			'csharp'			=> 'cs',
-			'perl'				=> 'pl',
-			'vb'				=> 'vbs',
-			'diff'				=> 'diff',
-			'robots'			=> 'txt',
-			'smarty'			=> 'html',
-
-			'actionscript'		=> 'as',
-			'ada'				=> 'ada',
-			'apache'			=> 'txt',
-			'applescript'		=> 'scrpt',
-			'asm'				=> 'asm',
-			'autoit'			=> 'txt',
-			'bash'				=> 'sh',
-			'blitzbasic'		=> 'bas',
-			'bnf'				=> 'bnf',
-			'c_mac'				=> 'c',
-			'caddcl'			=> 'dcl',
-			'cadlisp'			=> 'lisp',
-			'cfdg'				=> 'cfd',
-			'cfm'				=> 'cfm',
-			'cpp-qt'			=> 'cpp',
-			'css-gen.cfg'		=> 'cfg',
-			'd'					=> 'd',
-			'delphi'			=> 'dpr',
-			'div'				=> 'div',
-			'dos'				=> 'bat',
-			'eiffel'			=> 'E',
-			'fortran'			=> 'F',
-			'freebasic'			=> 'bas',
-			'gml'				=> 'gml',
-			'groovy'			=> 'groovy',
-			'idl'				=> 'idl',
-			'ini'				=> 'ini',
-			'inno'				=> 'ino',
-			'io'				=> 'io',
-			'java5'				=> 'java',
-			'latex'				=> 'tex',
-			'lisp'				=> 'lsp',
-			'lua'				=> 'lua',
-			'matlab'			=> 'm',
-			'mirc'				=> 'mrc',
-			'mpasm'				=> 'asm',
-			'mysql'				=> 'sql',
-			'nsis'				=> 'nsh',
-			'objc'				=> 'C',
-			'ocaml-brief'		=> 'ml',
-			'ocaml'				=> 'ml',
-			'oobas'				=> 'bas',
-			'oracle8'			=> 'sql',
-			'pascal'			=> 'p',
-			'php-brief'			=> 'php',
-			'ruby'				=> 'rb',
-			'sas'				=> 'sas',
-			'scheme'			=> 's',
-			'sdlbasic'			=> 'bas',
-			'smalltalk'			=> 'st',
-			'tcl'				=> 'tcl',
-			'thinbasic'			=> 'bas',
-			'tsql'				=> 'sql',
-			'plsql'				=> 'sql',
-			'python'			=> 'py',
-			'qbasic'			=> 'bas',
-			'rails'				=> 'rb',
-			'reg'				=> 'reg',
-			'vbnet'				=> 'vbs',
-			'vhdl'				=> 'vhdl',
-			'visualfoxpro'		=> 'fky',
-			'winbatch'			=> 'bat',
-			'xpp'				=> 'xpp',
-			'z80'				=> 'z80',
+			'base'               => '',
+			'blade'               => '',
+			'css'               => 'css',
+			'DocComment'        => '',
+			'gdscript'          => '',
+            'html'              => 'html',
+			'javascript'        => 'js',
+			'json'              => 'json',
+			'php'               => 'php',
+			'mysql'             => 'sql',
+            'text'              => 'txt',
+			'twig'              => 'html',
+			'xml'               => 'xml',
+			'yaml'              => 'yml',
 		);
-
 	}
 
 	/**

functions/utility.php

@@ -79,7 +79,7 @@ function highlight_select($default = 'text')
 			'base',
 			'blade',
 			'css',
-			'doccoment',
+			'doccomment',
 			'gdscript',
 			'javascript',
 			'json',
@@ -90,9 +90,9 @@ function highlight_select($default = 'text')
 			'yaml',
 		);
 // Make no highlighting as text as default
-		if (!in_array($default, $this->geshi_list))
+		if ($default)
 		{
-			$default = 'text';
+
 		}
 
 		$output = '';

styles/prosilver/template/event/overall_header_head_append.html

@@ -1 +1,2 @@
 {% INCLUDECSS '@phpbbde_pastebin/pastebin.css' %}
+{% INCLUDECSS './ext/phpbbde/pastebin/vendor/tempest/highlight/src/Themes/github-light-default.css' %}