diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-12-14 00:16:39 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-12-14 00:16:39 +0100 |
commit | 1256e4c645c86f4165d052bf8116b957b373b837 (patch) | |
tree | 3cc3bd960df403a6e0645afcd9e4f5bbb68bfc0e /inc/poche/Routing.class.php | |
parent | 9c55ed0923273da886497cb62302a79622e34a74 (diff) | |
parent | dc69d3e8d895c87f9d26c2d1309e40d6090d4c8d (diff) | |
download | wallabag-1256e4c645c86f4165d052bf8116b957b373b837.tar.gz wallabag-1256e4c645c86f4165d052bf8116b957b373b837.tar.zst wallabag-1256e4c645c86f4165d052bf8116b957b373b837.zip |
Merge branch 'tcitworld-ebook' into dev
Diffstat (limited to 'inc/poche/Routing.class.php')
-rwxr-xr-x | inc/poche/Routing.class.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 6ae93d21..5acd08ba 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php | |||
@@ -120,7 +120,16 @@ class Routing | |||
120 | $this->wallabag->deleteUser($_POST['password4deletinguser']); | 120 | $this->wallabag->deleteUser($_POST['password4deletinguser']); |
121 | } elseif (isset($_GET['epub'])) { | 121 | } elseif (isset($_GET['epub'])) { |
122 | $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']); | 122 | $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']); |
123 | $epub->run(); | 123 | $epub->prepareData(); |
124 | $epub->produceEpub(); | ||
125 | } elseif (isset($_GET['mobi'])) { | ||
126 | $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']); | ||
127 | $mobi->prepareData(); | ||
128 | $mobi->produceMobi(); | ||
129 | } elseif (isset($_GET['pdf'])) { | ||
130 | $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']); | ||
131 | $pdf->prepareData(); | ||
132 | $pdf->producePDF(); | ||
124 | } elseif (isset($_GET['import'])) { | 133 | } elseif (isset($_GET['import'])) { |
125 | $import = $this->wallabag->import(); | 134 | $import = $this->wallabag->import(); |
126 | $tplVars = array_merge($this->vars, $import); | 135 | $tplVars = array_merge($this->vars, $import); |
@@ -148,4 +157,4 @@ class Routing | |||
148 | { | 157 | { |
149 | echo $this->wallabag->tpl->render($file, $vars); | 158 | echo $this->wallabag->tpl->render($file, $vars); |
150 | } | 159 | } |
151 | } \ No newline at end of file | 160 | } |