custom capcode fix

This commit is contained in:
Savetheinternet 2011-12-05 10:33:31 +11:00
parent b3dba69b50
commit c5a961a6a5
3 changed files with 26 additions and 14 deletions

View File

@ -133,13 +133,25 @@
function capcode($cap) {
global $config;
if(!$cap)
return false;
$capcode = Array();
if(isset($config['custom_capcode'][$cap])) {
if(is_array($config['custom_capcode'][$cap]))
return sprintf($config['custom_capcode'][$cap][0], $cap);
return sprintf($config['custom_capcode'][$cap], $cap);
if(is_array($config['custom_capcode'][$cap])) {
$capcode['cap'] = sprintf($config['custom_capcode'][$cap][0], $cap);
if(isset($config['custom_capcode'][$cap][1]))
$capcode['name'] = $config['custom_capcode'][$cap][1];
if(isset($config['custom_capcode'][$cap][2]))
$capcode['trip'] = $config['custom_capcode'][$cap][2];
} else {
$capcode['cap'] = sprintf($config['custom_capcode'][$cap], $cap);
}
} else {
$capcode['cap'] = sprintf($config['capcode'], $cap);
}
return sprintf($config['capcode'], $cap);
return $capcode;
}
function truncate($body, $url, $max_lines = false, $max_chars = false) {

View File

@ -14,17 +14,17 @@
{# start email #}
<a class="email" href="mailto:{{ post.email }}">
{% endif %}
<span class="name">{{ post.name }}</span>
{% set capcode = post.capcode|capcode %}
<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>
{% if post.trip|length > 0 %}
<span class="trip">{{ post.trip }}</span>
<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
{% endif %}
{% if post.email|length > 0 %}
{# end email #}
</a>
{% endif %}
{% if post.capcode|length > 0 %}
{# show capcode #}
{{ post.capcode|capcode }}
{% if capcode %}
{{ capcode.cap }}
{% endif %}
{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
[<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]

View File

@ -58,17 +58,17 @@
{# start email #}
<a class="email" href="mailto:{{ post.email }}">
{% endif %}
<span class="name">{{ post.name }}</span>
{% set capcode = post.capcode|capcode %}
<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>
{% if post.trip|length > 0 %}
<span class="trip">{{ post.trip }}</span>
<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
{% endif %}
{% if post.email|length > 0 %}
{# end email #}
</a>
{% endif %}
{% if post.capcode|length > 0 %}
{# show capcode #}
{{ post.capcode|capcode }}
{% if capcode %}
{{ capcode.cap }}
{% endif %}
{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
[<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]