From befbfc9c73a75bac9d7dac4a4b7a21bd515ce1b4 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 16 Jun 2009 23:10:17 -0400
Subject: Moved url handling to its proper place, from newnotice to Notice.php

---
 actions/newnotice.php | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 02976a2ae..72ccd8c32 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -231,7 +231,6 @@ class NewnoticeAction extends Action
         if (isset($mimetype)) {
             $this->storeFile($notice, $mimetype);
         }
-        $this->saveUrls($notice);
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
@@ -284,24 +283,6 @@ class NewnoticeAction extends Action
         }
     }
 
-    /** save all urls in the notice to the db
-     *
-     * follow redirects and save all available file information
-     * (mimetype, date, size, oembed, etc.)
-     *
-     * @param class $notice Notice to pull URLs from
-     *
-     * @return void
-     */
-    function saveUrls($notice, $uploaded = null) {
-        common_replace_urls_callback($notice->content, array($this, 'saveUrl'), $notice->id);
-    }
-
-    function saveUrl($data) {
-        list($url, $notice_id) = $data;
-        $zzz = File::processNew($url, $notice_id);
-    }
-
     /**
      * Show an Ajax-y error message
      *
-- 
cgit v1.2.3-54-g00ecf


From d9bebfd6512353690be8bf8cc596a0656ef48ae9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 22 Jun 2009 22:48:31 +0000
Subject: Attachment upload server and path now configurable

---
 actions/newnotice.php | 34 +++++++++++++++++++++++-------
 classes/File.php      | 58 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 77 insertions(+), 15 deletions(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 72ccd8c32..09652d2b3 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -257,23 +257,43 @@ class NewnoticeAction extends Action
     }
 
     function storeFile($notice, $mimetype) {
-        $filename = basename($_FILES['attach']['name']);
-        $destination = "file/{$notice->id}-$filename";
-        if (move_uploaded_file($_FILES['attach']['tmp_name'], INSTALLDIR . "/$destination")) {
+
+        common_debug("NewnoticeAction::storeFile()");
+
+        $basename = basename($_FILES['attach']['name']);
+
+        common_debug("Basename: $basename");
+
+        $filename = File::filename($notice->id, $basename);
+
+        common_debug("filename: $filename");
+
+        $filepath = File::path($filename);
+
+        common_debug("filepath: $filepath");
+
+        if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
+
             $file = new File;
+            $file->filename = $filename;
+
             $file->url = common_local_url('file', array('notice' => $notice->id));
-            $file->size = filesize(INSTALLDIR . "/$destination");
+
+            common_debug("file->url =". $file->url);
+
+            $file->size = filesize($filepath);
             $file->date = time();
             $file->mimetype = $mimetype;
+
             if ($file_id = $file->insert()) {
                 $file_redir = new File_redirection;
-                $file_redir->url = common_path($destination);
+                $file_redir->url = File::url($filename);
                 $file_redir->file_id = $file_id;
                 $file_redir->insert();
 
                 $f2p = new File_to_post;
-                $f2p->file_id = $file_id; 
-                $f2p->post_id = $notice->id; 
+                $f2p->file_id = $file_id;
+                $f2p->post_id = $notice->id;
                 $f2p->insert();
             } else {
                 $this->clientError(_('There was a database error while saving your file. Please try again.'));
diff --git a/classes/File.php b/classes/File.php
index 47af1c550..1de136240 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -30,7 +30,7 @@ require_once INSTALLDIR.'/classes/File_to_post.php';
  * Table Definition for file
  */
 
-class File extends Memcached_DataObject 
+class File extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -38,12 +38,12 @@ class File extends Memcached_DataObject
     public $__table = 'file';                            // table name
     public $id;                              // int(4)  primary_key not_null
     public $url;                             // varchar(255)  unique_key
-    public $mimetype;                        // varchar(50)  
-    public $size;                            // int(4)  
-    public $title;                           // varchar(255)  
-    public $date;                            // int(4)  
-    public $protected;                       // int(4)  
-    public $filename;                        // varchar(255)  
+    public $mimetype;                        // varchar(50)
+    public $size;                            // int(4)
+    public $title;                           // varchar(255)
+    public $date;                            // int(4)
+    public $protected;                       // int(4)
+    public $filename;                        // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
@@ -116,7 +116,7 @@ class File extends Memcached_DataObject
             $x = File::staticGet($file_id);
             if (empty($x)) die('Impossible!');
         }
