From af2a7283264776177307b7c0ac714ca1636a0c93 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Mon, 11 Jun 2007 14:32:32 +0000 Subject: [PATCH] Fix bugs in the new backend templates --- include/functions.inc.php | 55 +++++++++++--------- include/functions_entries_admin.inc.php | 7 +++ include/functions_smarty.inc.php | 7 +-- templates/default/admin/category_selector.js | 4 +- templates/default/admin/entries.tpl | 22 ++++---- 5 files changed, 56 insertions(+), 39 deletions(-) diff --git a/include/functions.inc.php b/include/functions.inc.php index 7829cb6..410a3a3 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -132,9 +132,10 @@ function &serendipity_convertToTimestamp($in) { * @param string Output format for the timestamp * @param int Timestamp to use for displaying * @param boolean Indicates, if timezone calculations shall be used. + * @param boolean Whether to use strftime or simply date * @return string The formatted timestamp */ -function serendipity_strftime($format, $timestamp = null, $useOffset = true) { +function serendipity_strftime($format, $timestamp = null, $useOffset = true, $useDate = false) { global $serendipity; static $is_win_utf = null; @@ -143,27 +144,31 @@ function serendipity_strftime($format, $timestamp = null, $useOffset = true) { $is_win_utf = (LANG_CHARSET == 'UTF-8' && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false); } - switch($serendipity['calendar']) { - default: - case 'gregorian': - if ($timestamp == null) { - $timestamp = serendipity_serverOffsetHour(); - } elseif ($useOffset) { - $timestamp = serendipity_serverOffsetHour($timestamp); - } - $out = strftime($format, $timestamp); - break; - - case 'persian-utf8': - if ($timestamp == null) { - $timestamp = serendipity_serverOffsetHour(); - } elseif ($useOffset) { - $timestamp = serendipity_serverOffsetHour($timestamp); - } - - require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php'; - $out = persian_strftime_utf($format, $timestamp); - break; + if ($useDate) { + $out = date($format, $timestamp); + } else { + switch($serendipity['calendar']) { + default: + case 'gregorian': + if ($timestamp == null) { + $timestamp = serendipity_serverOffsetHour(); + } elseif ($useOffset) { + $timestamp = serendipity_serverOffsetHour($timestamp); + } + $out = strftime($format, $timestamp); + break; + + case 'persian-utf8': + if ($timestamp == null) { + $timestamp = serendipity_serverOffsetHour(); + } elseif ($useOffset) { + $timestamp = serendipity_serverOffsetHour($timestamp); + } + + require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php'; + $out = persian_strftime_utf($format, $timestamp); + break; + } } if ($is_win_utf && (empty($serendipity['calendar']) || $serendipity['calendar'] == 'gregorian')) { @@ -182,9 +187,10 @@ function serendipity_strftime($format, $timestamp = null, $useOffset = true) { * @param string Output format for the timestamp * @param int Timestamp to use for displaying * @param boolean Indicates, if timezone calculations shall be used. + * @param boolean Whether to use strftime or simply date * @return string The formatted timestamp */ -function serendipity_formatTime($format, $time, $useOffset = true) { +function serendipity_formatTime($format, $time, $useOffset = true, $useDate = false) { static $cache; if (!isset($cache)) { $cache = array(); @@ -196,7 +202,8 @@ function serendipity_formatTime($format, $time, $useOffset = true) { $cache[$format] = str_replace('%e', '%d', $cache[$format]); } } - return serendipity_mb('ucfirst', serendipity_strftime($cache[$format], (int)$time, $useOffset)); + + return serendipity_mb('ucfirst', serendipity_strftime($cache[$format], (int)$time, $useOffset, $useDate)); } /** diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php index 4fbc12f..9d61d46 100644 --- a/include/functions_entries_admin.inc.php +++ b/include/functions_entries_admin.inc.php @@ -140,6 +140,12 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr $hidden .= ' '; $hidden .= ' ' . serendipity_setFormToken(); + if (is_object($serendipity['smarty']) || (!$_SESSION['no_smarty'] && serendipity_smarty_init())) { + $use_smarty = true; + } else { + $use_smarty = false; + } + if (is_object($serendipity['smarty'])) { if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation']) { $template_vars['allowDateManipulation'] = true; @@ -167,6 +173,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr 'body' => 'serendipity[body]', 'extended' => 'serendipity[extended]' ); + $template_vars['entry_template'] = serendipity_getTemplateFile('admin/entries.tpl', 'serendipityPath'); $serendipity['smarty']->register_modifier('emit_htmlarea_code', 'serendipity_emit_htmlarea_code'); diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php index fcd60e4..a625b16 100644 --- a/include/functions_smarty.inc.php +++ b/include/functions_smarty.inc.php @@ -625,17 +625,18 @@ function serendipity_smarty_rss_getguid($params, &$smarty) { * @param string The strftime() format options on how to format this string * @param boolean Shall timezone conversions be applied? * @param boolean Try to detect a valid timestamp? + * @param boolean Use strftime or date? * @return */ -function serendipity_smarty_formatTime($timestamp, $format, $useOffset = true, $detectTimestamp = false) { +function serendipity_smarty_formatTime($timestamp, $format, $useOffset = true, $detectTimestamp = false, $useDate = false) { if ($detectTimestamp !== false && stristr($detectTimestamp, 'date') === false) { return $timestamp; } if (defined($format)) { - return serendipity_formatTime(constant($format), $timestamp, $useOffset); + return serendipity_formatTime(constant($format), $timestamp, $useOffset, $useDate); } else { - return serendipity_formatTime($format, $timestamp, $useOffset); + return serendipity_formatTime($format, $timestamp, $useOffset, $useDate); } } diff --git a/templates/default/admin/category_selector.js b/templates/default/admin/category_selector.js index 447460e..96e39d0 100644 --- a/templates/default/admin/category_selector.js +++ b/templates/default/admin/category_selector.js @@ -15,8 +15,8 @@ function toggle_extended(setCookie) { button.src = plus_img; if (setCookie == true) { document.cookie = 'serendipity[toggle_extended]=;'; - }} - }} + } + } } function showItem(id) { diff --git a/templates/default/admin/entries.tpl b/templates/default/admin/entries.tpl index 23a2ecd..2d9f688 100644 --- a/templates/default/admin/entries.tpl +++ b/templates/default/admin/entries.tpl @@ -6,7 +6,7 @@ {*** POSSIBLE ERROR MESSAGES END ***} {*** MAIN ENTRY FORM START ***} -
+ {$entry_vars.hidden} @@ -23,7 +23,7 @@ {*** ENTRY DATE,CATEGORY END ***} @@ -128,7 +130,7 @@
@@ -43,8 +43,8 @@ - - {$CONST.RESET_DATE} + + {$CONST.RESET_DATE} {else} @@ -67,15 +67,17 @@ var selector_store = new Array(); var selector_restore = new Array(); - function checkSave() { + function checkSave() {ldelim} {serendipity_hookPlugin hook='backend_entry_checkSave' hookAll='true'} return true; - } + {rdelim} selector_toggle['categoryselector'] = '{$entry_vars.cat_state}'; - addLoadEvent(showItem); - +
-
+
@@ -218,7 +220,7 @@ {foreach from=$entry_vars.wysiwyg_blocks item="wysiwyg_block_item" key="wysiwyg_block_jsname"} {$wysiwyg_block_item|emit_htmlarea_code:$wysiwyg_block_jsname} {/foreach} - {serendipity_refhookPlugin hook="backend_wysiwyg_finish" data=$entry_vars.wysiwyg_blocks} + {$entry_vars.wysiwyg_blocks|@serendipity_refhookPlugin:'backend_wysiwyg_finish'} {/if} {*** SPAWN WYSIWYG EDITORS END ***} -- 2.39.5