From c5a961a6a52af8a0d6c0085668fe71d9d9de3a9c Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Mon, 5 Dec 2011 10:33:31 +1100 Subject: custom capcode fix --- inc/display.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'inc/display.php') diff --git a/inc/display.php b/inc/display.php index 3d1d6c99..cd2e4a5d 100644 --- a/inc/display.php +++ b/inc/display.php @@ -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) { -- cgit v1.3