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 <anonymouse@example.com>', '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 <anonymouse@example.com>', '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;
function run($class = 'Banana')
{
global $banana;
+
Banana::_require('misc');
$banana = new $class();
$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'])) {
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') {
}
} else {
-
if (isset($_POST['action']) && $_POST['action']=='cancel') {
$res = $banana->action_cancelArticle($group, $artid);
} else {
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;
+ }
+ $att = $banana->action_getAttachment($group, $artid, $_GET['pj'], $action);
+ if ($att != "") {
+ return $res.$att;
+ }
+ return "";
+ }
+
+ 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']);
$this->nntp->group($group);
$this->_newPost($id);
if ($this->post) {
- $subject = preg_replace("/^re\s*:\s*/i", 'Re: ', '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'];
}
}
$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><td>'._b_('Organisation').'</td><td>'.$this->profile['org'].'</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">';
+ . to_entities($body).($this->profile['sig'] ? "\n\n-- \n".htmlentities($this->profile['sig']) : '').'</textarea></td></tr>';
+ if ($this->can_attach) {
+ $html .= '<tr><th colspan="2">'._b_('Pièce jointe').'</th></tr>';
+ $html .= '<tr><td colspan="2"><input type="hidden" name="MAX_FILE_SIZE" value="'.$this->maxfilesize.'" />';
+ $html .= '<input type="file" name="newpj" size="40"/></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;
$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews']);
$body = preg_replace("/\n\.[ \t\r]*\n/m", "\n..\n", $_POST['body']);
- $msg = 'From: '.headerEncode($this->profile['name'])."\n"
+ $msg = 'From: '.$this->profile['name']."\n"
. "Newsgroups: ".$_POST['newsgroups']."\n"
. "Subject: ".headerEncode($_POST['subject'], 128)."\n"
. (empty($this->profile['org']) ? '' : "Organization: {$this->profile['org']}\n")
$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 '<p class="error">'._b_('Fichier trop gros pour être envoyé : ')
+ .$uploaded['name'].'</p>'.$this->action_showThread($group, $artid);
+
+ case UPLOAD_ERR_PARTIAL:
+ return '<p class="error">'._b_('Erreur lors de l\'upload de ')
+ .$uploaded['name'].'</p>'.$this->action_showThread($group, $artid);
+
+ case UPLOAD_ERR_NO_FILE:
+ return '<p class="error">'._b_('Le fichier spécifié n\'existe pas : ')
+ .$uploaded['name'].'</p>'.$this->action_showThread($group, $artid);
+
+ case UPLOAD_ERR_NO_TMP_DIR:
+ return '<p class="error">'._b_('Une erreur est survenue sur le serveur lors de l\'upload de ')
+ .$uploaded['name'].'</p>'.$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"));
{
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;
+ }
}
?>
projects / banana.git / blobdiff