-       
+
         File_to_post::processNew($file_id, $notice_id);
         return $x;
     }
@@ -145,5 +145,47 @@ class File extends Memcached_DataObject
         }
         return true;
     }
+
+    // where should the file go?
+
+     static function filename($notice_id, $basename)
+     {
+         return $notice_id . '-' . $basename;
+     }
+
+     static function path($filename)
+     {
+         $dir = common_config('attachments', 'dir');
+
+         if ($dir[strlen($dir)-1] != '/') {
+             $dir .= '/';
+         }
+
+         return $dir . $filename;
+     }
+
+     static function url($filename)
+     {
+         $path = common_config('attachments', 'path');
+
+         if ($path[strlen($path)-1] != '/') {
+             $path .= '/';
+         }
+
+         if ($path[0] != '/') {
+             $path = '/'.$path;
+         }
+
+         $server = common_config('attachments', 'server');
+
+         if (empty($server)) {
+             $server = common_config('site', 'server');
+         }
+
+         // XXX: protocol
+
+         return 'http://'.$server.$path.$filename;
+     }
+
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 7bcaa858af31c5c496bc5adc0c73ec333d4c1e63 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 05:35:20 -0700
Subject: make file command configurable

---
 README                | 4 ++++
 actions/newnotice.php | 3 +++
 lib/common.php        | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'actions/newnotice.php')

diff --git a/README b/README
index de1099600..1a57d6a80 100644
--- a/README
+++ b/README
@@ -1232,6 +1232,10 @@ supported: an array of mime types you accept to store and distribute,
            setup your server to properly reckognize the types you want to
            support.
 uploads:   false to disable uploading files with notices (true by default).
+filecommand: The required MIME_Type library may need to use the 'file'
+	     command. It tries the one in the Web server's path, but if
+	     you're having problems with uploads, try setting this to the
+	     correct value. Note: 'file' must accept '-b' and '-i' options.
 
 For quotas, be sure you've set the upload_max_filesize and post_max_size
 in php.ini to be large enough to handle your upload. In httpd.conf
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 09652d2b3..b7d9ec1dd 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -116,6 +116,9 @@ class NewnoticeAction extends Action
     function getUploadedFileType() {
         require_once 'MIME/Type.php';
 
+        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
+        $cmd = common_config('attachments', 'filecommand');
+
         $filetype = MIME_Type::autoDetect($_FILES['attach']['tmp_name']);
         if (in_array($filetype, common_config('attachments', 'supported'))) {
             return $filetype;
diff --git a/lib/common.php b/lib/common.php
index 20f1ab35e..76eb4a978 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -202,7 +202,7 @@ $config =
         array('run' => 'web',
               'frequency' => 10000,
               'reporturl' => 'http://laconi.ca/stats/report'),
-        'attachments' => 
+        'attachments' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
               'path' => $_path . '/file/',
@@ -241,6 +241,7 @@ $config =
         'user_quota' => 50000000,
         'monthly_quota' => 15000000,
         'uploads' => true,
+        'filecommand' => '/usr/bin/file',
         ),
         'group' =>
         array('maxaliases' => 3),
-- 
cgit v1.2.3-54-g00ecf


From a21a9f26c5f0eb034ea389659dd63ffad400de5b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 07:29:43 -0700
Subject: append uploads to content rather than showing them double

---
 actions/newnotice.php        | 104 +++++++++++++++++++++++++++++++++----------
 classes/File.php             |  67 +++++++++++++++-------------
 classes/File_redirection.php |  70 +++--------------------------
 lib/noticelist.php           |   4 --
 lib/util.php                 |  65 +++++++++++++++++++++++++++
 5 files changed, 186 insertions(+), 124 deletions(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index b7d9ec1dd..a5f87d1be 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -224,16 +224,40 @@ class NewnoticeAction extends Action
             }
         }
 
