X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=64733986d3db8a7fc23d20fdf1090caba0b06637;hb=79c40bc73b41147fbc98eb03c590f9d4383c32d1;hp=608938c4c0c45db366fada5bcc90aac17039d496;hpb=e2c50d202fba2e953dc3798091bdb2858ab8a8ab;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 608938c4c0..64733986d3 100644 --- a/lib/util.php +++ b/lib/util.php @@ -210,7 +210,7 @@ function common_language() /** * Salted, hashed passwords are stored in the DB. */ -function common_munge_password($password, $id, Profile $profile=null) +function common_munge_password($password, Profile $profile=null) { $hashed = null; @@ -244,17 +244,14 @@ function common_check_user($nickname, $password) $user = User::getKV('nickname', Nickname::normalize($nickname)); } - if (!empty($user)) { - if (!empty($password)) { // never allow login with blank password - if (0 == strcmp(common_munge_password($password, $user->id), - $user->password)) { - //internal checking passed - $authenticatedUser = $user; - } + if ($user instanceof User && !empty($password)) { + if (0 == strcmp(common_munge_password($password, $user->getProfile()), $user->password)) { + //internal checking passed + $authenticatedUser = $user; } } - Event::handle('EndCheckPassword', array($nickname, $password, $authenticatedUser)); } + Event::handle('EndCheckPassword', array($nickname, $password, $authenticatedUser)); return $authenticatedUser; } @@ -320,7 +317,7 @@ function common_set_user($user) } else if (is_string($user)) { $nickname = $user; $user = User::getKV('nickname', $nickname); - } else if (!($user instanceof User)) { + } else if (!$user instanceof User) { return false; } @@ -374,7 +371,7 @@ function common_rememberme($user=null) $rm = new Remember_me(); - $rm->code = common_good_rand(16); + $rm->code = common_random_hexstr(16); $rm->user_id = $user->id; // Wrap the insert in some good ol' fashioned transaction code @@ -385,6 +382,7 @@ function common_rememberme($user=null) if (!$result) { common_log_db_error($rm, 'INSERT', __FILE__); + $rm->query('ROLLBACK'); return false; } @@ -433,7 +431,7 @@ function common_remembered_user() $user = User::getKV('id', $rm->user_id); - if (!$user) { + if (!$user instanceof User) { common_log(LOG_WARNING, 'No such user for rememberme: ' . $rm->user_id); common_forgetme(); return null; @@ -488,8 +486,8 @@ function common_current_user() common_ensure_session(); $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false; if ($id) { - $user = User::getKV($id); - if ($user) { + $user = User::getKV('id', $id); + if ($user instanceof User) { $_cur = $user; return $_cur; } @@ -577,6 +575,34 @@ function common_canonical_email($email) return $email; } +function common_purify($html) +{ + require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; + + $config = array('safe' => 1, // means that elements=* means elements=*-applet-embed-iframe-object-script or so + 'elements' => '*', + 'deny_attribute' => 'id,style,on*'); + + // Remove more elements than what the 'safe' filter gives (elements must be '*' before this) + // http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/htmLawed_README.htm#s3.6 + foreach (common_config('htmlfilter') as $tag=>$filter) { + if ($filter === true) { + $config['elements'] .= "-{$tag}"; + } + } + + $html = common_remove_unicode_formatting($html); + + return htmLawed($html, $config); +} + +function common_remove_unicode_formatting($text) +{ + // Strip Unicode text formatting/direction codes + // this is pretty dangerous for visualisation of text and can be used for mischief + return preg_replace('/[\\x{200b}-\\x{200f}\\x{202a}-\\x{202e}]/u', '', $text); +} + /** * Partial notice markup rendering step: build links to !group references. * @@ -584,14 +610,11 @@ function common_canonical_email($email) * @param Notice $notice in whose context we're working * @return string partially rendered HTML */ -function common_render_content($text, $notice) +function common_render_content($text, Notice $notice) { - $r = common_render_text($text); - $id = $notice->profile_id; - $r = common_linkify_mentions($r, $notice); - $r = preg_replace_callback('/(^|[\s\.\,\:\;]+)!(' . Nickname::DISPLAY_FMT . ')/', - function ($m) { return "{$m[1]}!".common_group_link($id, $m[2]); }, $r); - return $r; + $text = common_render_text($text); + $text = common_linkify_mentions($text, $notice); + return $text; } /** @@ -604,7 +627,7 @@ function common_render_content($text, $notice) * @param Notice $notice in-progress or complete Notice object for context * @return string partially-rendered HTML */ -function common_linkify_mentions($text, $notice) +function common_linkify_mentions($text, Notice $notice) { $mentions = common_find_mentions($text, $notice); @@ -631,7 +654,7 @@ function common_linkify_mentions($text, $notice) return $text; } -function common_linkify_mention($mention) +function common_linkify_mention(array $mention) { $output = null; @@ -640,17 +663,13 @@ function common_linkify_mention($mention) $xs = new XMLStringer(false); $attrs = array('href' => $mention['url'], - 'class' => 'url'); + 'class' => 'h-card '.$mention['type']); if (!empty($mention['title'])) { $attrs['title'] = $mention['title']; } - $xs->elementStart('span', 'vcard'); - $xs->elementStart('a', $attrs); - $xs->element('span', 'fn nickname mention', $mention['text']); - $xs->elementEnd('a'); - $xs->elementEnd('span'); + $xs->element('a', $attrs, $mention['text']); $output = $xs->getString(); @@ -675,38 +694,39 @@ function common_linkify_mention($mention) * * @access private */ -function common_find_mentions($text, $notice) +function common_find_mentions($text, Notice $notice) { - $mentions = array(); + // The getProfile call throws NoProfileException on failure + $sender = $notice->getProfile(); - $sender = Profile::getKV('id', $notice->profile_id); - - if (empty($sender)) { - return $mentions; - } + $mentions = array(); if (Event::handle('StartFindMentions', array($sender, $text, &$mentions))) { // Get the context of the original notice, if any - $originalAuthor = null; - $originalNotice = null; - $originalMentions = array(); + $origAuthor = null; + $origNotice = null; + $origMentions = array(); // Is it a reply? - if (!empty($notice) && !empty($notice->reply_to)) { - $originalNotice = Notice::getKV('id', $notice->reply_to); - if (!empty($originalNotice)) { - $originalAuthor = Profile::getKV('id', $originalNotice->profile_id); + try { + $origNotice = $notice->getParent(); + $origAuthor = $origNotice->getProfile(); - $ids = $originalNotice->getReplies(); + $ids = $origNotice->getReplies(); - foreach ($ids as $id) { - $repliedTo = Profile::getKV('id', $id); - if (!empty($repliedTo)) { - $originalMentions[$repliedTo->nickname] = $repliedTo; - } + foreach ($ids as $id) { + try { + $repliedTo = Profile::getByID($id); + $origMentions[$repliedTo->getNickname()] = $repliedTo; + } catch (NoResultException $e) { + // continue foreach } } + } catch (NoParentNoticeException $e) { + // It wasn't a reply to anything, so we can't harvest nickname-relations. + } catch (NoResultException $e) { + // The parent notice was deleted. } $matches = common_find_mentions_raw($text); @@ -723,25 +743,26 @@ function common_find_mentions($text, $notice) // Start with conversation context, then go to // sender context. - if (!empty($originalAuthor) && $originalAuthor->nickname == $nickname) { - $mentioned = $originalAuthor; - } else if (!empty($originalMentions) && - array_key_exists($nickname, $originalMentions)) { - $mentioned = $originalMentions[$nickname]; + if ($origAuthor instanceof Profile && $origAuthor->nickname == $nickname) { + $mentioned = $origAuthor; + } else if (!empty($origMentions) && + array_key_exists($nickname, $origMentions)) { + $mentioned = $origMentions[$nickname]; } else { $mentioned = common_relative_profile($sender, $nickname); } - if (!empty($mentioned)) { + if ($mentioned instanceof Profile) { $user = User::getKV('id', $mentioned->id); - if ($user) { + if ($user instanceof User) { $url = common_local_url('userbyid', array('id' => $user->id)); } else { $url = $mentioned->profileurl; } $mention = array('mentioned' => array($mentioned), + 'type' => 'mention', 'text' => $match[0], 'position' => $match[1], 'url' => $url); @@ -757,26 +778,44 @@ function common_find_mentions($text, $notice) // @#tag => mention of all subscriptions tagged 'tag' preg_match_all('/(?:^|[\s\.\,\:\;]+)@#([\pL\pN_\-\.]{1,64})/', - $text, - $hmatches, - PREG_OFFSET_CAPTURE); - + $text, $hmatches, PREG_OFFSET_CAPTURE); foreach ($hmatches[1] as $hmatch) { - $tag = common_canonical_tag($hmatch[0]); $plist = Profile_list::getByTaggerAndTag($sender->id, $tag); - if (!empty($plist) && !$plist->private) { - $tagged = $sender->getTaggedSubscribers($tag); + if (!$plist instanceof Profile_list || $plist->private) { + continue; + } + $tagged = $sender->getTaggedSubscribers($tag); + + $url = common_local_url('showprofiletag', + array('nickname' => $sender->getNickname(), + 'tag' => $tag)); - $url = common_local_url('showprofiletag', - array('tagger' => $sender->nickname, - 'tag' => $tag)); + $mentions[] = array('mentioned' => $tagged, + 'type' => 'list', + 'text' => $hmatch[0], + 'position' => $hmatch[1], + 'url' => $url); + } - $mentions[] = array('mentioned' => $tagged, - 'text' => $hmatch[0], - 'position' => $hmatch[1], - 'url' => $url); + preg_match_all('/(?:^|[\s\.\,\:\;]+)!(' . Nickname::DISPLAY_FMT . ')/', + $text, $hmatches, PREG_OFFSET_CAPTURE); + foreach ($hmatches[1] as $hmatch) { + $nickname = Nickname::normalize($hmatch[0]); + $group = User_group::getForNickname($nickname, $sender); + + if (!$group instanceof User_group || !$sender->isMember($group)) { + continue; } + + $profile = $group->getProfile(); + + $mentions[] = array('mentioned' => array($profile), + 'type' => 'group', + 'text' => $hmatch[0], + 'position' => $hmatch[1], + 'url' => $group->permalink(), + 'title' => $group->getFancyName()); } Event::handle('EndFindMentions', array($sender, $text, &$mentions)); @@ -812,14 +851,15 @@ function common_find_mentions_raw($text) function common_render_text($text) { - $r = htmlspecialchars($text); + $text = common_remove_unicode_formatting($text); + $text = nl2br(htmlspecialchars($text)); - $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r); - $r = common_replace_urls_callback($r, 'common_linkify'); - $r = preg_replace_callback('/(^|\"\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/u', - function ($m) { return "{$m[1]}#".common_tag_link($m[2]); }, $r); + $text = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $text); + $text = common_replace_urls_callback($text, 'common_linkify'); + $text = preg_replace_callback('/(^|\"\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/u', + function ($m) { return "{$m[1]}#".common_tag_link($m[2]); }, $text); // XXX: machine tags - return $r; + return $text; } /** @@ -850,15 +890,19 @@ function common_replace_urls_callback($text, $callback, $arg = null) { ')'. ')'. ')'. + '|(?:(?:magnet):)'. // URLs without domain name '|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4 '|(?:'. //IPv6 '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?(?getEnclosure()) { + if ($f instanceof File) { + try { + $enclosure = $f->getEnclosure(); $is_attachment = true; $attachment_id = $f->id; $thumb = File_thumbnail::getKV('file_id', $f->id); - if (!empty($thumb)) { - $has_thumb = true; - } + $has_thumb = ($thumb instanceof File_thumbnail); + } catch (ServerException $e) { + // There was not enough metadata available } } @@ -1111,6 +1143,27 @@ function common_xml_safe_str($str) return preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str); } +function common_slugify($str) +{ + // php5-intl is highly recommended... + if (!function_exists('transliterator_transliterate')) { + $str = preg_replace('/[^\pL\pN]/u', '', $str); + $str = mb_convert_case($str, MB_CASE_LOWER, 'UTF-8'); + $str = substr($str, 0, 64); + return $str; + } + $str = transliterator_transliterate( + 'Any-Latin;' . // any charset to latin compatible + 'NFD;' . // decompose + '[:Nonspacing Mark:] Remove;' . // remove nonspacing marks (accents etc.) + 'NFC;' . // composite again + '[:Punctuation:] Remove;' . // remove punctuation (.,¿? etc.) + 'Lower();' . // turn into lowercase + 'Latin-ASCII;', // get ASCII equivalents (ð to d for example) + $str); + return preg_replace('/[^\pL\pN]/', '', $str); +} + function common_tag_link($tag) { $canonical = common_canonical_tag($tag); @@ -1134,11 +1187,9 @@ function common_tag_link($tag) function common_canonical_tag($tag) { - // only alphanum - $tag = preg_replace('/[^\pL\pN]/u', '', $tag); - $tag = mb_convert_case($tag, MB_CASE_LOWER, "UTF-8"); - $tag = substr($tag, 0, 64); - return $tag; + $tag = common_slugify($tag); + $tag = substr($tag, 0, 64); + return $tag; } function common_valid_profile_tag($str) @@ -1146,35 +1197,6 @@ function common_valid_profile_tag($str) return preg_match('/^[A-Za-z0-9_\-\.]{1,64}$/', $str); } -/** - * - * @param $sender_id - * @param $nickname - * @return - * @access private - */ -function common_group_link($sender_id, $nickname) -{ - $sender = Profile::getKV($sender_id); - $group = User_group::getForNickname($nickname, $sender); - if ($sender && $group && $sender->isMember($group)) { - $attrs = array('href' => $group->permalink(), - 'class' => 'url'); - if (!empty($group->fullname)) { - $attrs['title'] = $group->getFancyName(); - } - $xs = new XMLStringer(); - $xs->elementStart('span', 'vcard'); - $xs->elementStart('a', $attrs); - $xs->element('span', 'fn nickname group', $nickname); - $xs->elementEnd('a'); - $xs->elementEnd('span'); - return $xs->getString(); - } else { - return $nickname; - } -} - /** * Resolve an ambiguous profile nickname reference, checking in following order: * - profiles that $sender subscribes to @@ -1222,10 +1244,10 @@ function common_relative_profile($sender, $nickname, $dt=null) return $recipient; } // If this is a local user, try to find a local user with that nickname. - $sender = User::getKV($sender->id); - if ($sender) { + $sender = User::getKV('id', $sender->id); + if ($sender instanceof User) { $recipient_user = User::getKV('nickname', $nickname); - if ($recipient_user) { + if ($recipient_user instanceof User) { return $recipient_user->getProfile(); } } @@ -1241,7 +1263,9 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad $r = Router::get(); $path = $r->build($action, $args, $params, $fragment); - $ssl = StatusNet::isHTTPS() || common_is_sensitive($action); + $ssl = common_config('site', 'ssl') === 'always' + || GNUsocial::isHTTPS() + || common_is_sensitive($action); if (common_config('site','fancy')) { $url = common_path($path, $ssl, $addSession); @@ -1284,6 +1308,7 @@ function common_path($relative, $ssl=false, $addSession=true) $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : ''; if (($ssl && (common_config('site', 'ssl') === 'sometimes')) + || GNUsocial::isHTTPS() || common_config('site', 'ssl') === 'always') { $proto = 'https'; if (is_string(common_config('site', 'sslserver')) && @@ -1312,26 +1337,26 @@ function common_path($relative, $ssl=false, $addSession=true) function common_inject_session($url, $serverpart = null) { - if (common_have_session()) { + if (!common_have_session()) { + return $url; + } - if (empty($serverpart)) { - $serverpart = parse_url($url, PHP_URL_HOST); - } + if (empty($serverpart)) { + $serverpart = parse_url($url, PHP_URL_HOST); + } - $currentServer = (array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['HTTP_HOST'] : null; + $currentServer = (array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['HTTP_HOST'] : null; - // Are we pointing to another server (like an SSL server?) + // Are we pointing to another server (like an SSL server?) - if (!empty($currentServer) && - 0 != strcasecmp($currentServer, $serverpart)) { - // Pass the session ID as a GET parameter - $sesspart = session_name() . '=' . session_id(); - $i = strpos($url, '?'); - if ($i === false) { // no GET params, just append - $url .= '?' . $sesspart; - } else { - $url = substr($url, 0, $i + 1).$sesspart.'&'.substr($url, $i + 1); - } + if (!empty($currentServer) && 0 != strcasecmp($currentServer, $serverpart)) { + // Pass the session ID as a GET parameter + $sesspart = session_name() . '=' . session_id(); + $i = strpos($url, '?'); + if ($i === false) { // no GET params, just append + $url .= '?' . $sesspart; + } else { + $url = substr($url, 0, $i + 1).$sesspart.'&'.substr($url, $i + 1); } } @@ -1400,7 +1425,8 @@ function common_exact_date($dt) $dateStr = date('d F Y H:i:s', strtotime($dt)); $d = new DateTime($dateStr, $_utc); $d->setTimezone($_siteTz); - return $d->format(DATE_RFC850); + // TRANS: Human-readable full date-time specification (formatting on http://php.net/date) + return $d->format(_('l, d-M-Y H:i:s T')); } function common_date_w3dtf($dt) @@ -1511,21 +1537,6 @@ function common_enqueue_notice($notice) return true; } -/** - * Legacy function to broadcast profile updates to OMB remote subscribers. - * - * XXX: This probably needs killing, but there are several bits of code - * that broadcast profile changes that need to be dealt with. AFAIK - * this function is only used for OMB. -z - * - * Since this may be slow with a lot of subscribers or bad remote sites, - * this is run through the background queues if possible. - */ -function common_broadcast_profile(Profile $profile) -{ - Event::handle('BroadcastProfile', array($profile)); -} - function common_profile_url($nickname) { return common_local_url('showstream', array('nickname' => $nickname), @@ -1545,18 +1556,30 @@ function common_root_url($ssl=false) return $url; } +/** + * returns $bytes bytes of raw random data + */ +function common_random_rawstr($bytes) +{ + $rawstr = @file_exists('/dev/urandom') + ? common_urandom($bytes) + : common_mtrand($bytes); + + return $rawstr; +} + /** * returns $bytes bytes of random data as a hexadecimal string - * "good" here is a goal and not a guarantee */ -function common_good_rand($bytes) +function common_random_hexstr($bytes) { - // XXX: use random.org...? - if (@file_exists('/dev/urandom')) { - return common_urandom($bytes); - } else { // FIXME: this is probably not good enough - return common_mtrand($bytes); + $str = common_random_rawstr($bytes); + + $hexstr = ''; + for ($i = 0; $i < $bytes; $i++) { + $hexstr .= sprintf("%02x", ord($str[$i])); } + return $hexstr; } function common_urandom($bytes) @@ -1565,20 +1588,16 @@ function common_urandom($bytes) // should not block $src = fread($h, $bytes); fclose($h); - $enc = ''; - for ($i = 0; $i < $bytes; $i++) { - $enc .= sprintf("%02x", (ord($src[$i]))); - } - return $enc; + return $src; } function common_mtrand($bytes) { - $enc = ''; + $str = ''; for ($i = 0; $i < $bytes; $i++) { - $enc .= sprintf("%02x", mt_rand(0, 255)); + $str .= chr(mt_rand(0, 255)); } - return $enc; + return $str; } /** @@ -1693,8 +1712,10 @@ function common_debug($msg, $filename=null) function common_log_db_error(&$object, $verb, $filename=null) { + global $_PEAR; + $objstr = common_log_objstring($object); - $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); + $last_error = &$_PEAR->getStaticProperty('DB_DataObject','lastError'); if (is_object($last_error)) { $msg = $last_error->message; } else { @@ -1819,6 +1840,54 @@ function common_accept_to_prefs($accept, $def = '*/*') return $prefs; } +// Match by our supported file extensions +function common_supported_ext_to_mime($fileext) +{ + // Accept a filename and take out the extension + if (strpos($fileext, '.') !== false) { + $fileext = substr(strrchr($fileext, '.'), 1); + } + + $supported = common_config('attachments', 'supported'); + foreach($supported as $type => $ext) { + if ($ext === $fileext) { + return $type; + } + } + + throw new ServerException('Unsupported file extension'); +} + +// Match by our supported mime types +function common_supported_mime_to_ext($mimetype) +{ + $supported = common_config('attachments', 'supported'); + foreach($supported as $type => $ext) { + if ($mimetype === $type) { + return $ext; + } + } + + throw new ServerException('Unsupported MIME type'); +} + +// The MIME "media" is the part before the slash (video in video/webm) +function common_get_mime_media($type) +{ + $tmp = explode('/', $type); + return strtolower($tmp[0]); +} + +// Get only the mimetype and not additional info (separated from bare mime with semi-colon) +function common_bare_mime($mimetype) +{ + $mimetype = mb_strtolower($mimetype); + if ($semicolon = mb_strpos($mimetype, ';')) { + $mimetype = mb_substr($mimetype, 0, $semicolon); + } + return $mimetype; +} + function common_mime_type_match($type, $avail) { if(array_key_exists($type, $avail)) { @@ -1875,9 +1944,14 @@ function common_negotiate_type($cprefs, $sprefs) return $besttype; } -function common_config($main, $sub) +function common_config($main, $sub=null) { global $config; + if (is_null($sub)) { + // Return the config category array + return array_key_exists($main, $config) ? $config[$main] : array(); + } + // Return the config value return (array_key_exists($main, $config) && array_key_exists($sub, $config[$main])) ? $config[$main][$sub] : false; } @@ -1950,13 +2024,6 @@ function common_user_uri(&$user) null, null, false); } -function common_notice_uri(&$notice) -{ - return common_local_url('shownotice', - array('notice' => $notice->id), - null, null, false); -} - // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits function common_confirmation_code($bits) @@ -1967,7 +2034,7 @@ function common_confirmation_code($bits) $code = ''; for ($i = 0; $i < $chars; $i++) { // XXX: convert to string and back - $num = hexdec(common_good_rand(1)); + $num = hexdec(common_random_hexstr(1)); // XXX: randomness is too precious to throw away almost // 40% of the bits we get! $code .= $codechars[$num%32]; @@ -1976,9 +2043,12 @@ function common_confirmation_code($bits) } // convert markup to HTML - function common_markup_to_html($c, $args=null) { + if ($c === null) { + return ''; + } + if (is_null($args)) { $args = array(); } @@ -1993,7 +2063,8 @@ function common_markup_to_html($c, $args=null) $c = preg_replace_callback('/%%action.(\w+)%%/', function ($m) { return common_local_url($m[1]); }, $c); $c = preg_replace_callback('/%%doc.(\w+)%%/', function ($m) { return common_local_url('doc', array('title'=>$m[1])); }, $c); $c = preg_replace_callback('/%%(\w+).(\w+)%%/', function ($m) { return common_config($m[1], $m[2]); }, $c); - return Markdown($c); + + return \Michelf\Markdown::defaultTransform($c); } function common_user_property($property) @@ -2033,9 +2104,9 @@ function common_profile_uri($profile) if (!empty($profile)) { if (Event::handle('StartCommonProfileURI', array($profile, &$uri))) { - $user = User::getKV($profile->id); - if (!empty($user)) { - $uri = $user->uri; + $user = User::getKV('id', $profile->id); + if ($user instanceof User) { + $uri = $user->getUri(); } Event::handle('EndCommonProfileURI', array($profile, &$uri)); } @@ -2099,7 +2170,7 @@ function common_session_token() { common_ensure_session(); if (!array_key_exists('token', $_SESSION)) { - $_SESSION['token'] = common_good_rand(64); + $_SESSION['token'] = common_random_hexstr(64); } return $_SESSION['token']; } @@ -2172,17 +2243,16 @@ function common_shorten_url($long_url, User $user=null, $force = false) if (Event::handle('StartShortenUrl', array($long_url, $shortenerName, &$shortenedUrl))) { if ($shortenerName == 'internal') { - $f = File::processNew($long_url); - if (empty($f)) { - return $long_url; - } else { - $shortenedUrl = common_local_url('redirecturl', - array('id' => $f->id)); + try { + $f = File::processNew($long_url); + $shortenedUrl = common_local_url('redirecturl', array('id' => $f->id)); if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) { return $shortenedUrl; } else { return $long_url; } + } catch (ServerException $e) { + return $long_url; } } else { return $long_url; @@ -2363,3 +2433,21 @@ function common_log_delta($comment=null) common_debug(sprintf("%s: %d %d", $comment, $mtotal, round($ttotal * 1000000))); } + +function common_strip_html($html, $trim=true, $save_whitespace=false) +{ + if (!$save_whitespace) { + $html = preg_replace('/\s+/', ' ', $html); + } + $text = html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'); + return $trim ? trim($text) : $text; +} + +function html_sprintf() +{ + $args = func_get_args(); + for ($i=1; $i