protected $view;
protected $action;
protected $id;
+ protected $autoclose;
protected $url;
protected $file;
protected $defaultVars = array();
$this->view = Tools::checkVar('view', 'home');
$this->action = Tools::checkVar('action');
$this->id = Tools::checkVar('id');
+ $this->autoclose = Tools::checkVar('autoclose',FALSE);
$_SESSION['sort'] = Tools::checkVar('sort', 'id');
$this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
}
$tplVars = array();
if (\Session::isLogged()) {
- $this->wallabag->action($this->action, $this->url, $this->id);
+ $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
$tplFile = Tools::getTplFile($this->view);
$tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
+ } elseif(ALLOW_REGISTER && isset($_GET['registerform'])) {
+ Tools::logm('register');
+ $tplFile = Tools::getTplFile('register');
+ } elseif (ALLOW_REGISTER && isset($_GET['register'])){
+ $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
+ Tools::redirect();
} elseif(isset($_SERVER['PHP_AUTH_USER'])) {
if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
$this->wallabag->login($this->referer);
$this->wallabag->login($this->referer);
} elseif (isset($_GET['feed']) && isset($_GET['user_id'])) {
$tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
- $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']);
+ $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
+ $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
}
//allowed ONLY to logged in user
// update password
$this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
} elseif (isset($_GET['newuser'])) {
- $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+ $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true);
} elseif (isset($_GET['deluser'])) {
$this->wallabag->deleteUser($_POST['password4deletinguser']);
} elseif (isset($_GET['epub'])) {
- $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']);
- $epub->run();
+ $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']);
+ $epub->prepareData();
+ $epub->produceEpub();
+ } elseif (isset($_GET['mobi'])) {
+ $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']);
+ $mobi->prepareData();
+ $mobi->produceMobi();
+ } elseif (isset($_GET['pdf'])) {
+ $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']);
+ $pdf->prepareData();
+ $pdf->producePDF();
} elseif (isset($_GET['import'])) {
$import = $this->wallabag->import();
$tplVars = array_merge($this->vars, $import);
- } elseif (isset($_GET['download'])) {
- Tools::downloadDb();
} elseif (isset($_GET['empty-cache'])) {
Tools::emptyCache();
} elseif (isset($_GET['export'])) {
{
echo $this->wallabag->tpl->render($file, $vars);
}
-}
\ No newline at end of file
+}