+        if (isset($mimetype)) {
+            $filename = $this->saveFile($mimetype);
+            if (empty($filename)) {
+                $this->clientError(_('Couldn\'t save file.'));
+            }
+            $fileurl = File::url($filename);
+            $short_fileurl = common_shorten_url($fileurl);
+            $content_shortened .= ' ' . $short_fileurl;
+            if (mb_strlen($content_shortened) > 140) {
+                $this->deleteFile($filename);
+                $this->clientError(_('Max notice size is 140 chars, including attachment URL.'));
+            }
+        }
+
+        common_debug("newnotice.php - before Notice::saveNew()");
+
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
+        common_debug("newnotice.php - after Notice::saveNew()");
+
         if (is_string($notice)) {
+            if (isset($filename)) {
+                $this->deleteFile($filename);
+            }
             $this->clientError($notice);
         }
 
+        common_debug("newnotice.php - after Notice::saveNew()");
+
         if (isset($mimetype)) {
-            $this->storeFile($notice, $mimetype);
+            $this->attachFile($notice, $filename, $mimetype, $short_fileurl);
         }
+
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
@@ -259,7 +283,13 @@ class NewnoticeAction extends Action
         }
     }
 
-    function storeFile($notice, $mimetype) {
+    function saveFile($mimetype) {
+
+        $cur = common_current_user();
+
+        if (empty($cur)) {
+            $this->serverError(_('Somehow lost the login in saveFile'));
+        }
 
         common_debug("NewnoticeAction::storeFile()");
 
@@ -267,7 +297,7 @@ class NewnoticeAction extends Action
 
         common_debug("Basename: $basename");
 
-        $filename = File::filename($notice->id, $basename);
+        $filename = File::filename($cur->getProfile(), $basename, $mimetype);
 
         common_debug("filename: $filename");
 
@@ -276,33 +306,59 @@ class NewnoticeAction extends Action
         common_debug("filepath: $filepath");
 
         if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
+            return $filename;
+        } else {
+            $this->clientError(_('File could not be moved to destination directory.'));
+        }
+    }
 
-            $file = new File;
-            $file->filename = $filename;
+    function deleteFile($filename)
+    {
+        $filepath = File::path($filename);
+        @unlink($filepath);
+    }
 
-            $file->url = common_local_url('file', array('notice' => $notice->id));
+    function attachFile($notice, $filename, $mimetype, $short)
+    {
+        $file = new File;
+        $file->filename = $filename;
 
-            common_debug("file->url =". $file->url);
+        $file->url = common_local_url('file', array('notice' => $notice->id));
 
-            $file->size = filesize($filepath);
-            $file->date = time();
-            $file->mimetype = $mimetype;
+        common_debug("file->url =". $file->url);
 
-            if ($file_id = $file->insert()) {
-                $file_redir = new File_redirection;
-                $file_redir->url = File::url($filename);
-                $file_redir->file_id = $file_id;
-                $file_redir->insert();
+        $filepath = File::path($filename);
 
-                $f2p = new File_to_post;
-                $f2p->file_id = $file_id;
-                $f2p->post_id = $notice->id;
-                $f2p->insert();
-            } else {
-                $this->clientError(_('There was a database error while saving your file. Please try again.'));
-            }
-        } else {
-            $this->clientError(_('File could not be moved to destination directory.'));
+        $file->size = filesize($filepath);
+        $file->date = time();
+        $file->mimetype = $mimetype;
+
+        $file_id = $file->insert();
+
+        if (!$file_id) {
+            common_log_db_error($file, "INSERT", __FILE__);
+            $this->clientError(_('There was a database error while saving your file. Please try again.'));
+        }
+
+        $file_redir = new File_redirection;
+        $file_redir->url = File::url($filename);
+        $file_redir->file_id = $file_id;
+
+        $result = $file_redir->insert();
+
+        if (!$result) {
+            common_log_db_error($file_redir, "INSERT", __FILE__);
+            $this->clientError(_('There was a database error while saving your file. Please try again.'));
+        }
+
+        $f2p = new File_to_post;
+        $f2p->file_id = $file_id;
+        $f2p->post_id = $notice->id;
+        $f2p->insert();
+
+        if (!$result) {
+            common_log_db_error($f2p, "INSERT", __FILE__);
+            $this->clientError(_('There was a database error while saving your file. Please try again.'));
         }
     }
 
