CS fixes

1 files changed, 132 insertions, 118 deletions

diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index f0ad97d20..85bc36cac 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/attachments.inc                                    |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,62 +21,73 @@
 
 // Upload progress update
 if (!empty($_GET['_progress'])) {
-  $RCMAIL->upload_progress();
+    $RCMAIL->upload_progress();
 }
 
 $COMPOSE_ID = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
 $COMPOSE    = null;
 
 if ($COMPOSE_ID && $_SESSION['compose_data_' . $COMPOSE_ID]) {
-  $SESSION_KEY = 'compose_data_' . $COMPOSE_ID;
-  $COMPOSE =& $_SESSION[$SESSION_KEY];
+    $SESSION_KEY = 'compose_data_' . $COMPOSE_ID;
+    $COMPOSE =& $_SESSION[$SESSION_KEY];
 }
 
 if (!$COMPOSE) {
-  die("Invalid session var!");
+    die("Invalid session var!");
 }
 
 
 // remove an attachment
-if ($RCMAIL->action=='remove-attachment')
-{
-  $id = 'undefined';
-  if (preg_match('/^rcmfile(\w+)$/', $_POST['_file'], $regs))
-    $id = $regs[1];
-  if ($attachment = $COMPOSE['attachments'][$id])
-    $attachment = $RCMAIL->plugins->exec_hook('attachment_delete', $attachment);
-  if ($attachment['status']) {
-    if (is_array($COMPOSE['attachments'][$id])) {
-      $RCMAIL->session->remove($SESSION_KEY.'.attachments.'.$id);
-      $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
+if ($RCMAIL->action=='remove-attachment') {
+    $id = 'undefined';
+
+    if (preg_match('/^rcmfile(\w+)$/', $_POST['_file'], $regs)) {
+        $id = $regs[1];
+    }
+
+    if ($attachment = $COMPOSE['attachments'][$id]) {
+        $attachment = $RCMAIL->plugins->exec_hook('attachment_delete', $attachment);
     }
-  }
 
-  $OUTPUT->send();
-  exit;
+    if ($attachment['status']) {
+        if (is_array($COMPOSE['attachments'][$id])) {
+            $RCMAIL->session->remove($SESSION_KEY.'.attachments.'.$id);
+            $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
+        }
+    }
+
+    $OUTPUT->send();
+    exit;
 }
 
-if ($RCMAIL->action=='display-attachment')
-{
-  $id = 'undefined';
-  if (preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs))
-    $id = $regs[1];
-  if ($attachment = $COMPOSE['attachments'][$id])
-    $attachment = $RCMAIL->plugins->exec_hook('attachment_display', $attachment);
-
-  if ($attachment['status']) {
-    if (empty($attachment['size']))
-      $attachment['size'] = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
-
-    header('Content-Type: ' . $attachment['mimetype']);
-    header('Content-Length: ' . $attachment['size']);
-
-    if ($attachment['data'])
-      echo $attachment['data'];
-    else if ($attachment['path'])
-      readfile($attachment['path']);
-  }
-  exit;
+if ($RCMAIL->action=='display-attachment') {
+    $id = 'undefined';
+
+    if (preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs)) {
+        $id = $regs[1];
+    }
+
+    if ($attachment = $COMPOSE['attachments'][$id]) {
+        $attachment = $RCMAIL->plugins->exec_hook('attachment_display', $attachment);
+    }
+
+    if ($attachment['status']) {
+        if (empty($attachment['size'])) {
+            $attachment['size'] = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
+        }
+
+        header('Content-Type: ' . $attachment['mimetype']);
+        header('Content-Length: ' . $attachment['size']);
+
+        if ($attachment['data']) {
+            echo $attachment['data'];
+        }
+        else if ($attachment['path']) {
+            readfile($attachment['path']);
+        }
+    }
+
+    exit;
 }
 
 /*****  attachment upload action  *****/
@@ -87,91 +98,94 @@ $OUTPUT->reset();
 $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GET);
 
 if (is_array($_FILES['_attachments']['tmp_name'])) {
-  $multiple = count($_FILES['_attachments']['tmp_name']) > 1;
-
-  foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
-    // Process uploaded attachment if there is no error
-    $err = $_FILES['_attachments']['error'][$i];
-
-    if (!$err) {
-      $attachment = array(
-        'path' => $filepath,
-        'size' => $_FILES['_attachments']['size'][$i],
-        'name' => $_FILES['_attachments']['name'][$i],
-        'mimetype' => rcube_mime::file_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
-        'group' => $COMPOSE_ID,
-      );
-
-      $attachment = $RCMAIL->plugins->exec_hook('attachment_upload', $attachment);
+    $multiple = count($_FILES['_attachments']['tmp_name']) > 1;
+
+    foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
+        // Process uploaded attachment if there is no error
+        $err = $_FILES['_attachments']['error'][$i];
+
+        if (!$err) {
+            $attachment = $RCMAIL->plugins->exec_hook('attachment_upload', array(
+                'path' => $filepath,
+                'size' => $_FILES['_attachments']['size'][$i],
+                'name' => $_FILES['_attachments']['name'][$i],
+                'mimetype' => rcube_mime::file_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
+                'group' => $COMPOSE_ID,
+            ));
+        }
+
+        if (!$err && $attachment['status'] && !$attachment['abort']) {
+            $id = $attachment['id'];
+
+            // store new attachment in session
+            unset($attachment['status'], $attachment['abort']);
+            $RCMAIL->session->append($SESSION_KEY.'.attachments', $id, $attachment);
+
+            if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
+                $button = html::img(array(
+                    'src' => $icon,
+                    'alt' => $RCMAIL->gettext('delete')
+                ));
+            }
+            else if ($COMPOSE['textbuttons']) {
+                $button = rcube::Q($RCMAIL->gettext('delete'));
+            }
+            else {
+                $button = '';
+            }
+
+            $content = html::a(array(
+                'href'    => "#delete",
+                'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
+                'title'   => $RCMAIL->gettext('delete'),
+                'class'   => 'delete',
+            ), $button);
+
+            $content .= rcube::Q($attachment['name']);
+
+            $OUTPUT->command('add2attachment_list', "rcmfile$id", array(
+                'html'      => $content,
+                'name'      => $attachment['name'],
+                'mimetype'  => $attachment['mimetype'],
+                'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
+                'complete'  => true), $uploadid);
+        }
+        else {  // upload failed
+            if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+                $msg  = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $size)));
+            }
+            else if ($attachment['error']) {
+                $msg = $attachment['error'];
+            }
+            else {
+                $msg = $RCMAIL->gettext('fileuploaderror');
+            }
+
+            if ($attachment['error'] || $err != UPLOAD_ERR_NO_FILE) {
+                $OUTPUT->command('display_message', $msg, 'error');
+                $OUTPUT->command('remove_from_attachment_list', $uploadid);
+            }
+        }
     }
