projects / banana.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ef84d64)
Affichage des erreurs lors de la consultation de piÚces jointes
authorx2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Thu, 2 Mar 2006 16:26:08 +0000 (16:26 +0000)
committerx2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Thu, 2 Mar 2006 16:26:08 +0000 (16:26 +0000)
git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@20 9869982d-c50d-0410-be91-f2a2ec7c7c7b

banana/banana.inc.php.in patch | blob | blame | history
examples/pj.php patch | blob | blame | history

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index e59b1d1..80661eb 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -10,7 +10,6 @@
 class Banana
 {
     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',
@@ -20,6 +19,15 @@ class Banana
     /** 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 posting html messages is allowed
+     */
+    var $can_html    = false;
 
     /** Regexp for selecting newsgroups to show (if empty, match all newsgroups)
      * ex : '^xorg\..*' for xorg.*
@@ -32,13 +40,25 @@ class Banana
 
     var $wrap        = 74;
 
+    /** Boundary for multipart messages
+     */
     var $boundary    = "bananaBoundary42";
+    /** Global headers to use for text/plain messages
+     */
     var $custom      = "Content-Type: text/plain; charset=utf-8\nMime-Version: 1.0\nContent-Transfer-Encoding: 8bit\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\nUser-Agent: Banana @VERSION@\n";
+    /** Body part headers to use from multipart messages
+     */
     var $custom_bd   = "Content-Type: text/plain; charset=utf-8\nContent-Transfert-Encoding: 8bit";
 
+    /** 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());
     
@@ -122,7 +142,11 @@ class Banana
                 if (isset($_GET['action']) && $_GET['action'] == 'view') {
                     $action = true;
                 }
-                return $banana->action_getAttachment($group, $artid, $_GET['pj'], $action);
+                $att = $banana->action_getAttachment($group, $artid, $_GET['pj'], $action);
+                if ($att != "") {
+                    return $res.$att;
+                }
+                return "";
             }
             
             return $res . $banana->action_showArticle($group, $artid, $partid);
diff --git a/examples/pj.php b/examples/pj.php
index 65cef9e..dd55f19 100644 (file)
--- a/examples/pj.php
+++ b/examples/pj.php
@@ -9,6 +9,31 @@
 
 require_once("banana/banana.inc.php");
 $res = Banana::run();
+if ($res != "") {
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta name="description" content="WebForum2/Banana">
+    <link href="css/style.css" type="text/css" rel="stylesheet" media="screen">
+    <link href="css/banana.css" type="text/css" rel="stylesheet" media="screen">
+    <title>
+      Banana, a NNTP<->Web Gateway
+    </title>
+  </head>
+  <body>
+    <div class="bloc">
+<?php echo $res; ?>
+      <div class="foot">
+        <em>Banana</em>, a Web interface for a NNTP Server<br />
+        Developed under GPL License for <a href="http://www.polytechnique.org">Polytechnique.org</a>
+      </div>
+    </div>
+  </body>
+</html>
+<?php
+}
 
 ?>
 
Banana