diff --git a/classes/File.php b/classes/File.php
index 1de136240..b98c9e665 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -124,8 +124,8 @@ class File extends Memcached_DataObject
     function isRespectsQuota($user) {
         if ($_FILES['attach']['size'] > common_config('attachments', 'file_quota')) {
             return sprintf(_('No file may be larger than %d bytes ' .
-                'and the file you sent was %d bytes. Try to upload a smaller version.'),
-                common_config('attachments', 'file_quota'), $_FILES['attach']['size']);
+                             'and the file you sent was %d bytes. Try to upload a smaller version.'),
+                           common_config('attachments', 'file_quota'), $_FILES['attach']['size']);
         }
 
         $query = "select sum(size) as total from file join file_to_post on file_to_post.file_id = file.id join notice on file_to_post.post_id = notice.id where profile_id = {$user->id} and file.url like '%/notice/%/file'";
@@ -148,44 +148,49 @@ class File extends Memcached_DataObject
 
     // where should the file go?
 
-     static function filename($notice_id, $basename)
-     {
-         return $notice_id . '-' . $basename;
-     }
-
-     static function path($filename)
-     {
-         $dir = common_config('attachments', 'dir');
+    static function filename($profile, $basename, $mimetype)
+    {
+        require_once 'MIME/Type/Extension.php';
+        $mte = new MIME_Type_Extension();
+        $ext = $mte->getExtension($mimetype);
+        $nickname = $profile->nickname;
+        $datestamp = strftime('%Y%m%dT%H%M%S', time());
+        $random = strtolower(common_confirmation_code(32));
+        return "$nickname-$datestamp-$random.$ext";
+    }
 
-         if ($dir[strlen($dir)-1] != '/') {
-             $dir .= '/';
-         }
+    static function path($filename)
+    {
+        $dir = common_config('attachments', 'dir');
 
-         return $dir . $filename;
-     }
+        if ($dir[strlen($dir)-1] != '/') {
+            $dir .= '/';
+        }
 
-     static function url($filename)
-     {
-         $path = common_config('attachments', 'path');
+        return $dir . $filename;
+    }
 
-         if ($path[strlen($path)-1] != '/') {
-             $path .= '/';
-         }
+    static function url($filename)
+    {
+        $path = common_config('attachments', 'path');
 
-         if ($path[0] != '/') {
-             $path = '/'.$path;
-         }
+        if ($path[strlen($path)-1] != '/') {
+            $path .= '/';
+        }
 
-         $server = common_config('attachments', 'server');
+        if ($path[0] != '/') {
+            $path = '/'.$path;
+        }
 
-         if (empty($server)) {
-             $server = common_config('site', 'server');
-         }
+        $server = common_config('attachments', 'server');
 
-         // XXX: protocol
+        if (empty($server)) {
+            $server = common_config('site', 'server');
+        }
 
-         return 'http://'.$server.$path.$filename;
-     }
+        // XXX: protocol
 
+        return 'http://'.$server.$path.$filename;
+    }
 }
 
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index edd915c1e..c173017e2 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -25,21 +25,20 @@ require_once INSTALLDIR.'/classes/File_oembed.php';
 
 define('USER_AGENT', 'Laconica user agent / file probe');
 
-
 /**
  * Table Definition for file_redirection
  */
 
-class File_redirection extends Memcached_DataObject 
+class File_redirection extends Memcached_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 $file_id;                         // int(4)  
-    public $redirections;                    // int(4)  
-    public $httpcode;                        // int(4)  
+    public $file_id;                         // int(4)
+    public $redirections;                    // int(4)
+    public $httpcode;                        // int(4)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
@@ -48,8 +47,6 @@ class File_redirection extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-
-
     function _commonCurl($url, $redirs) {
         $curlh = curl_init();
         curl_setopt($curlh, CURLOPT_URL, $url);
@@ -86,8 +83,6 @@ class File_redirection extends Memcached_DataObject
             return $url;
         }
 
