X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fbanana.inc.php.in;h=25ac4c55e357a471246ef4da5ad1c891124106fa;hb=2c83968519961e5eda94d55fc43feaff3f88a170;hp=1ee96092b4df1cde2c03dcf3f4937cf5614252ba;hpb=5440bf7474fe35f9a83613b3e98da9b8922c9e4a;p=banana.git diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index 1ee9609..25ac4c5 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -12,9 +12,12 @@ class Banana var $maxspool = 3000; 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 $parse_hdr = array('content-disposition', 'content-transfer-encoding', + 'content-type', 'content-id', 'date', 'followup-to', + 'from', 'message-id', 'newsgroups', 'organization', + 'references', 'subject', 'x-face'); + var $show_hdr = array('from', 'newsgroups', 'followup', 'date', + 'organization', 'references', 'x-face'); /** Favorites MIMEtypes to use, by order for reading multipart messages */ @@ -50,7 +53,7 @@ class Banana * $matches[2] = "http://www.polytechnique.org" * $matches[3] = "]" */ - var $url_regexp = '(["\[])?((?:https?|ftp|news)://(?:&|,?[a-z@0-9.~%$£µ&i#\-+=_/\?])*)(["\]])?'; + var $url_regexp = '(["\[])?((?:https?|ftp|news)://(?:&|,*[a-z@0-9.~%$£µ&i#\-+=_/\?])*)(["\]])?'; /** Boundary for multipart messages @@ -75,13 +78,15 @@ class Banana 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, 'action' => null); var $nntp; var $groups; var $newgroups; var $post; var $spool; + var $get; + function Banana() { $this->_require('NetNNTP'); @@ -92,37 +97,60 @@ class Banana } } - function run($class = 'Banana') + /** Run Banana + * @param STRING class Name of the class to use + * @param ARRAY myget If defined is used instead of get + */ + function run($class = 'Banana', $myget = null) { global $banana; Banana::_require('misc'); $banana = new $class(); + if (is_null($myget)) { + $banana->get = $_GET; + } else { + $banana->get = $myget; + } + if (!$banana->nntp) { - return '

'._b_('Impossible de contacter le serveur').'

'; + $banana->state['page'] = 'error'; + return makeTable('

'._b_('Impossible de contacter le serveur').'

'); } - $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); + $group = empty($banana->get['group']) ? null : $banana->get['group']; + if (!is_null($group) + && isset($banana->grp_pattern) && !preg_match('/' . $banana->grp_pattern . '/', $group)) { + $banana->state['page'] = 'error'; + return makeTable('

' + . $group . _b_(' : ce newsgroup n\'existe pas ou vous n\'avez pas l\'autorisation d\'y accéder') + . '

'); + } + $artid = empty($banana->get['artid']) ? null : strtolower($banana->get['artid']); + $partid = !isset($banana->get['part']) ? -1 : $banana->get['part']; + $action = !isset($banana->get['action']) ? null : $banana->get['action']; + $banana->state = Array ('group' => $group, 'artid' => $artid, 'action' => $action); if (is_null($group)) { - if (isset($_GET['subscribe'])) { - return $banana->action_listSubs(); - } elseif (isset($_POST['subscribe'])) { + if (isset($banana->get['subscribe'])) { + $banana->state['page'] = 'subscribe'; + return makeTable($banana->action_listSubs()); + } elseif (isset($_POST['validsubs'])) { $banana->action_saveSubs(); } - return $banana->action_listGroups(); + $banana->state['page'] = 'forums'; + return makeTable($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') { - return $banana->action_newFup($group); + return makeTable($banana->action_doFup($group, isset($_POST['artid']) ? intval($_POST['artid']) : -1)); + } elseif ($action == 'new') { + $banana->state['page'] = 'action'; + return makeTable($banana->action_newFup($group)); } else { - return $banana->action_showThread($group, isset($_GET['first']) ? intval($_GET['first']) : 1); + $banana->state['page'] = 'group'; + return makeTable($banana->action_showThread($group, isset($banana->get['first']) ? intval($banana->get['first']) : 1)); } } else { @@ -132,41 +160,40 @@ class Banana $res = ''; } - if (isset($_GET['action'])) { - switch ($_GET['action']) { + if (!is_null($action)) { + $banana->state['page'] = 'action'; + switch ($action) { case 'cancel': $res .= $banana->action_showArticle($group, $artid, $partid); if ($banana->post->checkcancel()) { $form = '

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

' . '

' + . htmlentities(makeLink(Array('group' => $group, + 'artid' => $artid))) + . '" method="post">

' . '' . '' . '

'; - return $form.$res; + return makeTable($form . $res); } - return $res; + return makeTable("" . $res); case 'new': - return $banana->action_newFup($group, $artid); + return makeTable($banana->action_newFup($group, $artid)); } } - if (isset($_GET['pj'])) { - $action = false; - if (isset($_GET['action']) && $_GET['action'] == 'view') { - $action = true; + if (isset($banana->get['pj'])) { + $view = false; + if ($action == 'view') { + $view = true; } - $att = $banana->action_getAttachment($group, $artid, $_GET['pj'], $action); - if ($att != "") { - return $res.$att; - } - return ""; + $att = $banana->action_getAttachment($group, $artid, $banana->get['pj'], $view); + return makeTable($res . $att); } - return $res . $banana->action_showArticle($group, $artid, $partid); + $banana->state['page'] = 'message'; + return makeTable($banana->action_showArticle($group, $artid, $partid)); } } @@ -183,15 +210,14 @@ class Banana { $this->_newGroup(); - $cuts = displayshortcuts(); - $res = '

'._b_('Les forums de Banana').'

'.$cuts.$this->groups->to_html(); + $res = $this->groups->to_html(); if (count($this->newgroups->overview)) { $res .= '

'._b_('Les forums suivants ont été créés depuis ton dernier passage :').'

'; $res .= $this->newgroups->to_html(); } $this->nntp->quit(); - return $res.$cuts; + return $res; } function action_listSubs() @@ -199,8 +225,7 @@ class Banana $this->_require('groups'); $this->groups = new BananaGroups(BANANA_GROUP_ALL); - $cuts = displayshortcuts(); - $res = '

'._b_('Abonnements').'

'.$cuts.$this->groups->to_html(true).$cuts; + $res = $this->groups->to_html(true); $this->nntp->quit(); return $res; @@ -209,7 +234,7 @@ class Banana function action_showThread($group, $first) { if (!$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews'])) { - return '

'._b_('Impossible charger la liste des messages').'

'; + return '

'._b_('Impossible charger la liste des messages de ') . $group . '

'; } if ($first > count($this->spool->overview)) { @@ -217,21 +242,19 @@ class Banana } $first = $first - ($first % $this->tmax) + 1; - - $cuts = displayshortcuts($first); - $res = '

'.$group.'

'.$cuts; - $res .= $this->spool->to_html($first, $first+$this->tmax); + $pages = displayPages($first); + $res = $pages . $this->spool->to_html($first, $first+$this->tmax) . $pages; $this->nntp->quit(); - return $res.$cuts; + return $res; } function action_showArticle($group, $id, $part) { if (!$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews'])) { - return '

'._b_('Impossible charger la liste des messages').'

'; + return '

'._b_('Impossible charger la liste des messages de ') . $group . '

'; } if (!$this->_newPost($id)) { @@ -239,16 +262,14 @@ class Banana $this->spool->delid($id); } $this->nntp->quit(); - return displayshortcuts().'

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

'; + return '

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

'; } - $cuts = displayshortcuts(); - $res = '

'._b_('Message').'

'.$cuts; - $res .= $this->post->to_html($part); + $res = $this->post->to_html($part); $this->nntp->quit(); - return $res.$cuts; + return $res; } function action_getAttachment($group, $id, $pjid, $action) @@ -262,14 +283,14 @@ class Banana $this->spool->delid($id); } $this->nntp->quit(); - return displayshortcuts().'

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

'; + return '

'._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.').'

'; + return '

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

'; } } @@ -298,7 +319,7 @@ class Banana $this->spool->delid($id); $this->nntp->quit(); redirectInBanana(Array('group' => $group, - 'first' => $id)); + 'first' => $id)); } else { return '

'._b_('Impossible d\'annuler le message').'

'; } @@ -309,71 +330,92 @@ class Banana $subject = $body = ''; $target = $group; - if ($id > 0) { + if (@$_POST['action'] == 'new') { + $subject = $_POST['subject']; + $body = $_POST['body']; + $target = $_POST['newsgroups']; + $followup = $_POST['followup']; + $this->state['page'] = 'action'; + $this->state['group'] = $group; + $this->state['action'] = 'new'; + if ($id != -1) { + $this->state['artid'] = $id; + } + } elseif ($id > 0) { $this->nntp->group($group); if ($this->_newPost($id)) { - $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']; + $subject = 'Re: ' . preg_replace("/^re\s*:\s*/i", '', $this->post->headers['subject']); + $body = to_entities(utf8_encode($this->post->name." "._b_("a écrit"))." :\n" + . wrap($this->post->get_body(), "> ") + . ($this->profile['sig'] ? "\n\n-- \n". $this->profile['sig'] : '')); + $target = isset($this->post->headers['followup-to']) ? + $this->post->headers['followup-to'] : $this->post->headers['newsgroups']; + $followup = null; } + } else { + $targe = $group; + $subject = $followup = null; + $body = $this->profile['sig'] ? "\n\n-- \n". $this->profile['sig'] : ''; } $this->nntp->quit(); - $cuts = displayshortcuts(); - $html = '

