cleanup, wip save

plugin.syntaxhighlighter.php

@@ -1,11 +1,11 @@
 <?php
 /*
-Plugin Name: SyntaxHighlighter
+Plugin Name: SyntaxHighlighter-NG
 Version: 1.0
-Plugin URI: http://flatpress.sf.net
+Plugin URI: https://git.la10cy.net/DeltaLima/flatpress-plugin-syntaxhighlighter-ng
-Description: <a href="http://www.dreamprojections.com/syntaxhighlighter/">dp.SyntaxHighlighter 1.4.0</a> (edited to work with pre, thanks to <a href="https://www.gertthiel.de/blog/archive/2005/11/25/dp-syntaxhighlighter-pre">Gert Thiel </a>)
+Description: <a href="https://git.la10cy.net/DeltaLima/flatpress-plugin-syntaxhighlighter-ng/">SyntaxHighlighter-NG 1.0.0</a> (forked from <a href="https://forum.flatpress.org/viewtopic.php?p=1130&hilit=syntax+highlight#p1135">Arvid's forum post</a>, using now <a href="https://prismjs.com">prism.js</a>)
-Author: NoWhereMan
+Author: 2005 NoWhereMan, 2023 DeltaLima
-Author URI: http://flatpress.sf.net
+Author URI: https://deltalima.org
 */
 
 
@@ -13,52 +13,12 @@ function plugin_syntaxhighlighter_add($lang=null) {
 	static $languages = array();
 	
 	$pdir=plugin_geturl('syntaxhighlighter');
-	
-	 //if ($lang) {
-		//~ switch ($lang) {
-			//~ case 'c': 
-			//~ case 'cpp': 
-			//~ case 'c++': 
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushCpp.js\"></script>\n"; break;
-			//~ case 'css': 
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushCss.js\"></script>\n"; break;
-			//~ case 'c#':
-			//~ case 'c-sharp':
-			//~ case 'csharp':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushCSharp.js\"></script>\n"; break;
-			//~ case 'vb':
-			//~ case 'vb.net':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushVb.js\"></script>\n"; break;
-			//~ case 'delphi':
-			//~ case 'pascal':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushDelphi.js\"></script>\n"; break;
 
-			//~ case 'js':
+    // create array containing the used languages
-			//~ case 'jscript':
-			//~ case	'javascript':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushJScript.js\"></script>\n"; break;
-			//~ case	'php':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushPhp.js\"></script>\n"; break;
-			//~ case 'py':
-			//~ case	'python':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushPython.js\"></script>\n"; break;
-			//~ case	'ruby':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushRuby.js\"></script>\n"; break;
-			//~ case	'sql':
-				//~ $scripts[] = "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushSql.js\"></script>\n"; break;
-			//~ case 'xml':
-			//~ case 'xhtml':
-			//~ case 'xslt':
-			//~ case 'html':
-			//~ case 'xhtml':
-				//~ "<script type=\"text/javascript\" src=\"{$pdir}res/shBrushXml.js\"></script>\n";
-	
-		//~ }
 		$languages[] = "{$lang}";
+    // remove unique
 		$languages = array_unique($languages);
 		
-	//}
-	//return $scripts;
   return $languages;
 
 }
@@ -66,14 +26,13 @@ function plugin_syntaxhighlighter_add($lang=null) {
 
 function plugin_syntaxhighlighter_head() {
 	$pdir=plugin_geturl('syntaxhighlighter');
-echo <<<SHL
+echo <<<PRISMJS
-	<!-- start of SHL -->
+	<!-- start of prism.js -->
 		
-<!--	<link rel="stylesheet" type="text/css" href="{$pdir}res/SyntaxHighlighter.css" /> -->
   <link rel="stylesheet" type="text/css" href="{$pdir}res/prism.css" />
 
-	<!-- end of SHL -->
+	<!-- end of prism.js -->
-SHL;
+PRISMJS;
 	
 }
 add_action('wp_head', 'plugin_syntaxhighlighter_head');
@@ -81,25 +40,22 @@ add_action('wp_head', 'plugin_syntaxhighlighter_head');
 
 function plugin_syntaxhighlighter_foot() {
 
-	//$used_languages = implode(plugin_syntaxhighlighter_add(), "\n");
+	// convert the returned array into an json one, to have an easier time
+  // giving it to the javascript below
   $used_languages = json_encode(plugin_syntaxhighlighter_add());
-	$pdir=plugin_geturl('syntaxhighlighter');
-	echo <<<SHLBOX
-	<!-- start of SHL -->
-<!--		<script type="text/javascript" src="{$pdir}res/shCore.js"></script> -->
-	<!-- 1337ASD  $used_languages-->
   
-
+	$pdir=plugin_geturl('syntaxhighlighter');
-	
+  // javascript part
-	<!--	<script type="text/javascript">  
+	echo <<<PRISMBOX
-			dp.SyntaxHighlighter.HighlightAll('code');  
+	<!-- start of prism.js -->
-		</script>  -->
     
     <script type="text/javascript" src="{$pdir}res/prism.js"></script>
+    
+    <!-- wrapping the content of pre html-tags into code-tags, as said in https://prismjs.com/index.html#basic-usage -->
     <script type="text/javascript">
             // wrap the content of <pre> elements into <code></code> for prismjs
             
-            // get an array of pre elements 
+            // get an array of <pre></pre> elements 
             //var preEl = document.getElementsByTagName("pre");
             
             // split used_languages list into array
@@ -107,17 +63,17 @@ function plugin_syntaxhighlighter_foot() {
             
             for (let iUl = 0;iUl < used_languages.length; iUl++)
             {
-              // do nothing on empty elements
+              // do nothing on empty element
               if ( used_languages[iUl] != "" ) 
               {
-                alert(used_languages[iUl]);
+                // get all <pre> elements with certain language
                 let preElements = document.querySelectorAll("pre." + used_languages[iUl]);
                 
                 for (let iEl = 0;iEl < preElements.length; iEl++)
                 {
                   org_html = preElements[iEl].innerHTML;
                   new_html = "<code class=\"language-" + used_languages[iUl] + "\">" + org_html + "</code>";
-                  alert(new_html);
+                  
                   preElements[iEl].innerHTML = new_html;
                 }
               }
@@ -139,7 +95,7 @@ function plugin_syntaxhighlighter_foot() {
     </script>
 	
 	<!-- end of SHL -->
-SHLBOX;
+PRISMBOX;
 }
 add_action('wp_footer', 'plugin_syntaxhighlighter_foot');