-
-
         $curlh = File_redirection::_commonCurl($short_url, $redirs);
         // Don't include body in output
         curl_setopt($curlh, CURLOPT_NOBODY, true);
@@ -143,62 +138,7 @@ class File_redirection extends Memcached_DataObject
     }
 
     function _userMakeShort($long_url, $user) {
-        if (empty($user)) {
-            // common current user does not find a user when called from the XMPP daemon
-            // therefore we'll set one here fix, so that XMPP given URLs may be shortened
-            $user->urlshorteningservice = 'ur1.ca';
-        }
-        $curlh = curl_init();
-        curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
-        curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
-        curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-
-        switch($user->urlshorteningservice) {
-            case 'ur1.ca':
-                require_once INSTALLDIR.'/lib/Shorturl_api.php';
-                $short_url_service = new LilUrl;
-                $short_url = $short_url_service->shorten($long_url);
-                break;
-
-            case '2tu.us':
-                $short_url_service = new TightUrl;
-                require_once INSTALLDIR.'/lib/Shorturl_api.php';
-                $short_url = $short_url_service->shorten($long_url);
-                break;
-
-            case 'ptiturl.com':
-                require_once INSTALLDIR.'/lib/Shorturl_api.php';
-                $short_url_service = new PtitUrl;
-                $short_url = $short_url_service->shorten($long_url);
-                break;
-
-            case 'bit.ly':
-                curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($long_url));
-                $short_url = current(json_decode(curl_exec($curlh))->results)->hashUrl;
-                break;
-
-            case 'is.gd':
-                curl_setopt($curlh, CURLOPT_URL, 'http://is.gd/api.php?longurl='.urlencode($long_url));
-                $short_url = curl_exec($curlh);
-                break;
-            case 'snipr.com':
-                curl_setopt($curlh, CURLOPT_URL, 'http://snipr.com/site/snip?r=simple&link='.urlencode($long_url));
-                $short_url = curl_exec($curlh);
-                break;
-            case 'metamark.net':
-                curl_setopt($curlh, CURLOPT_URL, 'http://metamark.net/api/rest/simple?long_url='.urlencode($long_url));
-                $short_url = curl_exec($curlh);
-                break;
-            case 'tinyurl.com':
-                curl_setopt($curlh, CURLOPT_URL, 'http://tinyurl.com/api-create.php?url='.urlencode($long_url));
-                $short_url = curl_exec($curlh);
-                break;
-            default:
-                $short_url = false;
-        }
-
-        curl_close($curlh);
-
+        $short_url = common_shorten_url($long_url);
         if ($short_url) {
             $short_url = (string)$short_url;
             // store it
diff --git a/lib/noticelist.php b/lib/noticelist.php
index bd4815cd6..6f05c63d6 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -336,10 +336,6 @@ class NoticeListItem extends Widget
             // versions (>> 0.4.x)
             $this->out->raw(common_render_content($this->notice->content, $this->notice));
         }
-        $uploaded = $this->notice->getUploadedAttachment();
-        if ($uploaded) {
-            $this->out->element('a', array('href' => $uploaded[0], 'class' => 'attachment', 'id' => 'attachment-' . $uploaded[1]), $uploaded[0]);
-        }
         $this->out->elementEnd('p');
     }
 
diff --git a/lib/util.php b/lib/util.php
index 0aff893fd..1af462516 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1377,3 +1377,68 @@ function common_database_tablename($tablename)
   //table prefixes could be added here later
   return $tablename;
 }
