These JavaScript templates cannot be lincesed properly (GNU header is gigantic compar...

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 25f31b3e88255cc478c2d979efb0ede3371ee4fd..4c8ec10877a6f8e879e3f29d259a7aa73b00738a 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -633,6 +633,28 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
        // Compile QUOT and other non-HTML codes
        $code = str_replace($secChars['to'], $secChars['from'], $code);
 
+       // Find $fooBar entries
+       preg_match_all('/\$(.){0,}/', $code, $matches);
+
+       // Are some matches found?
+       if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+               // Scan all matches for not $content
+               foreach ($matches[0] as $match) {
+                       // Trim match
+                       $match = trim($match);
+
+                       // Is the first part not $content and not empty?
+                       if ((!empty($match)) && (substr($match, 0, 8) != '$content')) {
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match);
+                               // Then replace $ with $
+                               $matchSecured = str_replace('$', '$', $match);
+
+                               // And in $code as well
+                               $code = str_replace($match, $matchSecured, $code);
+                       } // END - if
+               } // END - if
+       } // END - if
+
        // Find $content[bla][blub] entries
        preg_match_all('/\$content((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
 
@@ -1201,6 +1223,9 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
                die('</pre>');
        } // END - if
 
+       // Set HTTP status to 500 (e.g. for AJAX requests)
+       setHttpStatus('500 Internal Server Error');
+
        // Set this function as called
        $GLOBALS[__FUNCTION__] = true;
 
@@ -1890,16 +1915,11 @@ function addJavaScriptMenuContent ($menuMode, $mainAction, $action, $what) {
                return '';
        } // END - if
 
-       // Prepare content
-       $content = array(
-               'menu_mode'   => $menuMode,
-               'main_action' => $mainAction,
-               'action'      => $action,
-               'what'        => $what
-       );
+       // Prepare output
+       $OUT = ' onclick="return changeMenuFoldState(' . $menuMode . ', ' . $mainAction . ', ' . $action . ', ' . $what . ')';
 
-       // Return template
-       return loadTemplate('js_' . $menuMode . '_menu_onclick', true, $content);
+       // Return output
+       return $OUT;
 }
 
 //-----------------------------------------------------------------------------