* init empty vars to avoid PHP8 warnings * removed debug output for serendipity_session_destroy() * init smarty fixed for PHP8 * removed optional parameters for PHP 8 * 2k11 template fixes, maybe updating smarty will solve everything * init or test undefined variables for PHP 8 * remove only existing files * make sure string is not empty before comparing the first letter * check if SMARTY_DIR was already defined * use mb_language('uni') for unicode * fixed image filter bug * Smarty debug fixed in external lib * fixed archive bug * fixed entries bug * updated plugin versions Co-authored-by: surrim <surrim@happyhydro.org>
This commit is contained in:
bundled-libs/Smarty/libs/sysplugins
include
admin
comments.inc.phpconfiguration.inc.phpentries_overview.inc.phpgroups.inc.phpimages.inc.phpimport.inc.php
functions_config.inc.phpfunctions_entries.inc.phpfunctions_entries_admin.inc.phpfunctions_images.inc.phpfunctions_plugins_admin.inc.phpfunctions_routing.inc.phpfunctions_smarty.inc.phplang.inc.phpimporters
personal.inc.phptemplates.inc.phpupgrader.inc.phpplugins
serendipity_event_nl2br
serendipity_event_xhtmlcleanup
serendipity_plugin_comments
templates/2k11
@ -17,7 +17,7 @@
|
||||
{/if}
|
||||
{if $doDelete}
|
||||
{if $deleteSuccess}
|
||||
<span class="msg_success"><span class="icon-ok-circled" aria-hidden="true"></span> {if $remainingCat}{$CONST.CATEGORY_DELETED_ARTICLES_MOVED|sprintf:$remainingCat:$cid}{else}{$cid|string_format:"{$CONST.CATEGORY_DELETED}"}{/if}</span>
|
||||
<span class="msg_success"><span class="icon-ok-circled" aria-hidden="true"></span> {if isset($remainingCat) && $remainingCat}{$CONST.CATEGORY_DELETED_ARTICLES_MOVED|sprintf:$remainingCat:$cid}{else}{$cid|string_format:"{$CONST.CATEGORY_DELETED}"}{/if}</span>
|
||||
{else}
|
||||
<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$CONST.INVALID_CATEGORY}</span>
|
||||
{/if}
|
||||
@ -74,7 +74,7 @@
|
||||
<option value="0"{if $cid == 0} selected{/if}>{$CONST.NO_CATEGORY}</option>
|
||||
{foreach $categories as $cat}
|
||||
{if $cat.categoryid == $cid}{continue}{/if}
|
||||
<option value="{$cat.categoryid}"{if $this_cat.parentid == $cat.categoryid} selected{/if}>{for $i=1 to $cat.depth} {/for} {$cat.category_name|escape}</option>
|
||||
<option value="{$cat.categoryid}"{if isset($this_cat.parentid) && $this_cat.parentid == $cat.categoryid} selected{/if}>{for $i=1 to $cat.depth} {/for} {$cat.category_name|escape}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
|
@ -133,7 +133,7 @@
|
||||
<dt>{$CONST.AUTHOR}:</dt>
|
||||
<dd>{$comment.author|escape|truncate:40:"…"} {$comment.action_author}</dd>
|
||||
<dt>{$CONST.EMAIL}:</dt>
|
||||
<dd>{if empty($comment.email)}N/A{else}<a href="mailto:{$comment.email|escape}" title="{$comment.email|escape}">{$comment.email|escape|truncate:40:"…"}</a>{if $comment.subscribed == 'true'} <i>({$CONST.ACTIVE_COMMENT_SUBSCRIPTION})</i>{/if}{/if} {$comment.action_email}</dd>
|
||||
<dd>{if empty($comment.email)}N/A{else}<a href="mailto:{$comment.email|escape}" title="{$comment.email|escape}">{$comment.email|escape|truncate:40:"…"}</a>{if $comment.subscribed == 'true'} <i>({$CONST.ACTIVE_COMMENT_SUBSCRIPTION})</i>{/if}{/if} {if isset($comment.action_email)}{$comment.action_email}{/if}</dd>
|
||||
<dt>IP:</dt>
|
||||
<dd>{if empty($comment.ip)}N/A{else}{$comment.ip|escape}{/if} {if isset($comment.action_ip)}{$comment.action_ip}{/if}</dd>
|
||||
<dt>URL:</dt>
|
||||
@ -189,4 +189,4 @@
|
||||
</div>
|
||||
</form>
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
|
@ -1,12 +1,12 @@
|
||||
<h2>{$CONST.CONFIGURATION}</h2>
|
||||
{if $installAction == 'check'}
|
||||
{if $diagnosticError}
|
||||
{if isset($diagnosticError) && $diagnosticError}
|
||||
<h2>{$CONST.DIAGNOSTIC_ERROR}</h2>
|
||||
{foreach $res as $r}
|
||||
<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$r}</span>
|
||||
{/foreach}
|
||||
{else}
|
||||
{if $htaccessRewrite}
|
||||
{if isset($htaccessRewrite) && $htaccessRewrite}
|
||||
<h2>{$CONST.ATTEMPT_WRITE_FILE|sprintf:"{$serendipityPath}htaccess"}</h2>
|
||||
{if is_array($res)}
|
||||
{foreach $res as $r}
|
||||
@ -19,4 +19,4 @@
|
||||
<span class="msg_success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.WRITTEN_N_SAVED}</span>
|
||||
{/if}
|
||||
{/if}
|
||||
{$config}
|
||||
{$config}
|
||||
|
@ -15,7 +15,7 @@
|
||||
{$img_alt="{$file.realname}"}
|
||||
|
||||
{elseif $file.is_image AND $file.hotlink}
|
||||
{if $media.textarea}
|
||||
{if (isset($media.textarea) && $media.textarea)}
|
||||
{$link="?serendipity[adminModule]=images&serendipity[adminAction]=choose&serendipity[fid]={$file.id}&serendipity[textarea]={$media.textarea}&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[filename_only]={$media.filename_only}&serendipity[htmltarget]={$media.htmltarget}"}
|
||||
{else}
|
||||
{if $file.url}
|
||||
@ -26,7 +26,7 @@
|
||||
{$img_title="{$file.path}"}
|
||||
{$img_alt="{$file.realname}"}
|
||||
{else}
|
||||
{if $media.textarea}
|
||||
{if (isset($media.textarea) && $media.textarea)}
|
||||
{$link="?serendipity[adminModule]=images&serendipity[adminAction]=choose&serendipity[fid]={$file.id}&serendipity[textarea]={$media.textarea}&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[filename_only]={$media.filename_only}&serendipity[htmltarget]={$media.htmltarget}"}
|
||||
{else}
|
||||
{if $file.url}
|
||||
|
@ -50,46 +50,52 @@
|
||||
{foreach $media.sort_order AS $filtername => $filter}
|
||||
|
||||
<div class="{cycle values="left,center,right"}{if $filter@iteration > 6} bp_filters{/if}">
|
||||
{if $filter.type == 'date' || $filter.type == 'intrange'}
|
||||
{if isset($filter.type) && ($filter.type == 'date' || $filter.type == 'intrange')}
|
||||
|
||||
<fieldset>
|
||||
<span class="wrap_legend"><legend>{$filter.desc}</legend></span>
|
||||
{else}
|
||||
|
||||
<div class="form_{if $filter.type == 'authors'}select{else}field{/if}">
|
||||
<div class="form_{if isset($filter.type) && $filter.type == 'authors'}select{else}field{/if}">
|
||||
<label for="serendipity_filter_{$filter@key}">{$filter.desc}</label>
|
||||
{/if}
|
||||
{if $filter.type == 'date'}
|
||||
{if isset($filter.type)}
|
||||
{if $filter.type == 'date'}
|
||||
|
||||
<div class="form_field">
|
||||
<label for="serendipity_filter_{$filter@key}_from" class="range-label">{$CONST.RANGE_FROM|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="date" placeholder="2001-01-31" value="{if isset($media.filter[$filter@key].from)}{$media.filter[$filter@key].from|escape}{/if}">
|
||||
<label for="serendipity_filter_{$filter@key}_to" class="range-label">{$CONST.RANGE_TO|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="date" placeholder="2005-12-31" value="{if isset($media.filter[$filter@key].to)}{$media.filter[$filter@key].to|escape}{/if}">
|
||||
</div>
|
||||
{elseif $filter.type == 'intrange'}
|
||||
<div class="form_field">
|
||||
<label for="serendipity_filter_{$filter@key}_from" class="range-label">{$CONST.RANGE_FROM|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="date" placeholder="2001-01-31" value="{if isset($media.filter[$filter@key].from)}{$media.filter[$filter@key].from|escape}{/if}">
|
||||
<label for="serendipity_filter_{$filter@key}_to" class="range-label">{$CONST.RANGE_TO|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="date" placeholder="2005-12-31" value="{if isset($media.filter[$filter@key].to)}{$media.filter[$filter@key].to|escape}{/if}">
|
||||
</div>
|
||||
{elseif $filter.type == 'intrange'}
|
||||
|
||||
<div class="form_field">
|
||||
<label for="serendipity_filter_{$filter@key}_from" class="range-label">{$CONST.RANGE_FROM|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="text" placeholder="{if $filtername == 'bp.RUN_LENGTH'}in{/if}" value="{if isset($media.filter[$filter@key].from)}{$media.filter[$filter@key].from|escape}{/if}">
|
||||
<label for="serendipity_filter_{$filter@key}_to" class="range-label">{$CONST.RANGE_TO|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="text" placeholder="{if $filtername == 'bp.RUN_LENGTH'}seconds{/if}" value="{if isset($media.filter[$filter@key].to)}{$media.filter[$filter@key].to|escape}{/if}">
|
||||
</div>
|
||||
{elseif $filter.type == 'authors'}
|
||||
<div class="form_field">
|
||||
<label for="serendipity_filter_{$filter@key}_from" class="range-label">{$CONST.RANGE_FROM|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="text" placeholder="{if $filtername == 'bp.RUN_LENGTH'}in{/if}" value="{if isset($media.filter[$filter@key].from)}{$media.filter[$filter@key].from|escape}{/if}">
|
||||
<label for="serendipity_filter_{$filter@key}_to" class="range-label">{$CONST.RANGE_TO|lower}</label>
|
||||
<input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="text" placeholder="{if $filtername == 'bp.RUN_LENGTH'}seconds{/if}" value="{if isset($media.filter[$filter@key].to)}{$media.filter[$filter@key].to|escape}{/if}">
|
||||
</div>
|
||||
{elseif $filter.type == 'authors'}
|
||||
|
||||
<select id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]">
|
||||
<option value="">{$CONST.ALL_AUTHORS}</option>
|
||||
{foreach $media.authors AS $media_author}
|
||||
<select id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]">
|
||||
<option value="">{$CONST.ALL_AUTHORS}</option>
|
||||
{foreach $media.authors AS $media_author}
|
||||
|
||||
<option value="{$media_author.authorid}"{if isset($media.filter[$filter@key]) and $media.filter[$filter@key] == $media_author.authorid} selected{/if}>{$media_author.realname|escape}</option>
|
||||
{/foreach}
|
||||
<option value="{$media_author.authorid}"{if isset($media.filter[$filter@key]) and $media.filter[$filter@key] == $media_author.authorid} selected{/if}>{$media_author.realname|escape}</option>
|
||||
{/foreach}
|
||||
|
||||
</select>
|
||||
</select>
|
||||
{else}{* this is of type string w/o being named *}
|
||||
{* label is already set on loop start, when type is not date or intrange *}
|
||||
<input id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]" type="text" value="{if isset($media.filter[$filter@key])}{$media.filter[$filter@key]|escape}{/if}">
|
||||
{/if}
|
||||
{else}{* this is of type string w/o being named *}
|
||||
{* label is already set on loop start, when type is not date or intrange *}
|
||||
<input id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]" type="text" value="{if isset($media.filter[$filter@key])}{$media.filter[$filter@key]|escape}{/if}">
|
||||
{/if}
|
||||
{if $filter.type == 'date' || $filter.type == 'intrange'}
|
||||
|
||||
{if isset($filter.type) && ($filter.type == 'date' || $filter.type == 'intrange')}
|
||||
|
||||
</fieldset>
|
||||
{else}
|
||||
|
Reference in New Issue
Block a user