+
+function common_shorten_url($long_url)
+{
+    $user = common_current_user();
+    if (empty($user)) {
+        // common current user does not find a user when called from the XMPP daemon
+        // therefore we'll set one here fix, so that XMPP given URLs may be shortened
+        $svc = 'ur1.ca';
+    } else {
+        $svc = $user->urlshorteningservice;
+    }
+
+    $curlh = curl_init();
+    curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
+    curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
+    curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
+
+    switch($svc) {
+     case 'ur1.ca':
+        require_once INSTALLDIR.'/lib/Shorturl_api.php';
+        $short_url_service = new LilUrl;
+        $short_url = $short_url_service->shorten($long_url);
+        break;
+
+     case '2tu.us':
+        $short_url_service = new TightUrl;
+        require_once INSTALLDIR.'/lib/Shorturl_api.php';
+        $short_url = $short_url_service->shorten($long_url);
+        break;
+
+     case 'ptiturl.com':
+        require_once INSTALLDIR.'/lib/Shorturl_api.php';
+        $short_url_service = new PtitUrl;
+        $short_url = $short_url_service->shorten($long_url);
+        break;
+
+     case 'bit.ly':
+        curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($long_url));
+        $short_url = current(json_decode(curl_exec($curlh))->results)->hashUrl;
+        break;
+
+     case 'is.gd':
+        curl_setopt($curlh, CURLOPT_URL, 'http://is.gd/api.php?longurl='.urlencode($long_url));
+        $short_url = curl_exec($curlh);
+        break;
+     case 'snipr.com':
+        curl_setopt($curlh, CURLOPT_URL, 'http://snipr.com/site/snip?r=simple&link='.urlencode($long_url));
+        $short_url = curl_exec($curlh);
+        break;
+     case 'metamark.net':
+        curl_setopt($curlh, CURLOPT_URL, 'http://metamark.net/api/rest/simple?long_url='.urlencode($long_url));
+        $short_url = curl_exec($curlh);
+        break;
+     case 'tinyurl.com':
+        curl_setopt($curlh, CURLOPT_URL, 'http://tinyurl.com/api-create.php?url='.urlencode($long_url));
+        $short_url = curl_exec($curlh);
+        break;
+     default:
+        $short_url = false;
+    }
+
+    curl_close($curlh);
+
+    return $short_url;
+}
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From e261a97150684c943ebd6f994f610a2c2d0ba6b6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 07:48:33 -0700
Subject: remove common_debug from newnotice

---
 actions/newnotice.php | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a5f87d1be..4a2c369f0 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -238,13 +238,9 @@ class NewnoticeAction extends Action
             }
         }
 
-        common_debug("newnotice.php - before Notice::saveNew()");
-
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
-        common_debug("newnotice.php - after Notice::saveNew()");
-
         if (is_string($notice)) {
             if (isset($filename)) {
                 $this->deleteFile($filename);
@@ -252,8 +248,6 @@ class NewnoticeAction extends Action
             $this->clientError($notice);
         }
 
-        common_debug("newnotice.php - after Notice::saveNew()");
-
         if (isset($mimetype)) {
             $this->attachFile($notice, $filename, $mimetype, $short_fileurl);
         }
@@ -291,20 +285,12 @@ class NewnoticeAction extends Action
             $this->serverError(_('Somehow lost the login in saveFile'));
         }
 
-        common_debug("NewnoticeAction::storeFile()");
-
         $basename = basename($_FILES['attach']['name']);
 
-        common_debug("Basename: $basename");
-
         $filename = File::filename($cur->getProfile(), $basename, $mimetype);
 
-        common_debug("filename: $filename");
-
         $filepath = File::path($filename);
 
-        common_debug("filepath: $filepath");
-
         if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
             return $filename;
         } else {
@@ -325,8 +311,6 @@ class NewnoticeAction extends Action
 
         $file->url = common_local_url('file', array('notice' => $notice->id));
 
-        common_debug("file->url =". $file->url);
-
         $filepath = File::path($filename);
 
         $file->size = filesize($filepath);
-- 
cgit v1.2.3-54-g00ecf


From 638905c270824b3c0e673ae9872937c06fbd862e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 25 Jun 2009 11:10:34 -0700
Subject: avoid getting duplicate errors on upload

---
 actions/newnotice.php        | 43 +++++++++++++++++++++---------------
 classes/File.php             |  5 +++--
 classes/File_redirection.php | 52 ++++++++++++++++++--------------------------
 classes/File_to_post.php     | 20 ++++++++++++-----
 4 files changed, 64 insertions(+), 56 deletions(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 4a2c369f0..3677f54c2 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -236,6 +236,7 @@ class NewnoticeAction extends Action
                 $this->deleteFile($filename);
                 $this->clientError(_('Max notice size is 140 chars, including attachment URL.'));
             }
+            $fileRecord = $this->rememberFile($filename, $mimetype, $short_fileurl);
         }
 
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
@@ -249,7 +250,7 @@ class NewnoticeAction extends Action
         }
 
         if (isset($mimetype)) {
-            $this->attachFile($notice, $filename, $mimetype, $short_fileurl);
+            $this->attachFile($notice, $fileRecord);
         }
 
         common_broadcast_notice($notice);
