X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=242419af0399890590b8ff8f3a71fe82da3f84a5;hb=e5abdb06fcf4594b8ae8907158ab4fbe0f8f5379;hp=621fdc1371ee13aeda04e9bd954bd380519e9fde;hpb=72b4196db1d2d2baffd84983dfb7e11f03a9f1aa;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 621fdc1371..242419af03 100644 --- a/lib/util.php +++ b/lib/util.php @@ -146,6 +146,9 @@ function common_init_language() { bind_textdomain_codeset("laconica", "UTF-8"); textdomain("laconica"); setlocale(LC_CTYPE, 'C'); + if(!$locale_set) { + common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__); + } } define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2'); @@ -178,7 +181,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= 'src' => common_path('js/jquery.form.js')), ' '); common_element('script', array('type' => 'text/javascript', - 'src' => common_path('js/util.js')), + 'src' => common_path('js/util.js?version='.LACONICA_VERSION)), ' '); common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml', 'href' => common_local_url('opensearch', array('type' => 'people')), @@ -483,25 +486,27 @@ function common_timezone() { } function common_language() { - $httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL; - $language = array(); - $user_language = FALSE; + // If there is a user logged in and they've set a language preference + // then return that one... if (common_logged_in()) { $user = common_current_user(); $user_language = $user->language; + if ($user_language) + return $user_language; } - if ($user_language) { - return $user_language; - } else if (!empty($httplang)) { - $language = client_prefered_language($httplang); - if ($language) { - return $language; - } - } else { - return common_config('site', 'language'); - } + // Otherwise, find the best match for the languages requested by the + // user's browser... + $httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL; + if (!empty($httplang)) { + $language = client_prefered_language($httplang); + if ($language) + return $language; + } + + // Finally, if none of the above worked, use the site's default... + return common_config('site', 'language'); } # salted, hashed passwords are stored in the DB @@ -708,12 +713,127 @@ function common_render_text($text) { $r = htmlspecialchars($text); $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r); - $r = preg_replace('@https?://[^)\]>\s]+@', '\0', $r); + $r = preg_replace_callback('@https?://[^\]>\s]+@', 'common_render_uri_thingy', $r); $r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); # XXX: machine tags return $r; } +function common_render_uri_thingy($matches) { + $uri = $matches[0]; + $trailer = ''; + + # Some heuristics for extracting URIs from surrounding punctuation + # Strip from trailing text... + if (preg_match('/^(.*)([,.:"\']+)$/', $uri, $matches)) { + $uri = $matches[1]; + $trailer = $matches[2]; + } + + $pairs = array( + ']' => '[', # technically disallowed in URIs, but used in Java docs + ')' => '(', # far too frequent in Wikipedia and MSDN + ); + $final = substr($uri, -1, 1); + if (isset($pairs[$final])) { + $openers = substr_count($uri, $pairs[$final]); + $closers = substr_count($uri, $final); + if ($closers > $openers) { + // Assume the paren was opened outside the URI + $uri = substr($uri, 0, -1); + $trailer = $final . $trailer; + } + } + if ($longurl = common_longurl($uri)) { + $longurl = htmlentities($longurl, ENT_QUOTES, 'UTF-8'); + $title = " title='$longurl'"; + } + else $title = ''; + + return '' . $uri . '' . $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) + // 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; +} + +function common_shorten_link($long_url) { + + $user = common_current_user(); + + $curlh = curl_init(); + curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait + curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica'); + curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true); + + switch($user->urlshorteningservice) { + case 'ur1.ca': + $short_url_service = new LilUrl; + $short_url = $short_url_service->shorten($long_url); + break; + + case '2tu.us': + $short_url_service = new TightUrl; + $short_url = $short_url_service->shorten($long_url); + break; + + case 'ptiturl.com': + $short_url_service = new PtitUrl; + $short_url = $short_url_service->shorten($long_url); + break; + + case 'bit.ly': + curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($long_url)); + $short_url = current(json_decode(curl_exec($curlh))->results)->hashUrl; + break; + + case 'is.gd': + curl_setopt($curlh, CURLOPT_URL, 'http://is.gd/api.php?longurl='.urlencode($long_url)); + $short_url = curl_exec($curlh); + break; + case 'snipr.com': + curl_setopt($curlh, CURLOPT_URL, 'http://snipr.com/site/snip?r=simple&link='.urlencode($long_url)); + $short_url = curl_exec($curlh); + break; + case 'metamark.net': + curl_setopt($curlh, CURLOPT_URL, 'http://metamark.net/api/rest/simple?long_url='.urlencode($long_url)); + $short_url = curl_exec($curlh); + break; + case 'tinyurl.com': + curl_setopt($curlh, CURLOPT_URL, 'http://tinyurl.com/api-create.php?url='.urlencode($long_url)); + $short_url = curl_exec($curlh); + break; + default: + $short_url = false; + } + + curl_close($curlh); + + if ($short_url) { + return $short_url; + } + return $long_url; +} + +function common_xml_safe_str($str) { + $xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8'); + + // Replace control, formatting, and surrogate characters with '*', ala Twitter + return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str); +} + function common_tag_link($tag) { $canonical = common_canonical_tag($tag); $url = common_local_url('tag', array('tag' => $canonical)); @@ -806,13 +926,17 @@ function common_default_avatar($size) { return theme_path('default-avatar-'.$sizenames[$size].'.png'); } -function common_local_url($action, $args=NULL) { - global $config; - if ($config['site']['fancy']) { - return common_fancy_url($action, $args); +function common_local_url($action, $args=NULL, $fragment=NULL) { + $url = NULL; + if (common_config('site','fancy')) { + $url = common_fancy_url($action, $args); } else { - return common_simple_url($action, $args); + $url = common_simple_url($action, $args); + } + if (!is_null($fragment)) { + $url .= '#'.$fragment; } + return $url; } function common_fancy_url($action, $args=NULL) { @@ -865,6 +989,8 @@ function common_fancy_url($action, $args=NULL) { return common_path('settings/sms'); case 'twittersettings': return common_path('settings/twitter'); + case 'othersettings': + return common_path('settings/other'); case 'newnotice': if ($args && $args['replyto']) { return common_path('notice/new?replyto='.$args['replyto']); @@ -945,10 +1071,35 @@ function common_fancy_url($action, $args=NULL) { } else { return common_path($args['nickname'].'/favorites'); } + case 'favoritesrss': + return common_path($args['nickname'].'/favorites/rss'); case 'showmessage': return common_path('message/' . $args['message']); case 'newmessage': return common_path('message/new' . (($args) ? ('?' . http_build_query($args)) : '')); + case 'api': + # XXX: do fancy URLs for all the API methods + switch (strtolower($args['apiaction'])) { + case 'statuses': + switch (strtolower($args['method'])) { + case 'user_timeline.rss': + return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); + case 'user_timeline.atom': + return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); + case 'user_timeline.rss': + return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); + case 'user_timeline.atom': + return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); + default: return common_simple_url($action, $args); + } + default: return common_simple_url($action, $args); + } + case 'sup': + if ($args && isset($args['seconds'])) { + return common_path('main/sup?seconds='.$args['seconds']); + } else { + return common_path('main/sup'); + } default: return common_simple_url($action, $args); } @@ -1084,7 +1235,7 @@ function common_save_replies($notice) { if (!$recipient) { continue; } - if ($i == 0 && ($recipient->id != $sender->id)) { # Don't save reply to self + if ($i == 0 && ($recipient->id != $sender->id) && !$notice->reply_to) { # Don't save reply to self $reply_for = $recipient; $recipient_notice = $reply_for->getCurrentNotice(); if ($recipient_notice) { @@ -1110,13 +1261,13 @@ function common_broadcast_notice($notice, $remote=false) { // Check to see if notice should go to Twitter $flink = Foreign_link::getForeignLink($notice->profile_id, 1); // 1 == Twitter - if ($flink->noticesync & FOREIGN_NOTICE_SEND) { - + if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) { + // If it's not a Twitter-style reply, or if the user WANTS to send replies... - - if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/', $notice->content) || - ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) { - + + if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) || + (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) { + $result = common_twitter_broadcast($notice, $flink); if (!$result) { @@ -1284,15 +1435,18 @@ function common_notice_form($action=NULL, $content=NULL) { common_element('label', array('for' => 'status_textarea', 'id' => 'status_label'), sprintf(_('What\'s up, %s?'), $user->nickname)); - common_element('span', array('id' => 'counter', 'class' => 'counter'), '140'); + common_element('span', array('id' => 'counter', 'class' => 'counter'), '140'); common_element('textarea', array('id' => 'status_textarea', 'cols' => 60, 'rows' => 3, 'name' => 'status_textarea'), ($content) ? $content : ''); + common_hidden('token', common_session_token()); if ($action) { common_hidden('returnto', $action); } + # set by JavaScript + common_hidden('inreplyto', 'false'); common_element('input', array('id' => 'status_submit', 'name' => 'status_submit', 'type' => 'submit', @@ -1727,4 +1881,24 @@ function common_message_form($content, $user, $to) { common_element_end('p'); common_element_end('form'); -} \ No newline at end of file +} + +function common_memcache() { + static $cache = NULL; + if (!common_config('memcached', 'enabled')) { + return NULL; + } else { + if (!$cache) { + $cache = new Memcache(); + $servers = common_config('memcached', 'server'); + if (is_array($servers)) { + foreach($servers as $server) { + $cache->addServer($server); + } + } else { + $cache->addServer($servers); + } + } + return $cache; + } +}