* -------------------------------------------------------------------- *
* 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 *
} // 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);
// Replace the code
$code = replaceExpressionCode($data, $replacer);
- // Load include once
- loadIncludeOnce('inc/math-functions.php');
-
// Return the (maybe) replaced code
return $code;
}
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
// Expression call-back to handle jquery inclusion
function doExpressionJquery ($data) {
// Default is compressed
- $jquery = 'jquery';
+ $scriptName = 'jquery';
$data['output_mode'] = '';
// Is there JS-mode?
// Is there a value?
if ($data['callback'] == 'js') {
// 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
+ if ((!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
+ }
+
+ // Complete script name
+ $scriptName = sprintf('js/jquery/%s.js', $scriptName);
// Add {%url%} around it
- $replacer = '{%url' . $data['output_mode'] . '=js/' . $jquery . '.js?dummy=1%}';
+ $replacer = sprintf('{%%url%s=%s?dummy=1%%}', $data['output_mode'], $scriptName);
// Replace the code
$code = replaceExpressionCode($data, $replacer);
// Return the (maybe) replaced code
return $code;
}
-
-// [EOF]
-?>