@@ -304,12 +305,12 @@ class NewnoticeAction extends Action
         @unlink($filepath);
     }
 
-    function attachFile($notice, $filename, $mimetype, $short)
+    function rememberFile($filename, $mimetype, $short)
     {
         $file = new File;
         $file->filename = $filename;
 
-        $file->url = common_local_url('file', array('notice' => $notice->id));
+        $file->url = File::url($filename);
 
         $filepath = File::path($filename);
 
@@ -324,28 +325,34 @@ class NewnoticeAction extends Action
             $this->clientError(_('There was a database error while saving your file. Please try again.'));
         }
 
-        $file_redir = new File_redirection;
-        $file_redir->url = File::url($filename);
-        $file_redir->file_id = $file_id;
+        $this->maybeAddRedir($file_id, $short);
+    }
 
-        $result = $file_redir->insert();
+    function maybeAddRedir($file_id, $url)
+    {
+        $file_redir = File_redirection::staticGet('url', $url);
 
-        if (!$result) {
-            common_log_db_error($file_redir, "INSERT", __FILE__);
-            $this->clientError(_('There was a database error while saving your file. Please try again.'));
-        }
+        if (empty($file_redir)) {
+            $file_redir = new File_redirection;
+            $file_redir->url = $url;
+            $file_redir->file_id = $file_id;
 
-        $f2p = new File_to_post;
-        $f2p->file_id = $file_id;
-        $f2p->post_id = $notice->id;
-        $f2p->insert();
+            $result = $file_redir->insert();
 
-        if (!$result) {
-            common_log_db_error($f2p, "INSERT", __FILE__);
-            $this->clientError(_('There was a database error while saving your file. Please try again.'));
+            if (!$result) {
+                common_log_db_error($file_redir, "INSERT", __FILE__);
+                $this->clientError(_('There was a database error while saving your file. Please try again.'));
+            }
         }
     }
 
+    function attachFile($notice, $filerec)
+    {
+        File_to_post::processNew($filerec->id, $notice->id);
+
+        $this->maybeAddRedir($filerec->id, common_local_url('file', array('notice' => $this->notice->id)));
+    }
+
     /**
      * Show an Ajax-y error message
      *
diff --git a/classes/File.php b/classes/File.php
index b98c9e665..5dd7cd865 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -91,9 +91,10 @@ class File extends Memcached_DataObject
         $given_url = File_redirection::_canonUrl($given_url);
         if (empty($given_url)) return -1;   // error, no url to process
         $file = File::staticGet('url', $given_url);
-        if (empty($file->id)) {
+        if (empty($file)) {
             $file_redir = File_redirection::staticGet('url', $given_url);
-            if (empty($file_redir->id)) {
+            if (empty($file_redir)) {
+                common_debug("processNew() '$given_url' not a known redirect.\n");
                 $redir_data = File_redirection::where($given_url);
                 $redir_url = $redir_data['url'];
                 if ($redir_url === $given_url) {
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index c173017e2..d6fa0bcb6 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -66,21 +66,17 @@ class File_redirection extends Memcached_DataObject
 
         // let's see if we know this...
         $a = File::staticGet('url', $short_url);
-        if (empty($a->id)) {
+
+        if (!empty($a)) {
+            // this is a direct link to $a->url
+            return $a->url;
+        } else {
             $b = File_redirection::staticGet('url', $short_url);
-            if (empty($b->id)) {
-                // we'll have to figure it out
-            } else {
+            if (!empty($b)) {
                 // this is a redirect to $b->file_id
-                $a = File::staticGet($b->file_id);
-                $url = $a->url;
+                $a = File::staticGet('id', $b->file_id);
+                return $a->url;
             }
-        } else {
-            // this is a direct link to $a->url
-            $url = $a->url;
-        }
-        if (isset($url)) {
-            return $url;
         }
 
         $curlh = File_redirection::_commonCurl($short_url, $redirs);
@@ -118,28 +114,22 @@ class File_redirection extends Memcached_DataObject
     }
 
     function makeShort($long_url) {
-        $long_url = File_redirection::_canonUrl($long_url);
-        // do we already know this long_url and have a short redirection for it?
-        $file       = new File;
-        $file_redir = new File_redirection;
-        $file->url  = $long_url;
-        $file->joinAdd($file_redir);
-        $file->selectAdd('length(file_redirection.url) as len');
-        $file->limit(1);
-        $file->orderBy('len');
-        $file->find(true);
-        if (!empty($file->url) && (strlen($file->url) < strlen($long_url))) {
-            return $file->url;
-        }
 
-        // if yet unknown, we must find a short url according to user settings
-        $short_url = File_redirection::_userMakeShort($long_url, common_current_user());
-        return $short_url;
+        $canon = File_redirection::_canonUrl($long_url);
+
+        $short_url = File_redirection::_userMakeShort($canon);
+
+        // Did we get one? Is it shorter?
+        if (!empty($short_url) && mb_strlen($short_url) < mb_strlen($long_url)) {
+            return $short_url;
+        } else {
+            return $long_url;
+        }
     }
 
-    function _userMakeShort($long_url, $user) {
+    function _userMakeShort($long_url) {
         $short_url = common_shorten_url($long_url);
-        if ($short_url) {
+        if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
             // store it
             $file = File::staticGet('url', $long_url);
@@ -162,7 +152,7 @@ class File_redirection extends Memcached_DataObject
             }
             return $short_url;
         }
-        return $long_url;
+        return null;
     }
 
     function _canonUrl($in_url, $default_scheme = 'http://') {
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index db0a8d216..d35febb77 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -25,7 +25,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
  * Table Definition for file_to_post
  */
 
-class File_to_post extends Memcached_DataObject 
+class File_to_post extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -44,17 +44,27 @@ class File_to_post extends Memcached_DataObject
     function processNew($file_id, $notice_id) {
         static $seen = array();
         if (empty($seen[$notice_id]) || !in_array($file_id, $seen[$notice_id])) {
-            $f2p = new File_to_post;
-            $f2p->file_id = $file_id;
-            $f2p->post_id = $notice_id;
-            $f2p->insert();
+
+            $f2p = File_to_post::pkeyGet(array('post_id' => $notice_id,
+                                               'file_id' => $file_id));
+            if (empty($f2p)) {
+                $f2p = new File_to_post;
+                $f2p->file_id = $file_id;
+                $f2p->post_id = $notice_id;
+                $f2p->insert();
+            }
+
             if (empty($seen[$notice_id])) {
                 $seen[$notice_id] = array($file_id);
             } else {
                 $seen[$notice_id][] = $file_id;
             }
         }
+    }
 
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('File_to_post', $kv);
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 03d31911e18f8ca0ba2f8425943b4c244114a066 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 25 Jun 2009 13:51:29 -0700
Subject: FileAction redirections weren't being added (e.g.:
 /notice/$notice_id/file)

---
 actions/newnotice.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3677f54c2..15caff6ea 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -326,6 +326,8 @@ class NewnoticeAction extends Action
         }
 
         $this->maybeAddRedir($file_id, $short);
+
+        return $file;
     }
 
     function maybeAddRedir($file_id, $url)
@@ -350,7 +352,8 @@ class NewnoticeAction extends Action
     {
         File_to_post::processNew($filerec->id, $notice->id);
 
-        $this->maybeAddRedir($filerec->id, common_local_url('file', array('notice' => $this->notice->id)));
+        $this->maybeAddRedir($filerec->id,
+            common_local_url('file', array('notice' => $notice->id)));
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf