diff options
| -rw-r--r-- | actions/othersettings.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/actions/othersettings.php b/actions/othersettings.php index 497500509..18de9c189 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -51,7 +51,7 @@ class OthersettingsAction extends SettingsAction { 'metamark.net' => 'metamark.net' ); - common_dropdown('urlshorteningservice', _('Service'), $services, _('Shortening service to use when notices exceed the 140 character limit. Precede a URL with a * to prevent shortening of that URL.'), FALSE, $user->urlshorteningservice); + common_dropdown('urlshorteningservice', _('Service'), $services, _('Shortening service to use when notices exceed the 140 character limit.'), FALSE, $user->urlshorteningservice); common_submit('save', _('Save')); diff --git a/lib/util.php b/lib/util.php index ee1a149a7..bdc798314 100644 --- a/lib/util.php +++ b/lib/util.php @@ -744,14 +744,28 @@ function common_render_uri_thingy($matches) { $trailer = $final . $trailer; } } - return '<a href="' . $uri . '" class="extlink">' . $uri . '</a>' . $trailer; + if ($longurl = common_longurl($uri)) { + $longurl = htmlentities($longurl, ENT_QUOTES, 'UTF-8'); + $title = " title=$longurl"; + } + else $title = ''; + + return '<a href="' . $uri . '"' . $title . ' class="extlink">' . $uri . '</a>' . $trailer; +} + +function common_longurl($uri) { + $uri_e = urlencode($uri); + $longurl = unserialize(file_get_contents("http://api.longurl.org/v1/expand?format=php&url=$uri_e")); + if (empty($longurl['long_url']) || $uri === $longurl['long_url']) return false; + return $longurl['long_url']; } function common_shorten_links($text) { $r = htmlspecialchars($text); // \s = not a horizontal whitespace character (since PHP 5.2.4) - $r = preg_replace('@[^*]https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); -// $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); + // RYM this should prevent * preceded URLs from being processed but it its a char +// $r = preg_replace('@[^*](https?://[^)\]>\s]+)@e', "common_shorten_link('\\1')", $r); + $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); return $r; } |