'._b_('Nouveau message').'

'.$cuts; - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html = '' + . '
'._b_('En-têtes').'
'._b_('Nom').''.htmlentities($this->profile['name']).'
'._b_('Sujet').'
'._b_('Forums').'
'._b_('Suivi à').'
'._b_('Organisation').''.$this->profile['org'].'
'._b_('Corps').'
' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . '' + . ''; if ($this->can_attach) { - $html .= ''; - $html .= ''; + $html .= '' + . ''; } - $html .= ''; - $html .= '
' . _b_('En-têtes') . '
' . _b_('Nom') . '' . htmlentities($this->profile['name']) . '
' . _b_('Sujet') . '
' . _b_('Forums') . '
' . _b_('Suivi à') . '
' . _b_('Organisation') . '' . $this->profile['org'] . '
' . _b_('Corps') . '
'._b_('Pièce jointe').'
'; - $html .= '
' . _b_('Pièce jointe') . '
' + . '' + . '
'; - if ($id > 0) { - $html .= ''; + $html .= '
'; + if ($id != -1) { + $html .= ''; } - $html .= ''; - $html .= '
'; + $html .= '' + . '' + . ''; - return $html.$cuts; + return $html; } function action_doFup($group, $artid = -1) { - if ( ! ( is_utf8($_POST['subject']) && is_utf8($_POST['name']) - && is_utf8($_POST['org']) && is_utf8($_POST['body']) ) - ) { - foreach(array('subject', 'name', 'org', 'body') as $key) { + if ( ! (is_utf8($_POST['subject']) && is_utf8($_POST['body']))) { + foreach(Array('subject', 'body') as $key) { $_POST[$key] = utf8_encode($_POST[$key]); } } - $forums = preg_split('/\s*(,|;)\s*/', $_POST['newsgroups']); - $fup = $_POST['followup']; - if (sizeof($forums) > 1) { - if (empty($fup)) { - $fup = $forums[0]; - } - } - $to = implode(',', $forums); - + $forums = preg_split('/\s*(,|;)\s*/', $_POST['newsgroups']); + $fup = $_POST['followup']; + if (sizeof($forums) > 1) { + if (empty($fup)) { + $fup = $forums[0]; + } + } + $to = implode(',', $forums); + if (!$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews'])) { return '

'._b_('Impossible charger la liste des messages').'

'; } - + $body = preg_replace("/\n\.[ \t\r]*\n/m", "\n..\n", $_POST['body']); $msg = 'From: ' . $this->profile['name'] . "\n" . "Newsgroups: ". $to . "\n" @@ -431,13 +473,15 @@ class Banana $msg .= $this->custom.$this->profile['customhdr']."\n".$body; if ($this->nntp->post($msg)) { - $dir = Array('group' => $group); - if ($artid != -1) { - $dir['first'] = $artid; - } + $dir = Array('group' => $group); + if ($artid != -1) { + $dir['first'] = $artid; + } redirectInBanana($dir); } else { - return "

"._b_('Impossible de poster le message')."

".$this->action_showThread($group, $artid); + return '

' . _b_('Impossible de poster le message. Le serveur a retourné l\'erreur :') . '

' + . '
' . utf8_encode($this->nntp->lasterrortext) .'
' + . $this->action_newFup($group, $artid); } } @@ -454,6 +498,9 @@ class Banana return false; } } + if (count($this->profile['subscribe']) > 0) { + $this->_newGroup(false); + } return true; } @@ -468,11 +515,11 @@ class Banana return true; } - function _newGroup() + function _newGroup($showNew = true) { $this->_require('groups'); $this->groups = new BananaGroups(BANANA_GROUP_SUB); - if ($this->groups->type == BANANA_GROUP_SUB) { + if ($showNew && $this->groups->type == BANANA_GROUP_SUB) { $this->newgroups = new BananaGroups(BANANA_GROUP_NEW); } } @@ -525,4 +572,5 @@ class Banana } } +// vim:set et sw=4 sts=4 ts=4 ?>