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
*/
var $post;
var $spool;
+ var $get;
+
function Banana()
{
$this->_require('NetNNTP');
}
}
- 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 '<p class="error">'._b_('Impossible de contacter le serveur').'</p>';
}
- $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 '<p class="error">'
+ . $group . _b_(' : ce newsgroup n\'existe pas ou vous n\'avez pas l\'autorisation d\'y accéder')
+ . '</p>';
+ }
+ $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();
} 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 {
$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 = '<p class="error">'._b_('Voulez-vous vraiment annuler ce message ?').'</p>'
. '<form action="'
- . htmlentities(makeLink(Array('group' => $group,
- 'artid' => $artid)))
-
. '" method="post"><p>'
+ . htmlentities(makeLink(Array('group' => $group,
+ 'artid' => $artid)))
+ . '" method="post"><p>'
. '<input type="hidden" name="action" value="cancel" />'
. '<input type="submit" value="Annuler !" />'
. '</p></form>';
}
}
- 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;
}
function action_showThread($group, $first)
{
if (!$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews'])) {
- return '<p class="error">'._b_('Impossible charger la liste des messages').'</p>';
+ return '<p class="error">'._b_('Impossible charger la liste des messages de ') . $group . '</p>';
}
if ($first > count($this->spool->overview)) {
function action_showArticle($group, $id, $part)
{
if (!$this->_newSpool($group, $this->profile['display'], $this->profile['lastnews'])) {
- return '<p class="error">'._b_('Impossible charger la liste des messages').'</p>';
+ return '<p class="error">'._b_('Impossible charger la liste des messages de ') . $group . '</p>';
}
if (!$this->_newPost($id)) {
$this->spool->delid($id);
$this->nntp->quit();
redirectInBanana(Array('group' => $group,
- 'first' => $id));
+ 'first' => $id));
} else {
return '<p class="error">'._b_('Impossible d\'annuler le message').'</p>';
}
$cuts = displayshortcuts();
$html = '<h1>'._b_('Nouveau message').'</h1>'.$cuts;
$html .= '<form enctype="multipart/form-data" action="'
- . htmlentities(makeLink(Array('group' => $group)))
- .'" method="post" accept-charset="utf-8">';
+ . htmlentities(makeLink(Array('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 colspan="2"><textarea name="body" cols="74" rows="16">'
. 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><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">';
+ $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" value="Envoyer le message" /></th></tr>';
+ $html .= '<input type="submit" value="Envoyer le message" /></th></tr>';
$html .= '</table></form>';
return $html.$cuts;
}
}
- $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 '<p class="error">'._b_('Impossible charger la liste des messages').'</p>';
}
-
+
$body = preg_replace("/\n\.[ \t\r]*\n/m", "\n..\n", $_POST['body']);
$msg = 'From: ' . $this->profile['name'] . "\n"
. "Newsgroups: ". $to . "\n"
$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 "<p class=\"error\">"._b_('Impossible de poster le message')."</p>".$this->action_showThread($group, $artid);
+ return '<p class="error">' . _b_('Impossible de poster le message') . '</p>'
+ . $this->action_showThread($group, $artid);
}
}
return false;
}
}
+ if (count($this->profile['subscribe']) > 0) {
+ $this->_newGroup(false);
+ }
return true;
}
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);
}
}
}
}
+// vim:set et sw=4 sts=4 ts=4
?>
projects / banana.git / blobdiff