X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_redirection.php;h=00a5216505a8171df20642e0c3c6b0b86fcb956f;hb=b0dfc70a54e5e184023ed982dfaf5439041e9708;hp=53c15bf8b213b95e43a78e937eee634151cfd973;hpb=6e894c010fc0e7ddaaafa8795634d6343019aafb;p=quix0rs-gnu-social.git

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 53c15bf8b2..00a5216505 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -23,13 +23,11 @@ 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');
-
 /**
  * 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 */
@@ -41,12 +39,26 @@ class File_redirection extends Memcached_DataObject
     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' => 255, '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(
@@ -153,16 +165,16 @@ class File_redirection extends Memcached_DataObject
      */
     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;
             }
         }
@@ -190,26 +202,55 @@ class File_redirection extends Memcached_DataObject
      * @param User $user whose shortening options to use; defaults to the current web session user
      * @return string
      */
-    function makeShort($long_url, $user=null) {
-
+    function makeShort($long_url, $user=null)
+    {
         $canon = File_redirection::_canonUrl($long_url);
 
         $short_url = File_redirection::_userMakeShort($canon, $user);
 
         // Did we get one? Is it shorter?
-        if (!empty($short_url) && mb_strlen($short_url) < mb_strlen($long_url)) {
+
+        if (!empty($short_url)) {
+            return $short_url;
+        } else {
+            return $long_url;
+        }
+    }
+
+    /**
+     * Shorten a URL with the current user's configured shortening
+     * options, if applicable.
+     *
+     * If it cannot be shortened or the "short" URL is longer than the
+     * original, the original is returned.
+     *
+     * If the referenced item has not been seen before, embedding data
+     * may be saved.
+     *
+     * @param string $long_url
+     * @return string
+     */
+
+    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;
         }
     }
 
-    function _userMakeShort($long_url, User $user=null) {
-        $short_url = common_shorten_url($long_url, $user);
+    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);
+            $file = File::getKV('url', $long_url);
             if (empty($file)) {
                 // Check if the target URL is itself a redirect...
                 $redir_data = File_redirection::where($long_url);
@@ -223,7 +264,7 @@ class File_redirection extends Memcached_DataObject
                     }
                 } 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
@@ -237,7 +278,7 @@ class File_redirection extends Memcached_DataObject
             } else {
                 $file_id = $file->id;
             }
-            $file_redir = File_redirection::staticGet('url', $short_url);
+            $file_redir = File_redirection::getKV('url', $short_url);
             if (empty($file_redir)) {
                 $file_redir = new File_redirection;
                 $file_redir->url = $short_url;
@@ -267,7 +308,7 @@ class File_redirection extends Memcached_DataObject
         $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);