X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fbanana.inc.php.in;h=ab4e6da386e8e534ade5e994d222a565275da5fb;hb=218e9ec8a45fa38c2265814fa2bae09d88f81730;hp=8cd704f2f67bd6dda1de2f7810e5b50fde61e2c9;hpb=c42efe2f093bae5e429288c6a39df6ff9357a88f;p=banana.git diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index 8cd704f..ab4e6da 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -9,28 +9,73 @@ class Banana { - var $maxspool = 3000; + var $maxspool = 3000; - var $hdecode = array('from','name','organization','subject'); - var $parse_hdr = array('content-transfer-encoding', 'content-type', 'date', 'followup-to', 'from', + var $hdecode = array('from','name','organization','subject'); + 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 $show_hdr = array('from', 'subject', 'newsgroups', 'followup', 'date', 'organization', 'references', 'x-face'); + + /** Favorites MIMEtypes to use, by order for reading multipart messages + */ + var $body_mime = array('text/plain', 'text/html', 'text/richtext'); + /** Indicate wether posting attachment is allowed + */ + var $can_attach = true; + /** Maximum allowed file size for attachment + */ + var $maxfilesize = 100000; + /** Indicate wether x-face should be skinned as specials data or not + */ + var $formatxface = true; + + /** Regexp for selecting newsgroups to show (if empty, match all newsgroups) + * ex : '^xorg\..*' for xorg.* + */ + var $grp_pattern; + + var $tbefore = 5; + var $tafter = 5; + var $tmax = 50; + + var $wrap = 74; + /** Match an url + * Should be included in a regexp delimited using ! (eg: "!$url_regexp!i") + * If it matches, return 3 main parts : + * \\1 and \\3 are delimiters + * \\2 is the url + * + * eg : preg_match("!$url_regexp!i", "[http://www.polytechnique.org]", $matches); + * $matches[1] = "[" + * $matches[2] = "http://www.polytechnique.org" + * $matches[3] = "]" + */ + var $url_regexp = '(["\[])?((?:https?|ftp|news)://(?:&|[a-z@0-9.~%$£µ&i#\-+=_/\?])*)(["\]])?'; - - var $tbefore = 5; - var $tafter = 5; - var $tmax = 50; - - var $wrap = 74; - - var $custom = "Content-Type: text/plain; charset=utf-8\nMime-Version: 1.0\nContent-Transfer-Encoding: 8bit\nUser-Agent: Banana @VERSION@\n"; - - var $host = 'news://localhost:119/'; - - var $profile = Array( 'name' => 'Anonymous ', 'sig' => '', 'org' => '', + + /** Boundary for multipart messages + */ + var $boundary = 'bananaBoundary42'; + /** Global headers to use for messages + */ + var $custom = "Mime-Version: 1.0\nUser-Agent: Banana @VERSION@\n"; + /** Global headers to use from multipart messages + */ + var $custom_mp = "Content-Type: multipart/mixed; boundary=\"bananaBoundary42\"\nContent-Transfer-Encoding: 7bit\n"; + /** Body type when using plain text + */ + var $custom_plain= "Content-Type: text/plain; charset=utf-8\nContent-Transfert-Encoding: 8bit\n"; + + /** News serveur to use + */ + var $host = 'news://localhost:119/'; + + /** User profile + */ + var $profile = Array( 'name' => 'Anonymous ', 'sig' => '', 'org' => '', 'customhdr' =>'', 'display' => 0, 'lastnews' => 0, 'locale' => 'fr_FR', 'subscribe' => array()); - var $state = Array('group' => null, 'artid' => null); + var $state = Array('group' => null, 'artid' => null); var $nntp; var $groups; var $newgroups; @@ -47,6 +92,7 @@ class Banana function run($class = 'Banana') { global $banana; + Banana::_require('misc'); $banana = new $class(); @@ -56,10 +102,10 @@ class Banana $group = empty($_GET['group']) ? null : strtolower($_GET['group']); $artid = empty($_GET['artid']) ? null : strtolower($_GET['artid']); + $partid = !isset($_GET['part']) ? -1 : $_GET['part']; $banana->state = Array ('group' => $group, 'artid' => $artid); if (is_null($group)) { - if (isset($_GET['subscribe'])) { return $banana->action_listSubs(); } elseif (isset($_POST['subscribe'])) { @@ -68,7 +114,6 @@ class Banana 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') { @@ -78,7 +123,6 @@ class Banana } } else { - if (isset($_POST['action']) && $_POST['action']=='cancel') { $res = $banana->action_cancelArticle($group, $artid); } else { @@ -88,7 +132,7 @@ class Banana 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 = '

'._b_('Voulez-vous vraiment annuler ce message ?').'

' . "

" @@ -103,7 +147,20 @@ class Banana 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; + } + $att = $banana->action_getAttachment($group, $artid, $_GET['pj'], $action); + if ($att != "") { + return $res.$att; + } + return ""; + } + + return $res . $banana->action_showArticle($group, $artid, $partid); } } @@ -163,7 +220,7 @@ class Banana 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); @@ -177,13 +234,33 @@ class Banana $cuts = displayshortcuts(); $res = '

'._b_('Message').'

'.$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().'

'._b_('Impossible d\'accéder au message. Le message a peut-être été annulé').'

'; + } + + $this->nntp->quit(); + if ($this->post->get_attachment($pjid, $action)) { + return ""; + } else { + return displayshortcuts().'

'._b_('Impossible d\'accéder à la pièce jointe.').'

'; + } + } + function action_cancelArticle($group, $id) { $this->_newSpool($group, $this->profile['display'], $this->profile['lastnews']); @@ -218,8 +295,8 @@ class Banana $this->nntp->group($group); $this->_newPost($id); if ($this->post) { - $subject = preg_replace("/^re\s*:\s*/i", 'Re: ', $this->post->headers['subject']); - $body = utf8_encode($this->post->name." "._b_("a écrit"))." :\n".wrap($this->post->body, "> "); + $subject = preg_replace("/^re\s*:\s*/i", '', 'Re: '.$this->post->headers['subject']); + $body = utf8_encode($this->post->name." "._b_("a écrit"))." :\n".wrap($this->post->get_body(), "> "); $target = isset($this->post->headers['followup-to']) ? $this->post->headers['followup-to'] : $this->post->headers['newsgroups']; } } @@ -228,7 +305,7 @@ class Banana $cuts = displayshortcuts(); $html = '

'._b_('Nouveau message').'

'.$cuts; - $html .= ''; + $html .= ''; $html .= ''; $html .= ''; $html .= ''; @@ -238,13 +315,18 @@ class Banana $html .= ''; $html .= ''; $html .= ''; - $html .= ''; + if ($this->can_attach) { + $html .= ''; + $html .= ''; + } + $html .= ''; + $html .= ''; $html .= '
'._b_('En-têtes').'
'._b_('Nom').''.htmlentities($this->profile['name']).'
'._b_('Organisation').''.$this->profile['org'].'
'._b_('Corps').'
'; + . to_entities($body).($this->profile['sig'] ? "\n\n-- \n".htmlentities($this->profile['sig']) : '').'
'._b_('Pièce jointe').'
'; + $html .= '
'; if ($id > 0) { $html .= ''; } $html .= ''; - $html .= '
'; return $html.$cuts; @@ -264,7 +346,7 @@ class Banana $body = preg_replace("/\n\.[ \t\r]*\n/m", "\n..\n", $_POST['body']); $msg = 'From: '.$this->profile['name']."\n" . "Newsgroups: ".$_POST['newsgroups']."\n" - . "Subject: ".$_POST['subject']."\n" + . "Subject: ".headerEncode($_POST['subject'], 128)."\n" . (empty($this->profile['org']) ? '' : "Organization: {$this->profile['org']}\n") . (empty($_POST['followup']) ? '' : 'Followup-To: '.$_POST['followup']."\n"); @@ -275,7 +357,44 @@ class Banana $msg .= "References: $refs{$post->headers['message-id']}\n"; } - $msg .= $this->custom.$this->profile['customhdr']."\n".wrap($body, "", $this->wrap); + $body_headers = $this->custom_plain; + $body = wrap($body, ""); + + // include attachment in the body + $uploaded = $this->_upload('newpj'); + switch ($uploaded['error']) { + case UPLOAD_ERR_OK: + $this->custom = $this->custom_mp.$this->custom; + $body = $this->_make_part($body_headers, $body); + $file_head = 'Content-Type: '.$uploaded['type'].'; name="'.$uploaded['name']."\"\n" + . 'Content-Transfer-Encoding: '.$uploaded['encoding']."\n" + . 'Content-Disposition: attachment; filename="'.$uploaded['name']."\"\n"; + $body .= $this->_make_part($file_head, $uploaded['data']); + $body .= "\n--".$this->boundary.'--'; + break; + + case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_FORM_SIZE: + return '

'._b_('Fichier trop gros pour être envoyé : ') + .$uploaded['name'].'

'.$this->action_showThread($group, $artid); + + case UPLOAD_ERR_PARTIAL: + return '

'._b_('Erreur lors de l\'upload de ') + .$uploaded['name'].'

'.$this->action_showThread($group, $artid); + + case UPLOAD_ERR_NO_FILE: + return '

'._b_('Le fichier spécifié n\'existe pas : ') + .$uploaded['name'].'

'.$this->action_showThread($group, $artid); + + case UPLOAD_ERR_NO_TMP_DIR: + return '

'._b_('Une erreur est survenue sur le serveur lors de l\'upload de ') + .$uploaded['name'].'

'.$this->action_showThread($group, $artid); + + default: + $this->custom = $body_headers.$this->custom; + } + + // 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")); @@ -314,6 +433,48 @@ class Banana { require_once (dirname(__FILE__).'/'.$file.'.inc.php'); } + + function _upload($file) + { + if ($_FILES[$file]['name'] == "") { + return Array( 'error' => -1 ); + } + + // upload + $_FILES[$file]['tmp_name']; + + // test if upload is ok + $file = $_FILES[$file]; + if ($file['size'] == 0 || $file['error'] != 0) { + if ($file['error'] == 0) { + $file['error'] = -1; + } + return $file; + } + + // adding custum data + $mime = rtrim(shell_exec('file -bi '.$file['tmp_name'])); //Because mime_content_type don't work :( + $encod = 'base64'; + if (preg_match("@([^ ]+/[^ ]+); (.*)@", $mime, $format)) { + $mime = $format[1]; + $encod = $format[2]; + } + $data = fread(fopen($file['tmp_name'], 'r'), $file['size']); + if ($encod == 'base64') { + $data = chunk_split(base64_encode($data)); + } + $file['name'] = basename($file['name']); + $file['type'] = $mime; + $file['encoding'] = $encod; + $file['data'] = $data; + + return $file; + } + + function _make_part($headers, $body) + { + return "\n--".$this->boundary."\n".$headers."\n".$body; + } } ?>