Continued:

[mailer.git] / inc / expression-functions.php

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 6c586deb53b1db9dcda2e6acad8af47420d78b5e..6b7711efff24b6a54149e20883be3b200cfd502d 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Expression-Callback-Funktionen                   *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -157,7 +152,7 @@ function doExpressionExt ($data) {
        } // END - if
 
        // Generate replacer
-       $replacer = sprintf("&ext=%s&ver=%s&rev={?CURRENT_REPOSITORY_REVISION?}", $data['matches'][4][$data['key']], $replacer);
+       $replacer = sprintf('&ext=%s&ver=%s', $data['matches'][4][$data['key']], $replacer);
 
        // Replace it and insert parameter for GET request
        $code = replaceExpressionCode($data, $replacer);
@@ -281,7 +276,7 @@ function doExpressionMessage ($data) {
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {
        // Construct call-back function name
-       $callbackFunction = 'doTemplate' . $data['callback'];
+       $callbackFunction = 'doTemplate' . ucfirst($data['callback']);
 
        // Init replacer
        $replacer = '<!-- [' . __FUNCTION__ . ':' . __LINE__.'] Call-back function ' . $callbackFunction  . ' does not exist. //-->';
@@ -327,9 +322,6 @@ function doExpressionMath ($data) {
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
 
-       // Load include once
-       loadIncludeOnce('inc/math-functions.php');
-
        // Return the (maybe) replaced code
        return $code;
 }
@@ -444,7 +436,7 @@ function doExpressionForm ($data) {
                if ($value == 'formmethodpost') {
                        // Use it
                        $data['__form_method'] = 'post';
-               } elseif (($value == 'formmethodpost') && (!isSpider()) && (!isSessionValid())) {
+               } elseif (($value == 'formmethodpost') && (!isSpider()) && (!isValidSession())) {
                        // Then expand 'value' with session id
                        if (strpos($data['value'], '?') !== FALSE) {
                                // '?' is set
@@ -523,8 +515,8 @@ function doExpressionFormClose ($data) {
 
 // Expression call-back to handle jquery inclusion
 function doExpressionJquery ($data) {
-       // Default is compressed
-       $jquery = 'jquery';
+       // Default is uncompressed
+       $scriptName = 'jquery';
        $data['output_mode'] = '';
 
        // Is there JS-mode?
@@ -534,22 +526,22 @@ function doExpressionJquery ($data) {
        } // END - if
 
        // Is there a value?
-       if ($data['callback'] == 'js') {
+       if (!empty($data['value'])) {
                // Then load special library
-               $jquery .= '-' . $data['value'];
+               $scriptName .= '-' . $data['value'];
        } // END - if
 
-       // Is debug mode enabled?
-       if ((isGetRequestElementSet('jquery')) || (isSessionVariableSet('jquery'))) {
-               // Then use uncompressed
-               $jquery .= '.uncompressed';
-
-               // Remember it in session
+       // Is debug-mode enabled and parameter/session key 'jquery' given?
+       if ((!isDebugModeEnabled()) || ((!isGetRequestElementSet('jquery')) && (!isSessionVariableSet('jquery')))) {
+               // Productive systems want minimized version
+               $scriptName .= '.min';
+       } else {
+               // Debug version is uncompressed, remember it in session
                setSession('jquery', '1');
-       } // END - if
+       }
 
        // Add {%url%} around it
-       $replacer = '{%url' . $data['output_mode'] . '=js/' . $jquery . '.js?dummy=1%}';
+       $replacer = sprintf('{%%url%s=js/jquery/%s.js?dummy=1%%}', $data['output_mode'], $scriptName);
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
@@ -558,5 +550,7 @@ function doExpressionJquery ($data) {
        return $code;
 }
 
-// [EOF]
-?>
+// Expression call-back to handle JavaScript inclusion
+function doExpressionJs ($data) {
+       /* DEBUG-DIE: */ die(sprintf('[%s:%d]: data=<pre>%s</pre>', __FUNCTION__, __LINE__, print_r($data, TRUE)));
+}