X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_redirection.php;h=d78dc66385d96236e9a14711a8dadecb16153c44;hb=2f86cd860231f92213950d439e9a109b7a5f11c4;hp=92f0125a406dca56accd2439e9aef3f4f57bf14f;hpb=3593f3f1323bfce289bc9805629f7d126dac7ae6;p=quix0rs-gnu-social.git diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 92f0125a40..d78dc66385 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -17,36 +17,44 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -require_once INSTALLDIR.'/classes/File.php'; -require_once INSTALLDIR.'/classes/File_oembed.php'; - -define('USER_AGENT', 'StatusNet user agent / file probe'); +if (!defined('GNUSOCIAL')) { exit(1); } /** * Table Definition for file_redirection */ -class File_redirection extends Memcached_DataObject +class File_redirection extends Managed_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'file_redirection'; // table name - public $url; // varchar(255) primary_key not_null + public $url; // varchar(191) primary_key not_null not 255 because utf8mb4 takes more space public $file_id; // int(4) public $redirections; // int(4) public $httpcode; // int(4) public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - /* Static get */ - function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_redirection',$k,$v); } - /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + public static function schemaDef() + { + return array( + 'fields' => array( + 'url' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'), + 'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'), + 'redirections' => array('type' => 'int', 'description' => 'redirect count'), + 'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'), + 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'), + ), + 'primary key' => array('url'), + 'foreign keys' => array( + 'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')), + ), + ); + } + static function _commonHttp($url, $redirs) { $request = new HTTPClient($url); $request->setConfig(array( @@ -91,9 +99,16 @@ class File_redirection extends Memcached_DataObject $request->setMethod(HTTP_Request2::METHOD_HEAD); $response = $request->send(); - if (405 == $response->getStatus()) { + if (405 == $response->getStatus() || 204 == $response->getStatus()) { + // HTTP 405 Unsupported Method // Server doesn't support HEAD method? Can this really happen? // We'll try again as a GET and ignore the response data. + // + // HTTP 204 No Content + // YFrog sends 204 responses back for our HEAD checks, which + // seems like it may be a logic error in their servers. If + // we get a 204 back, re-run it as a GET... if there's really + // no content it'll be cheap. :) $request = self::_commonHttp($short_url, $redirs); $response = $request->send(); } @@ -132,6 +147,7 @@ class File_redirection extends Memcached_DataObject * reached. * * @param string $in_url + * @param boolean $discover true to attempt dereferencing the redirect if we don't know it already * @return mixed one of: * string - target URL, if this is a direct link or a known redirect * array - redirect info if this is an *unknown* redirect: @@ -143,24 +159,29 @@ class File_redirection extends Memcached_DataObject * size (optional): byte size from Content-Length header * time (optional): timestamp from Last-Modified header */ - public function where($in_url) { + public function where($in_url, $discover=true) { // let's see if we know this... - $a = File::staticGet('url', $in_url); + $a = File::getKV('url', $in_url); if (!empty($a)) { // this is a direct link to $a->url return $a->url; } else { - $b = File_redirection::staticGet('url', $in_url); + $b = File_redirection::getKV('url', $in_url); if (!empty($b)) { // this is a redirect to $b->file_id - $a = File::staticGet('id', $b->file_id); + $a = File::getKV('id', $b->file_id); return $a->url; } } - $ret = File_redirection::lookupWhere($in_url); - return $ret; + if ($discover) { + $ret = File_redirection::lookupWhere($in_url); + return $ret; + } else { + // No manual dereferencing; leave the unknown URL as is. + return $in_url; + } } /** @@ -174,14 +195,14 @@ class File_redirection extends Memcached_DataObject * may be saved. * * @param string $long_url + * @param User $user whose shortening options to use; defaults to the current web session user * @return string */ - - function makeShort($long_url) + function makeShort($long_url, $user=null) { $canon = File_redirection::_canonUrl($long_url); - $short_url = File_redirection::_userMakeShort($canon); + $short_url = File_redirection::_userMakeShort($canon, $user); // Did we get one? Is it shorter? @@ -206,11 +227,11 @@ class File_redirection extends Memcached_DataObject * @return string */ - function forceShort($long_url) + function forceShort($long_url, $user) { $canon = File_redirection::_canonUrl($long_url); - $short_url = File_redirection::_userMakeShort($canon, true); + $short_url = File_redirection::_userMakeShort($canon, $user, true); // Did we get one? Is it shorter? if (!empty($short_url)) { @@ -220,13 +241,15 @@ class File_redirection extends Memcached_DataObject } } - function _userMakeShort($long_url, $force = false) { - $short_url = common_shorten_url($long_url, $force); + function _userMakeShort($long_url, User $user=null, $force = false) { + $short_url = common_shorten_url($long_url, $user, $force); if (!empty($short_url) && $short_url != $long_url) { $short_url = (string)$short_url; // store it - $file = File::staticGet('url', $long_url); - if (empty($file)) { + $file = File::getKV('url', $long_url); + if ($file instanceof File) { + $file_id = $file->id; + } else { // Check if the target URL is itself a redirect... $redir_data = File_redirection::where($long_url); if (is_array($redir_data)) { @@ -234,12 +257,9 @@ class File_redirection extends Memcached_DataObject // Save file and embedding data about it! $file = File::saveNew($redir_data, $long_url); $file_id = $file->id; - if (!empty($redir_data['oembed']['json'])) { - File_oembed::saveNew($redir_data['oembed']['json'], $file_id); - } } else if (is_string($redir_data)) { // The file is a known redirect target. - $file = File::staticGet('url', $redir_data); + $file = File::getKV('url', $redir_data); if (empty($file)) { // @fixme should we save a new one? // this case was triggering sometimes for redirects @@ -250,11 +270,9 @@ class File_redirection extends Memcached_DataObject } $file_id = $file->id; } - } else { - $file_id = $file->id; } - $file_redir = File_redirection::staticGet('url', $short_url); - if (empty($file_redir)) { + $file_redir = File_redirection::getKV('url', $short_url); + if (!$file_redir instanceof File_redirection) { $file_redir = new File_redirection; $file_redir->url = $short_url; $file_redir->file_id = $file_id; @@ -265,13 +283,25 @@ class File_redirection extends Memcached_DataObject return null; } + /** + * Basic attempt to canonicalize a URL, cleaning up some standard variants + * such as funny syntax or a missing path. Used internally when cleaning + * up URLs for storage and following redirect chains. + * + * Note that despite being on File_redirect, this function DOES NOT perform + * any dereferencing of redirects. + * + * @param string $in_url input URL + * @param string $default_scheme if given a bare link; defaults to 'http://' + * @return string + */ function _canonUrl($in_url, $default_scheme = 'http://') { if (empty($in_url)) return false; $out_url = $in_url; $p = parse_url($out_url); if (empty($p['host']) || empty($p['scheme'])) { list($scheme) = explode(':', $in_url, 2); - switch ($scheme) { + switch (strtolower($scheme)) { case 'fax': case 'tel': $out_url = str_replace('.-()', '', $out_url);