enableTemplateHtml($insertComments);
// Init counter
- $count = 0;
+ $totalCompilations = 0;
// Compile all out
- while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== FALSE)) && ($count < 7)) {
+ while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== FALSE)) && ($totalCompilations < 7)) {
// Init common variables
$content = array();
$newContent = '';
// Compile it
- //* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
+ //* DEBUG: */ debugOutput('<pre>'.lineNumberCode($code).'</pre>');
$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), $enableCodes)) . '";';
- //* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.linenumberCode($eval).'</pre>');
+ //* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.lineNumberCode($eval).'</pre>');
eval($eval);
- //* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.linenumberCode($newContent).'</pre>');
+ //* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.lineNumberCode($newContent).'</pre>');
//* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- reportBug(__FUNCTION__, __LINE__, 'Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', FALSE);
+ reportBug(__FUNCTION__, __LINE__, 'Evaluation error:<pre>' . lineNumberCode($eval) . '</pre>', FALSE);
} // END - if
// Use it again
} // END - if
// Count round
- $count++;
+ $totalCompilations++;
} // END - while
// Add debugging data in HTML code, if mode is enabled
if ((isDebugModeEnabled()) && ($insertComments === TRUE) && (isHtmlOutputMode())) {
// Add loop count
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isDebugModeEnabled()=' . intval(isDebugModeEnabled()) . ',insertComments=' . intval($insertComments) . ',isHtmlOutputMode()=' . intval(isHtmlOutputMode()));
- $code .= '<!-- Total compilation loop=' . $count . ' //-->';
+ $code .= '<!-- Total compilation loop=' . $totalCompilations . ' //-->';
} // END - if
// Return the compiled code
// Use configured min age or fixed?
if (isExtensionInstalledAndNewer('other', '0.2.1')) {
// Configured
- $startYear = $year - getConfig('min_age');
+ $startYear = $year - getMinAge();
} else {
// Fixed 16 years
$startYear = $year - 16;
} // END - for
break;
+ case 'mn': // Months, numeric
+ for ($idx = 0; $idx <= 12; $idx++) {
+ $OUT .= '<option value="' . $idx . '"';
+ if ($default == $idx) $OUT .= ' selected="selected"';
+ $OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
+ } // END - for
+ break;
+
case 'we': // Weeks
for ($idx = 0; $idx <= 4; $idx++) {
$OUT .= ' <option value="' . $idx . '"';
break;
case 'da': // Days
- for ($idx = 0; $idx < 32; $idx++) {
+ for ($idx = 0; $idx <= 31; $idx++) {
$OUT .= '<option value="' . $idx . '"';
if ($default == $idx) $OUT .= ' selected="selected"';
- $OUT .= '>' .padLeftZero($idx) . '</option>';
+ $OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
} // END - for
break;
case 'ho': // Hours
- for ($idx = 0; $idx < 24; $idx++) {
+ for ($idx = 0; $idx <= 23; $idx++) {
if (strlen($idx) == 1) $idx = 0 . $idx;
$OUT .= '<option value="' . $idx . '"';
if ($default == $idx) $OUT .= ' selected="selected"';
case 'mi': // Minutes
case 'se': // Seconds
- for ($idx = 0; $idx < 60; $idx+=5) {
+ for ($idx = 0; $idx <= 59; $idx+=5) {
if (strlen($idx) == 1) $idx = 0 . $idx;
$OUT .= '<option value="' . $idx . '"';
if ($default == $idx) $OUT .= ' selected="selected"';
// Time unit -> field name
'unit_field' => array(
'Y' => 'ye',
- 'M' => 'mo',
+ 'M' => 'mn',
'W' => 'we',
'D' => 'da',
'h' => 'ho',
// Load the template
$GLOBALS['__page_footer'] .= loadTemplate('show_timings', TRUE, $content);
+
+ // Is debug enabled?
+ if (isDebugModeEnabled()) {
+ // Log loading of total includes
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Loaded includes: ' . count($GLOBALS['inc_loaded']) . ', readable files: ' . count($GLOBALS['file_readable']));
+ } // END - if
}
/**
}
// Print code with line numbers
-function linenumberCode ($code) {
+function lineNumberCode ($code) {
// By default copy the code
$codeE = $code;
if (isAdmin()) {
// Is admin, has always priority
$data = '[<a href="{%pipe,generateFrametesterUrl=' . $data . '%}" target="_blank">{--ADMIN_TEST_URL--}</a>]';
- } elseif (isUrlBlacklisted($data)) {
+ } elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) {
// Yes, so replace it with text
$data = '<em>{--URL_IS_BLACKLISTED--}</em>';
} else {