var $maxspool = 3000;
var $hdecode = array('from','name','organization','subject');
- var $parse_hdr = array('content-transfer-encoding', 'content-type', 'date', 'followup-to', 'from',
+ var $parse_hdr = array('content-disposition', 'content-transfer-encoding', 'content-type', 'date', 'followup-to', 'from',
'message-id', 'newsgroups', 'organization', 'references', 'subject', 'x-face');
var $show_hdr = array('from', 'subject', 'newsgroups', 'followup', 'date', 'organization', 'references', 'x-face');
var $wrap = 74;
+ var $boundary = "bananaBoundary42";
var $custom = "Content-Type: text/plain; charset=utf-8\nMime-Version: 1.0\nContent-Transfer-Encoding: 8bit\nUser-Agent: Banana @VERSION@\n";
+ var $custom_mp = "Content-Type: multipart/mixed; boundary=\"bananaBoundary42\"\nContent-Transfer-Encoding: 7bit\nUser-Agent: Banana @VERSION@\n";
+ var $custom_bd = "Content-Type: text/plain; charset=utf-8\nContent-Transfert-Encoding: 8bit";
var $host = 'news://localhost:119/';
$group = empty($_GET['group']) ? null : strtolower($_GET['group']);
$artid = empty($_GET['artid']) ? null : strtolower($_GET['artid']);
+ $partid = empty($_GET['part']) ? 0 : $_GET['part'];
$banana->state = Array ('group' => $group, 'artid' => $artid);
if (is_null($group)) {
return $banana->action_listGroups();
} elseif (is_null($artid)) {
-
if (isset($_POST['action']) && $_POST['action'] == 'new') {
return $banana->action_doFup($group, isset($_POST['artid']) ? intval($_POST['artid']) : -1);
} elseif (isset($_GET['action']) && $_GET['action'] == 'new') {
if (isset($_GET['action'])) {
switch ($_GET['action']) {
case 'cancel':
- $res .= $banana->action_showArticle($group, $artid);
+ $res .= $banana->action_showArticle($group, $artid, $partid);
if ($banana->post->checkcancel()) {
$form = '<p class="error">'._b_('Voulez-vous vraiment annuler ce message ?').'</p>'
. "<form action=\"?group=$group&artid=$artid\" method='post'><p>"
return $banana->action_newFup($group, $artid);
}
}
- return $res . $banana->action_showArticle($group, $artid);
+
+ if (isset($_GET['pj'])) {
+ $action = false;
+ if (isset($_GET['action']) && $_GET['action'] == 'view') {
+ $action = true;
+ }
+ return $banana->action_getAttachment($group, $artid, $_GET['pj'], $action);
+ }
+
+ return $res . $banana->action_showArticle($group, $artid, $partid);
}
}
return $res.$cuts;
}
- function action_showArticle($group, $id)
+ function action_showArticle($group, $id, $part)
{
$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews']);
$this->_newPost($id);
$cuts = displayshortcuts();
$res = '<h1>'._b_('Message').'</h1>'.$cuts;
- $res .= $this->post->to_html();
+ $res .= $this->post->to_html($part);
$this->nntp->quit();
return $res.$cuts;
}
+ function action_getAttachment($group, $id, $pjid, $action)
+ {
+ $this->_newSpool($group, $this->profile['display'], $this->profile['lastnews']);
+ $this->_newPost($id);
+ if (!$this->post) {
+ if ($this->nntp->lasterrorcode == "423") {
+ $this->spool->delid($id);
+ }
+ $this->nntp->quit();
+ return displayshortcuts().'<p class="error">'._b_('Impossible d\'accéder au message. Le message a peut-être été annulé').'</p>';
+ }
+
+ $this->nntp->quit();
+ if ($this->post->get_attachment($pjid, $action)) {
+ return "";
+ } else {
+ return displayshortcuts().'<p calss="error">'._b_('Impossible d\'accéder à la pièce jointe.').'</p>';
+ }
+ }
+
function action_cancelArticle($group, $id)
{
$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews']);
$cuts = displayshortcuts();
$html = '<h1>'._b_('Nouveau message').'</h1>'.$cuts;
- $html .= '<form action="?group='.$group.'" method="post" accept-charset="utf-8">';
+ $html .= '<form enctype="multipart/form-data" action="?group='.$group.'" method="post" accept-charset="utf-8">';
$html .= '<table class="bicol" cellpadding="0" cellspacing="0">';
$html .= '<tr><th colspan="2">'._b_('En-têtes').'</th></tr>';
$html .= '<tr><td>'._b_('Nom').'</td><td>'.htmlentities($this->profile['name']).'</td></tr>';
$html .= '<tr><th colspan="2">'._b_('Corps').'</th></tr>';
$html .= '<tr><td colspan="2"><textarea name="body" cols="74" rows="16">'
.to_entities($body).($this->profile['sig'] ? "\n\n-- \n".htmlentities($this->profile['sig']) : '').'</textarea></td></th>';
- $html .= '<tr><td colspan="2">';
+ $html .= '<tr><th colspan="2">'._b_('Pièces jointes').'</th></tr>';
+ $html .= '<tr><td colspan="2"><input type="hidden" name="MAX_FILE_SIZE" value="100000" />';
+ $html .= '<input type="file" name="newpj" /></td></tr>';
+ $html .= '<tr><th colspan="2">';
if ($id > 0) {
$html .= '<input type="hidden" name="artid" value="'.$id.'" />';
}
$html .= '<input type="hidden" name="action" value="new" />';
- $html .= '<input type="submit" /></td></tr>';
+ $html .= '<input type="submit" /></th></tr>';
$html .= '</table></form>';
return $html.$cuts;
$msg .= "References: $refs{$post->headers['message-id']}\n";
}
- $msg .= $this->custom.$this->profile['customhdr']."\n".wrap($body, "", $this->wrap);
+ $body = wrap($body, "", $this->wrap);
+
+ // include attachment in the body
+ if (isset($_FILES['newpj'])) {
+ $this->custom = $this->custom_mp;
+ $body = "\n--".$this->boundary."\n".$this->custom_bd."\n\n".$body."\n--".$this->boundary."\n";
+ $tmpname = $_FILES['newpj']['tmp_name'];
+ $file = basename($_FILES['newpj']['name']);
+ $mime = shell_exec("file -bi $tmpname"); //Because mime_content_type don't work :(
+ if (preg_match("@([^ ]+/[^ ]+); (.*)@", $mime, $format)) {
+ $mime = $format[1];
+ $encod = $format[2];
+ } else {
+ preg_match("@([^ ]+/[^ ]+)\r?\n@", $mime, $format);
+ $mime = $format[1];
+ $encod = 'base64';
+ }
+
+ $body .= 'Content-Type: '.$mime.'; name="'.$file."\"\n";
+ $body .= 'Content-Disposition: attachment; filename="'.$file."\"\n";
+ $body .= 'Content-Transfer-Encoding: '.$encod."\n\n";
+ if ($encod == 'base64') {
+ $body .= chunk_split(base64_encode(fread(fopen($tmpname, 'r'), filesize($tmpname))));
+ } else {
+ $body .= fread(fopen($tmpname, 'r'), filesize($tmpname));
+ }
+ $body .= '--'.$this->boundary.'--';
+ }
+
+ // finalise and post the message
+ $msg .= $this->custom.$this->profile['customhdr']."\n".$body;
if ($this->nntp->post($msg)) {
header("Location: ?group=$group".($artid==-1 ? '' : "&first=$artid"));
projects / banana.git / blobdiff