X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fbanana.inc.php.in;h=cdf43ddff1ea21c25790473160319e17bb3587c0;hb=b2f7dc0b7a22a1d568ab2dfced0113da88e3f7dc;hp=1ee96092b4df1cde2c03dcf3f4937cf5614252ba;hpb=5440bf7474fe35f9a83613b3e98da9b8922c9e4a;p=banana.git diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index 1ee9609..cdf43dd 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -14,7 +14,7 @@ class Banana 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', 'newsgroups', 'followup', 'date', 'organization', 'references', 'x-face'); /** Favorites MIMEtypes to use, by order for reading multipart messages */ @@ -82,6 +82,8 @@ class Banana var $post; var $spool; + var $get; + function Banana() { $this->_require('NetNNTP'); @@ -92,26 +94,43 @@ 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').'

'; } - $group = empty($_GET['group']) ? null : strtolower($_GET['group']); - $artid = empty($_GET['artid']) ? null : strtolower($_GET['artid']); - $partid = !isset($_GET['part']) ? -1 : $_GET['part']; + $group = empty($banana->get['group']) ? null : $banana->get['group']; + if (!is_null($group) + && isset($banana->grp_pattern) && !preg_match('/' . $banana->grp_pattern . '/', $group)) { + return '

' + . $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']; $banana->state = Array ('group' => $group, 'artid' => $artid); if (is_null($group)) { - if (isset($_GET['subscribe'])) { + if (isset($banana->get['subscribe'])) { return $banana->action_listSubs(); - } elseif (isset($_POST['subscribe'])) { + } elseif (isset($_POST['validsubs'])) { $banana->action_saveSubs(); } return $banana->action_listGroups(); @@ -119,10 +138,10 @@ class Banana } 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') { + } elseif (isset($banana->get['action']) && $banana->get['action'] == 'new') { return $banana->action_newFup($group); } else { - return $banana->action_showThread($group, isset($_GET['first']) ? intval($_GET['first']) : 1); + return $banana->action_showThread($group, isset($banana->get['first']) ? intval($banana->get['first']) : 1); } } else { @@ -132,16 +151,16 @@ class Banana $res = ''; } - if (isset($_GET['action'])) { - switch ($_GET['action']) { + if (isset($banana->get['action'])) { + switch ($banana->get['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">

' . '' . '' . '

'; @@ -154,12 +173,12 @@ class Banana } } - if (isset($_GET['pj'])) { + if (isset($banana->get['pj'])) { $action = false; - if (isset($_GET['action']) && $_GET['action'] == 'view') { + if (isset($banana->get['action']) && $banana->get['action'] == 'view') { $action = true; } - $att = $banana->action_getAttachment($group, $artid, $_GET['pj'], $action); + $att = $banana->action_getAttachment($group, $artid, $banana->get['pj'], $action); if ($att != "") { return $res.$att; } @@ -209,7 +228,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)) { @@ -231,7 +250,7 @@ class Banana 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)) { @@ -298,7 +317,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').'

'; } @@ -323,8 +342,8 @@ class Banana $cuts = displayshortcuts(); $html = '

'._b_('Nouveau message').'

'.$cuts; $html .= '
'; + . htmlentities(makeLink(Array('group' => $group))) + .'" method="post" accept-charset="utf-8">'; $html .= ''; $html .= ''; $html .= ''; @@ -336,16 +355,16 @@ class Banana $html .= ''; if ($this->can_attach) { - $html .= ''; + $html .= ''; $html .= ''; } - $html .= ''; + $html .= ''; $html .= '
'._b_('En-têtes').'
'._b_('Nom').''.htmlentities($this->profile['name']).'
'._b_('Pièce jointe').'
'._b_('Pièce jointe').'
'; $html .= '
'; + $html .= '
'; if ($id > 0) { $html .= ''; } $html .= ''; - $html .= '
'; return $html.$cuts; @@ -361,19 +380,19 @@ class Banana } } - $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 +450,14 @@ 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') . '

' + . $this->action_showThread($group, $artid); } } @@ -454,6 +474,9 @@ class Banana return false; } } + if (count($this->profile['subscribe']) > 0) { + $this->_newGroup(false); + } return true; } @@ -468,11 +491,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 +548,5 @@ class Banana } } +// vim:set et sw=4 sts=4 ts=4 ?>