static public function getByUrl($url)
{
- $file = new File_redirection();
- $file->urlhash = File::hashurl($url);
- if (!$file->find(true)) {
- throw new NoResultException($file);
- }
- return $file;
+ return self::getByPK(array('urlhash' => File::hashurl($url)));
}
static function _commonHttp($url, $redirs) {
* 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){
* size (optional): byte size from Content-Length header
* time (optional): timestamp from Last-Modified header
*/
- public function where($in_url, $discover=true) {
+ static function where($in_url, $discover=true) {
// let's see if we know this...
try {
$a = File::getByUrl($in_url);
try {
$b = File_redirection::getByUrl($in_url);
// this is a redirect to $b->file_id
- $a = File::getKV('id', $b->file_id);
+ $a = File::getByID($b->file_id);
return $a->url;
} catch (NoResultException $e) {
// Oh well, let's keep going
if ($discover) {
$ret = File_redirection::lookupWhere($in_url);
return $ret;
- } else {
- // No manual dereferencing; leave the unknown URL as is.
- return $in_url;
}
+
+ // No manual dereferencing; leave the unknown URL as is.
+ return $in_url;
}
/**
* @param User $user whose shortening options to use; defaults to the current web session user
* @return string
*/
- function makeShort($long_url, $user=null)
+ static function makeShort($long_url, $user=null)
{
$canon = File_redirection::_canonUrl($long_url);
// Did we get one? Is it shorter?
- if (!empty($short_url)) {
- return $short_url;
- } else {
- return $long_url;
- }
+ return !empty($short_url) ? $short_url : $long_url;
}
/**
* @return string
*/
- function forceShort($long_url, $user)
+ static function forceShort($long_url, $user)
{
$canon = File_redirection::_canonUrl($long_url);
$short_url = File_redirection::_userMakeShort($canon, $user, true);
// Did we get one? Is it shorter?
- if (!empty($short_url)) {
- return $short_url;
- } else {
- return $long_url;
- }
+ return !empty($short_url) ? $short_url : $long_url;
}
- 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::getKV('url', $long_url);
if ($file instanceof File) {
- $file_id = $file->id;
+ $file_id = $file->getID();
} else {
// Check if the target URL is itself a redirect...
$redir_data = File_redirection::where($long_url);
// 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;
+ $file_id = $file->getID();
} else if (is_string($redir_data)) {
// The file is a known redirect target.
$file = File::getKV('url', $redir_data);
// SSL sites with cert issues.
return null;
}
- $file_id = $file->id;
+ $file_id = $file->getID();
}
}
$file_redir = File_redirection::getKV('url', $short_url);
* @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);
return $out_url;
}
- function saveNew($data, $file_id, $url) {
+ static function saveNew($data, $file_id, $url) {
$file_redir = new File_redirection;
$file_redir->urlhash = File::hashurl($short_url);
$file_redir->url = $url;