-
-    if (!$err && $attachment['status'] && !$attachment['abort']) {
-      $id = $attachment['id'];
-
-      // store new attachment in session
-      unset($attachment['status'], $attachment['abort']);
-      $RCMAIL->session->append($SESSION_KEY.'.attachments', $id, $attachment);
-
-      if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
-        $button = html::img(array(
-          'src' => $icon,
-          'alt' => $RCMAIL->gettext('delete')
+}
+else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    // if filesize exceeds post_max_size then $_FILES array is empty,
+    // show filesizeerror instead of fileuploaderror
+    if ($maxsize = ini_get('post_max_size')) {
+        $msg = $RCMAIL->gettext(array(
+            'name' => 'filesizeerror',
+            'vars' => array('size' => $RCMAIL->show_bytes(parse_bytes($maxsize)))
         ));
-      }
-      else if ($COMPOSE['textbuttons']) {
-        $button = rcube::Q($RCMAIL->gettext('delete'));
-      }
-      else {
-        $button = '';
-      }
-
-      $content = html::a(array(
-        'href' => "#delete",
-        'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
-        'title' => $RCMAIL->gettext('delete'),
-        'class' => 'delete',
-      ), $button);
-
-      $content .= rcube::Q($attachment['name']);
-
-      $OUTPUT->command('add2attachment_list', "rcmfile$id", array(
-        'html' => $content,
-        'name' => $attachment['name'],
-        'mimetype' => $attachment['mimetype'],
-        'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
-        'complete' => true), $uploadid);
     }
-    else {  // upload failed
-      if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-        $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
-        $msg  = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $size)));
-      }
-      else if ($attachment['error']) {
-        $msg = $attachment['error'];
-      }
-      else {
+    else {
         $msg = $RCMAIL->gettext('fileuploaderror');
-      }
-
-      if ($attachment['error'] || $err != UPLOAD_ERR_NO_FILE) {
-        $OUTPUT->command('display_message', $msg, 'error');
-        $OUTPUT->command('remove_from_attachment_list', $uploadid);
-      }
     }
-  }
-}
-else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-  // if filesize exceeds post_max_size then $_FILES array is empty,
-  // show filesizeerror instead of fileuploaderror
-  if ($maxsize = ini_get('post_max_size'))
-    $msg = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $RCMAIL->show_bytes(parse_bytes($maxsize)))));
-  else
-    $msg = $RCMAIL->gettext('fileuploaderror');
-  $OUTPUT->command('display_message', $msg, 'error');
-  $OUTPUT->command('remove_from_attachment_list', $uploadid);
+
+    $OUTPUT->command('display_message', $msg, 'error');
+    $OUTPUT->command('remove_from_attachment_list', $uploadid);
 }
 
 // send html page with JS calls as response
 $OUTPUT->command('auto_save_start', false);
 $OUTPUT->send('iframe');
-