X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_redirection.php;h=388fb8b5759e806bb1ef28feea72a0a40e92435f;hb=ab10dfc71db4cae68321313dff98492e75fcc9ad;hp=130d9e7d74751bedba7fd4522a9f472bde81620e;hpb=59043dca7fb6f974b11797c4d0f20e5b78b0611d;p=quix0rs-gnu-social.git diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 130d9e7d74..388fb8b575 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -17,11 +17,7 @@ * 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'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Table Definition for file_redirection @@ -33,15 +29,13 @@ class File_redirection extends Managed_DataObject /* 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 $urlhash; // varchar(64) primary_key not_null + public $url; // text 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 @@ -49,19 +43,25 @@ class File_redirection extends Managed_DataObject { return array( 'fields' => array( - 'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'), + 'urlhash' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'sha256 hash of the URL'), + 'url' => array('type' => 'text', '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'), + 'primary key' => array('urlhash'), 'foreign keys' => array( 'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')), ), ); } + static public function getByUrl($url) + { + return self::getByPK(array('urlhash' => File::hashurl($url))); + } + static function _commonHttp($url, $redirs) { $request = new HTTPClient($url); $request->setConfig(array( @@ -94,7 +94,7 @@ class File_redirection extends Managed_DataObject * size (optional): byte size from Content-Length header * time (optional): timestamp from Last-Modified header */ - public function lookupWhere($short_url, $redirs = 10, $protected = false) { + static function lookupWhere($short_url, $redirs = 10, $protected = false) { if ($redirs < 0) return false; if(strpos($short_url,'://') === false){ @@ -168,17 +168,18 @@ class File_redirection extends Managed_DataObject */ public function where($in_url, $discover=true) { // let's see if we know this... - $a = File::staticGet('url', $in_url); - - if (!empty($a)) { + try { + $a = File::getByUrl($in_url); // this is a direct link to $a->url return $a->url; - } else { - $b = File_redirection::staticGet('url', $in_url); - if (!empty($b)) { + } catch (NoResultException $e) { + try { + $b = File_redirection::getByUrl($in_url); // 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; + } catch (NoResultException $e) { + // Oh well, let's keep going } } @@ -248,26 +249,25 @@ class File_redirection extends Managed_DataObject } } - function _userMakeShort($long_url, User $user=null, $force = false) { + static 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->getID(); + } else { // Check if the target URL is itself a redirect... $redir_data = File_redirection::where($long_url); if (is_array($redir_data)) { // We haven't seen the target URL before. // 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); - } + $file_id = $file->getID(); } 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 @@ -276,14 +276,13 @@ class File_redirection extends Managed_DataObject // SSL sites with cert issues. return null; } - $file_id = $file->id; + $file_id = $file->getID(); } - } 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->urlhash = File::hashurl($short_url); $file_redir->url = $short_url; $file_redir->file_id = $file_id; $file_redir->insert(); @@ -305,19 +304,20 @@ class File_redirection extends Managed_DataObject * @param string $default_scheme if given a bare link; defaults to 'http://' * @return string */ - function _canonUrl($in_url, $default_scheme = 'http://') { + static 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); break; case 'mailto': + case 'magnet': case 'aim': case 'jabber': case 'xmpp': @@ -342,12 +342,55 @@ class File_redirection extends Managed_DataObject return $out_url; } - function saveNew($data, $file_id, $url) { + static function saveNew(array $data, $file_id, $url) { $file_redir = new File_redirection; + $file_redir->urlhash = File::hashurl($short_url); $file_redir->url = $url; $file_redir->file_id = $file_id; $file_redir->redirections = intval($data['redirects']); $file_redir->httpcode = intval($data['code']); $file_redir->insert(); } + + static public function beforeSchemaUpdate() + { + $table = strtolower(get_called_class()); + $schema = Schema::get(); + $schemadef = $schema->getTableDef($table); + + // 2015-02-19 We have to upgrade our table definitions to have the urlhash field populated + if (isset($schemadef['fields']['urlhash']) && in_array('urlhash', $schemadef['primary key'])) { + // We already have the urlhash field, so no need to migrate it. + return; + } + echo "\nFound old $table table, upgrading it to contain 'urlhash' field..."; + // We have to create a urlhash that is _not_ the primary key, + // transfer data and THEN run checkSchema + $schemadef['fields']['urlhash'] = array ( + 'type' => 'varchar', + 'length' => 64, + 'not null' => true, + 'description' => 'sha256 hash of the URL', + ); + $schemadef['fields']['url'] = array ( + 'type' => 'text', + 'description' => 'short URL (or any other kind of redirect) for file (id)', + ); + unset($schemadef['primary key']); + $schema->ensureTable($table, $schemadef); + echo "DONE.\n"; + + $classname = ucfirst($table); + $tablefix = new $classname; + // urlhash is hash('sha256', $url) in the File table + echo "Updating urlhash fields in $table table..."; + // Maybe very MySQL specific :( + $tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;', + $schema->quoteIdentifier($table), + 'urlhash', + // The line below is "result of sha256 on column `url`" + 'SHA2(url, 256)')); + echo "DONE.\n"; + echo "Resuming core schema upgrade..."; + } }