The dataurl upload code is no longer used

horde · Oct 28, 2013 · 6e552fe · 6e552fe
1 parent 62b322a
commit 6e552fe
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 35 deletions.
diff --git a/imp/lib/Ajax/Application/Handler/ComposeAttach.php b/imp/lib/Ajax/Application/Handler/ComposeAttach.php
@@ -55,7 +55,7 @@ public function addAttachment()
 
             if ($imp_compose->canUploadAttachment()) {
                 try {
-                    $atc_ob = $imp_compose->addAttachmentFromUpload($this->vars, 'file_upload');
+                    $atc_ob = $imp_compose->addAttachmentFromUpload('file_upload');
                     $result->atc_id = $atc_ob->id;
                     $result->success = 1;
 

diff --git a/imp/lib/Ajax/Application/Handler/Dynamic.php b/imp/lib/Ajax/Application/Handler/Dynamic.php
@@ -900,7 +900,7 @@ public function addAttachmentCkeditor()
 
             if ($imp_compose->canUploadAttachment()) {
                 try {
-                    $atc_ob = $imp_compose->addAttachmentFromUpload($this->vars, 'upload');
+                    $atc_ob = $imp_compose->addAttachmentFromUpload('upload');
                     $atc_ob->related = true;
 
                     $data = array(

diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -186,7 +186,7 @@ protected function _init()
                 if (isset($_FILES['upload_' . $i]) &&
                     strlen($_FILES['upload_' . $i]['name'])) {
                     try {
-                        $atc_ob = $imp_compose->addAttachmentFromUpload($this->vars, 'upload_' . $i);
+                        $atc_ob = $imp_compose->addAttachmentFromUpload('upload_' . $i);
                         if ($notify) {
                             $notification->push(sprintf(_("Added \"%s\" as an attachment."), $atc_ob->getPart()->getName()), 'horde.success');
                         }

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -2838,49 +2838,37 @@ public function addAttachmentFromPart($part)
     /**
      * Add attachment from uploaded (form) data.
      *
-     * @param Horde_Variables $vars  Variables object.
-     * @param string $field          The form field name.
+     * @param string $field  The form field name.
      *
      * @return IMP_Compose_Attachment  Attachment object.
      * @throws IMP_Compose_Exception
      */
-    public function addAttachmentFromUpload(Horde_Variables $vars, $field)
+    public function addAttachmentFromUpload($field)
     {
         global $browser;
 
-        if ($vars->get($field . '_dataurl')) {
-            $url_data = new Horde_Url_Data($vars->get($field));
-
-            $atc_file = Horde::getTempFile('impatt');
-            file_put_contents($atc_file, $url_data->data);
-
-            $bytes = strlen($url_data->data);
-            $filename = $vars->get($field . '_filename');
-            $type = $url_data->type;
-        } else {
-            try {
-                $browser->wasFileUploaded($field, _("attachment"));
-            } catch (Horde_Browser_Exception $e) {
-                throw new IMP_Compose_Exception($e);
-            }
+        try {
+            $browser->wasFileUploaded($field, _("attachment"));
+        } catch (Horde_Browser_Exception $e) {
+            throw new IMP_Compose_Exception($e);
+        }
 
-            $finfo = $_FILES[$field];
+        $finfo = $_FILES[$field];
 
-            $atc_file = $finfo['tmp_name'];
+        $atc_file = $finfo['tmp_name'];
 
-            $bytes = $finfo['size'];
-            $filename = Horde_Util::dispelMagicQuotes($finfo['name']);
+        $bytes = $finfo['size'];
+        $filename = Horde_Util::dispelMagicQuotes($finfo['name']);
 
-            switch (empty($finfo['type']) ? $finfo['type'] : '') {
-            case 'application/unknown':
-            case '':
-                $type = 'application/octet-stream';
-                break;
+        switch (empty($finfo['type']) ? $finfo['type'] : '') {
+        case 'application/unknown':
+        case '':
+            $type = 'application/octet-stream';
+            break;
 
-            default:
-                $type = $finfo['type'];
-                break;
-            }
+        default:
+            $type = $finfo['type'];
+            break;
         }
 
         return $this->_addAttachment(

diff --git a/imp/lib/Minimal/Compose.php b/imp/lib/Minimal/Compose.php
@@ -100,7 +100,7 @@ protected function _init()
             isset($_FILES['upload_1']) &&
             strlen($_FILES['upload_1']['name'])) {
             try {
-                $atc_ob = $imp_compose->addAttachmentFromUpload($this->vars, 'upload_1');
+                $atc_ob = $imp_compose->addAttachmentFromUpload('upload_1');
                 if ($this->vars->a == _("Expand Names")) {
                     $notification->push(sprintf(_("Added \"%s\" as an attachment."), $atc_ob->getPart()->getName()), 'horde.success');
                 }