X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fbanana.inc.php.in;h=a1de491a8ec03d4fc5e20dd603be4515b720f18c;hb=4f6a209a2860106ca809828e73c5da9b3401242a;hp=f777787d21e140df06ccdc4ce01ed7147db94e9a;hpb=1f75b1350fd60457b8308230e910d6841766de1d;p=banana.git

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index f777787..a1de491 100644
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -9,28 +9,40 @@
 
 class Banana
 {
-    var $maxspool  = 3000;
+    var $maxspool    = 3000;
+    var $maxfilesize = 100000;
 
-    var $hdecode   = array('from','name','organization','subject');
-    var $parse_hdr = array('content-disposition', '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');
 
-    var $tbefore   = 5;
-    var $tafter    = 5;
-    var $tmax      = 50;
+    /** Regexp for selecting newsgroups to show (if empty, match all newsgroups)
+     * ex : '^xorg\..*' for xorg.*
+     */
+    var $grp_pattern;
 
-    var $wrap      = 74;
+    var $tbefore     = 5;
+    var $tafter      = 5;
+    var $tmax        = 50;
 
-    var $custom    = "Content-Type: text/plain; charset=utf-8\nMime-Version: 1.0\nContent-Transfer-Encoding: 8bit\nUser-Agent: Banana @VERSION@\n";
+    var $wrap        = 74;
 
-    var $host      = 'news://localhost:119/';
+    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 $profile   = Array( 'name' => 'Anonymous <anonymouse@example.com>', 'sig'  => '', 'org'  => '',
+    var $host        = 'news://localhost:119/';
+
+    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;
@@ -56,7 +68,7 @@ class Banana
 
         $group  = empty($_GET['group']) ? null : strtolower($_GET['group']);
         $artid  = empty($_GET['artid']) ? null : strtolower($_GET['artid']);
-        $partid = empty($_GET['part']) ? 0 : $_GET['part'];
+        $partid = !isset($_GET['part']) ? -1 : $_GET['part'];
         $banana->state = Array ('group' => $group, 'artid' => $artid);
 
         if (is_null($group)) {
@@ -69,7 +81,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') {
@@ -249,7 +260,7 @@ class Banana
             $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, "> ");
+                $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'];
             }
         }
@@ -258,7 +269,7 @@ class Banana
 
         $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>';
@@ -268,13 +279,16 @@ class Banana
         $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>';
+    	$html .= '<tr><th colspan="2">'._b_('Pièces jointes').'</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;
@@ -305,7 +319,24 @@ class Banana
             $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
+        $uploaded = $this->_upload('newpj');
+        if ($uploaded['error'] == 0) {
+            $this->custom = $this->custom_mp;
+            $body    = "\n--".$this->boundary."\n".$this->custom_bd."\n\n".$body."\n--".$this->boundary."\n";
+
+            $body   .= 'Content-Type: '.$uploaded['type'].'; name="'.$uploaded['name']."\"\n";
+            $body   .= 'Content-Transfer-Encoding: '.$uploaded['encoding']."\n\n";
+            $body   .= 'Content-Disposition: attachment; filename="'.$uploaded['name']."\"\n";
+            $body   .= $uploaded['data'];
+            $body   .= '--'.$this->boundary.'--';
+        }
+        #TODO:afficher les erreurs lorsque l'upload ne marche pas
+
+        // 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"));
@@ -344,6 +375,43 @@ 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;
+    }
 }
 
 ?>