aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
Diffstat (limited to 'inc/poche')
-rwxr-xr-xinc/poche/Database.class.php175
-rw-r--r--inc/poche/Language.class.php113
-rwxr-xr-xinc/poche/Poche.class.php882
-rwxr-xr-xinc/poche/Routing.class.php153
-rw-r--r--inc/poche/Template.class.php235
-rwxr-xr-xinc/poche/Tools.class.php187
-rw-r--r--inc/poche/Url.class.php2
-rw-r--r--inc/poche/User.class.php11
-rw-r--r--inc/poche/WallabagEpub.class.php137
-rwxr-xr-xinc/poche/config.inc.default.php2
-rwxr-xr-xinc/poche/global.inc.php30
-rw-r--r--inc/poche/pochePictures.php262
12 files changed, 1251 insertions, 938 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 11cccb72..2c80b64b 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -5,17 +5,18 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class Database { 11class Database {
12
12 var $handle; 13 var $handle;
13 private $order = array( 14 private $order = array (
14 'ia' => 'ORDER BY entries.id', 15 'ia' => 'ORDER BY entries.id',
15 'id' => 'ORDER BY entries.id DESC', 16 'id' => 'ORDER BY entries.id DESC',
16 'ta' => 'ORDER BY lower(entries.title)', 17 'ta' => 'ORDER BY lower(entries.title)',
17 'td' => 'ORDER BY lower(entries.title) DESC', 18 'td' => 'ORDER BY lower(entries.title) DESC',
18 'default' => 'ORDER BY entries.id' 19 'default' => 'ORDER BY entries.id'
19 ); 20 );
20 21
21 function __construct() 22 function __construct()
@@ -38,28 +39,17 @@ class Database {
38 } 39 }
39 40
40 $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); 41 $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
42 $this->_checkTags();
41 Tools::logm('storage type ' . STORAGE); 43 Tools::logm('storage type ' . STORAGE);
42 } 44 }
43 45
44 private function getHandle() { 46 private function getHandle()
47 {
45 return $this->handle; 48 return $this->handle;
46 } 49 }
47 50
48 public function isInstalled() { 51 private function _checkTags()
49 $sql = "SELECT username FROM users"; 52 {
50 $query = $this->executeQuery($sql, array());
51 if ($query == false) {
52 die(STORAGE . ' database looks empty. You have to create it (you can find database structure in install folder).');
53 }
54 $hasAdmin = count($query->fetchAll());
55
56 if ($hasAdmin == 0)
57 return false;
58
59 return true;
60 }
61
62 public function checkTags() {
63 53
64 if (STORAGE == 'sqlite') { 54 if (STORAGE == 'sqlite') {
65 $sql = ' 55 $sql = '
@@ -123,7 +113,8 @@ class Database {
123 $query = $this->executeQuery($sql, array()); 113 $query = $this->executeQuery($sql, array());
124 } 114 }
125 115
126 public function install($login, $password) { 116 public function install($login, $password)
117 {
127 $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; 118 $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)';
128 $params = array($login, $password, $login, ' '); 119 $params = array($login, $password, $login, ' ');
129 $query = $this->executeQuery($sql, $params); 120 $query = $this->executeQuery($sql, $params);
@@ -150,7 +141,8 @@ class Database {
150 return TRUE; 141 return TRUE;
151 } 142 }
152 143
153 public function getConfigUser($id) { 144 public function getConfigUser($id)
145 {
154 $sql = "SELECT * FROM users_config WHERE user_id = ?"; 146 $sql = "SELECT * FROM users_config WHERE user_id = ?";
155 $query = $this->executeQuery($sql, array($id)); 147 $query = $this->executeQuery($sql, array($id));
156 $result = $query->fetchAll(); 148 $result = $query->fetchAll();
@@ -163,7 +155,8 @@ class Database {
163 return $user_config; 155 return $user_config;
164 } 156 }
165 157
166 public function userExists($username) { 158 public function userExists($username)
159 {
167 $sql = "SELECT * FROM users WHERE username=?"; 160 $sql = "SELECT * FROM users WHERE username=?";
168 $query = $this->executeQuery($sql, array($username)); 161 $query = $this->executeQuery($sql, array($username));
169 $login = $query->fetchAll(); 162 $login = $query->fetchAll();
@@ -174,13 +167,14 @@ class Database {
174 } 167 }
175 } 168 }
176 169
177 public function login($username, $password, $isauthenticated=false) { 170 public function login($username, $password, $isauthenticated = FALSE)
171 {
178 if ($isauthenticated) { 172 if ($isauthenticated) {
179 $sql = "SELECT * FROM users WHERE username=?"; 173 $sql = "SELECT * FROM users WHERE username=?";
180 $query = $this->executeQuery($sql, array($username)); 174 $query = $this->executeQuery($sql, array($username));
181 } else { 175 } else {
182 $sql = "SELECT * FROM users WHERE username=? AND password=?"; 176 $sql = "SELECT * FROM users WHERE username=? AND password=?";
183 $query = $this->executeQuery($sql, array($username, $password)); 177 $query = $this->executeQuery($sql, array($username, $password));
184 } 178 }
185 $login = $query->fetchAll(); 179 $login = $query->fetchAll();
186 180
@@ -204,7 +198,8 @@ class Database {
204 $query = $this->executeQuery($sql_update, $params_update); 198 $query = $this->executeQuery($sql_update, $params_update);
205 } 199 }
206 200
207 public function updateUserConfig($userId, $key, $value) { 201 public function updateUserConfig($userId, $key, $value)
202 {
208 $config = $this->getConfigUser($userId); 203 $config = $this->getConfigUser($userId);
209 204
210 if (! isset($config[$key])) { 205 if (! isset($config[$key])) {
@@ -218,7 +213,8 @@ class Database {
218 $query = $this->executeQuery($sql, $params); 213 $query = $this->executeQuery($sql, $params);
219 } 214 }
220 215
221 private function executeQuery($sql, $params) { 216 private function executeQuery($sql, $params)
217 {
222 try 218 try
223 { 219 {
224 $query = $this->getHandle()->prepare($sql); 220 $query = $this->getHandle()->prepare($sql);
@@ -232,28 +228,32 @@ class Database {
232 } 228 }
233 } 229 }
234 230
235 public function listUsers($username=null) { 231 public function listUsers($username = NULL)
232 {
236 $sql = 'SELECT count(*) FROM users'.( $username ? ' WHERE username=?' : ''); 233 $sql = 'SELECT count(*) FROM users'.( $username ? ' WHERE username=?' : '');
237 $query = $this->executeQuery($sql, ( $username ? array($username) : array())); 234 $query = $this->executeQuery($sql, ( $username ? array($username) : array()));
238 list($count) = $query->fetch(); 235 list($count) = $query->fetch();
239 return $count; 236 return $count;
240 } 237 }
241 238
242 public function getUserPassword($userID) { 239 public function getUserPassword($userID)
240 {
243 $sql = "SELECT * FROM users WHERE id=?"; 241 $sql = "SELECT * FROM users WHERE id=?";
244 $query = $this->executeQuery($sql, array($userID)); 242 $query = $this->executeQuery($sql, array($userID));
245 $password = $query->fetchAll(); 243 $password = $query->fetchAll();
246 return isset($password[0]['password']) ? $password[0]['password'] : null; 244 return isset($password[0]['password']) ? $password[0]['password'] : null;
247 } 245 }
248 246
249 public function deleteUserConfig($userID) { 247 public function deleteUserConfig($userID)
248 {
250 $sql_action = 'DELETE from users_config WHERE user_id=?'; 249 $sql_action = 'DELETE from users_config WHERE user_id=?';
251 $params_action = array($userID); 250 $params_action = array($userID);
252 $query = $this->executeQuery($sql_action, $params_action); 251 $query = $this->executeQuery($sql_action, $params_action);
253 return $query; 252 return $query;
254 } 253 }
255 254
256 public function deleteTagsEntriesAndEntries($userID) { 255 public function deleteTagsEntriesAndEntries($userID)
256 {
257 $entries = $this->retrieveAll($userID); 257 $entries = $this->retrieveAll($userID);
258 foreach($entries as $entryid) { 258 foreach($entries as $entryid) {
259 $tags = $this->retrieveTagsByEntry($entryid); 259 $tags = $this->retrieveTagsByEntry($entryid);
@@ -264,20 +264,23 @@ class Database {
264 } 264 }
265 } 265 }
266 266
267 public function deleteUser($userID) { 267 public function deleteUser($userID)
268 {
268 $sql_action = 'DELETE from users WHERE id=?'; 269 $sql_action = 'DELETE from users WHERE id=?';
269 $params_action = array($userID); 270 $params_action = array($userID);
270 $query = $this->executeQuery($sql_action, $params_action); 271 $query = $this->executeQuery($sql_action, $params_action);
271 } 272 }
272 273
273 public function updateContentAndTitle($id, $title, $body, $user_id) { 274 public function updateContentAndTitle($id, $title, $body, $user_id)
275 {
274 $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?'; 276 $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?';
275 $params_action = array($body, $title, $id, $user_id); 277 $params_action = array($body, $title, $id, $user_id);
276 $query = $this->executeQuery($sql_action, $params_action); 278 $query = $this->executeQuery($sql_action, $params_action);
277 return $query; 279 return $query;
278 } 280 }
279 281
280 public function retrieveUnfetchedEntries($user_id, $limit) { 282 public function retrieveUnfetchedEntries($user_id, $limit)
283 {
281 284
282 $sql_limit = "LIMIT 0,".$limit; 285 $sql_limit = "LIMIT 0,".$limit;
283 if (STORAGE == 'postgres') { 286 if (STORAGE == 'postgres') {
@@ -291,7 +294,8 @@ class Database {
291 return $entries; 294 return $entries;
292 } 295 }
293 296
294 public function retrieveUnfetchedEntriesCount($user_id) { 297 public function retrieveUnfetchedEntriesCount($user_id)
298 {
295 $sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?"; 299 $sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?";
296 $query = $this->executeQuery($sql, array($user_id)); 300 $query = $this->executeQuery($sql, array($user_id));
297 list($count) = $query->fetch(); 301 list($count) = $query->fetch();
@@ -299,7 +303,8 @@ class Database {
299 return $count; 303 return $count;
300 } 304 }
301 305
302 public function retrieveAll($user_id) { 306 public function retrieveAll($user_id)
307 {
303 $sql = "SELECT * FROM entries WHERE user_id=? ORDER BY id"; 308 $sql = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
304 $query = $this->executeQuery($sql, array($user_id)); 309 $query = $this->executeQuery($sql, array($user_id));
305 $entries = $query->fetchAll(); 310 $entries = $query->fetchAll();
@@ -307,7 +312,8 @@ class Database {
307 return $entries; 312 return $entries;
308 } 313 }
309 314
310 public function retrieveOneById($id, $user_id) { 315 public function retrieveOneById($id, $user_id)
316 {
311 $entry = NULL; 317 $entry = NULL;
312 $sql = "SELECT * FROM entries WHERE id=? AND user_id=?"; 318 $sql = "SELECT * FROM entries WHERE id=? AND user_id=?";
313 $params = array(intval($id), $user_id); 319 $params = array(intval($id), $user_id);
@@ -317,7 +323,8 @@ class Database {
317 return isset($entry[0]) ? $entry[0] : null; 323 return isset($entry[0]) ? $entry[0] : null;
318 } 324 }
319 325
320 public function retrieveOneByURL($url, $user_id) { 326 public function retrieveOneByURL($url, $user_id)
327 {
321 $entry = NULL; 328 $entry = NULL;
322 $sql = "SELECT * FROM entries WHERE url=? AND user_id=?"; 329 $sql = "SELECT * FROM entries WHERE url=? AND user_id=?";
323 $params = array($url, $user_id); 330 $params = array($url, $user_id);
@@ -327,13 +334,15 @@ class Database {
327 return isset($entry[0]) ? $entry[0] : null; 334 return isset($entry[0]) ? $entry[0] : null;
328 } 335 }
329 336
330 public function reassignTags($old_entry_id, $new_entry_id) { 337 public function reassignTags($old_entry_id, $new_entry_id)
338 {
331 $sql = "UPDATE tags_entries SET entry_id=? WHERE entry_id=?"; 339 $sql = "UPDATE tags_entries SET entry_id=? WHERE entry_id=?";
332 $params = array($new_entry_id, $old_entry_id); 340 $params = array($new_entry_id, $old_entry_id);
333 $query = $this->executeQuery($sql, $params); 341 $query = $this->executeQuery($sql, $params);
334 } 342 }
335 343
336 public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) { 344 public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0)
345 {
337 switch ($view) { 346 switch ($view) {
338 case 'archive': 347 case 'archive':
339 $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? "; 348 $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
@@ -361,9 +370,10 @@ class Database {
361 $entries = $query->fetchAll(); 370 $entries = $query->fetchAll();
362 371
363 return $entries; 372 return $entries;
364 } 373 }
365 374
366 public function getEntriesByViewCount($view, $user_id, $tag_id = 0) { 375 public function getEntriesByViewCount($view, $user_id, $tag_id = 0)
376 {
367 switch ($view) { 377 switch ($view) {
368 case 'archive': 378 case 'archive':
369 $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? "; 379 $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
@@ -391,7 +401,8 @@ class Database {
391 return $count; 401 return $count;
392 } 402 }
393 403
394 public function updateContent($id, $content, $user_id) { 404 public function updateContent($id, $content, $user_id)
405 {
395 $sql_action = 'UPDATE entries SET content = ? WHERE id=? AND user_id=?'; 406 $sql_action = 'UPDATE entries SET content = ? WHERE id=? AND user_id=?';
396 $params_action = array($content, $id, $user_id); 407 $params_action = array($content, $id, $user_id);
397 $query = $this->executeQuery($sql_action, $params_action); 408 $query = $this->executeQuery($sql_action, $params_action);
@@ -406,7 +417,8 @@ class Database {
406 * @param integer $user_id 417 * @param integer $user_id
407 * @return integer $id of inserted record 418 * @return integer $id of inserted record
408 */ 419 */
409 public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) { 420 public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0)
421 {
410 $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)'; 422 $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)';
411 $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead); 423 $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead);
412 424
@@ -419,36 +431,42 @@ class Database {
419 return $id; 431 return $id;
420 } 432 }
421 433
422 public function deleteById($id, $user_id) { 434 public function deleteById($id, $user_id)
435 {
423 $sql_action = "DELETE FROM entries WHERE id=? AND user_id=?"; 436 $sql_action = "DELETE FROM entries WHERE id=? AND user_id=?";
424 $params_action = array($id, $user_id); 437 $params_action = array($id, $user_id);
425 $query = $this->executeQuery($sql_action, $params_action); 438 $query = $this->executeQuery($sql_action, $params_action);
426 return $query; 439 return $query;
427 } 440 }
428 441
429 public function favoriteById($id, $user_id) { 442 public function favoriteById($id, $user_id)
443 {
430 $sql_action = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?"; 444 $sql_action = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?";
431 $params_action = array($id, $user_id); 445 $params_action = array($id, $user_id);
432 $query = $this->executeQuery($sql_action, $params_action); 446 $query = $this->executeQuery($sql_action, $params_action);
433 } 447 }
434 448
435 public function archiveById($id, $user_id) { 449 public function archiveById($id, $user_id)
450 {
436 $sql_action = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?"; 451 $sql_action = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?";
437 $params_action = array($id, $user_id); 452 $params_action = array($id, $user_id);
438 $query = $this->executeQuery($sql_action, $params_action); 453 $query = $this->executeQuery($sql_action, $params_action);
439 } 454 }
440 455
441 public function archiveAll($user_id) { 456 public function archiveAll($user_id)
457 {
442 $sql_action = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?"; 458 $sql_action = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?";
443 $params_action = array($user_id, 1, 0); 459 $params_action = array($user_id, 1, 0);
444 $query = $this->executeQuery($sql_action, $params_action); 460 $query = $this->executeQuery($sql_action, $params_action);
445 } 461 }
446 462
447 public function getLastId($column = '') { 463 public function getLastId($column = '')
464 {
448 return $this->getHandle()->lastInsertId($column); 465 return $this->getHandle()->lastInsertId($column);
449 } 466 }
450 467
451 public function search($term, $user_id, $limit = '') { 468 public function search($term, $user_id, $limit = '')
469 {
452 $search = '%'.$term.'%'; 470 $search = '%'.$term.'%';
453 $sql_action = "SELECT * FROM entries WHERE user_id=? AND (content LIKE ? OR title LIKE ? OR url LIKE ?) "; //searches in content, title and URL 471 $sql_action = "SELECT * FROM entries WHERE user_id=? AND (content LIKE ? OR title LIKE ? OR url LIKE ?) "; //searches in content, title and URL
454 $sql_action .= $this->getEntriesOrder().' ' . $limit; 472 $sql_action .= $this->getEntriesOrder().' ' . $limit;
@@ -457,7 +475,8 @@ class Database {
457 return $query->fetchAll(); 475 return $query->fetchAll();
458 } 476 }
459 477
460 public function retrieveAllTags($user_id, $term = null) { 478 public function retrieveAllTags($user_id, $term = NULL)
479 {
461 $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags 480 $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags
462 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id 481 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
463 LEFT JOIN entries ON tags_entries.entry_id=entries.id 482 LEFT JOIN entries ON tags_entries.entry_id=entries.id
@@ -471,7 +490,8 @@ class Database {
471 return $tags; 490 return $tags;
472 } 491 }
473 492
474 public function retrieveTag($id, $user_id) { 493 public function retrieveTag($id, $user_id)
494 {
475 $tag = NULL; 495 $tag = NULL;
476 $sql = "SELECT DISTINCT tags.* FROM tags 496 $sql = "SELECT DISTINCT tags.* FROM tags
477 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id 497 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
@@ -481,10 +501,11 @@ class Database {
481 $query = $this->executeQuery($sql, $params); 501 $query = $this->executeQuery($sql, $params);
482 $tag = $query->fetchAll(); 502 $tag = $query->fetchAll();
483 503
484 return isset($tag[0]) ? $tag[0] : null; 504 return isset($tag[0]) ? $tag[0] : NULL;
485 } 505 }
486 506
487 public function retrieveEntriesByTag($tag_id, $user_id) { 507 public function retrieveEntriesByTag($tag_id, $user_id)
508 {
488 $sql = 509 $sql =
489 "SELECT entries.* FROM entries 510 "SELECT entries.* FROM entries
490 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id 511 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
@@ -495,7 +516,8 @@ class Database {
495 return $entries; 516 return $entries;
496 } 517 }
497 518
498 public function retrieveTagsByEntry($entry_id) { 519 public function retrieveTagsByEntry($entry_id)
520 {
499 $sql = 521 $sql =
500 "SELECT tags.* FROM tags 522 "SELECT tags.* FROM tags
501 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id 523 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
@@ -506,14 +528,16 @@ class Database {
506 return $tags; 528 return $tags;
507 } 529 }
508 530
509 public function removeTagForEntry($entry_id, $tag_id) { 531 public function removeTagForEntry($entry_id, $tag_id)
532 {
510 $sql_action = "DELETE FROM tags_entries WHERE tag_id=? AND entry_id=?"; 533 $sql_action = "DELETE FROM tags_entries WHERE tag_id=? AND entry_id=?";
511 $params_action = array($tag_id, $entry_id); 534 $params_action = array($tag_id, $entry_id);
512 $query = $this->executeQuery($sql_action, $params_action); 535 $query = $this->executeQuery($sql_action, $params_action);
513 return $query; 536 return $query;
514 } 537 }
515 538
516 public function cleanUnusedTag($tag_id) { 539 public function cleanUnusedTag($tag_id)
540 {
517 $sql_action = "SELECT tags.* FROM tags JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?"; 541 $sql_action = "SELECT tags.* FROM tags JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?";
518 $query = $this->executeQuery($sql_action,array($tag_id)); 542 $query = $this->executeQuery($sql_action,array($tag_id));
519 $tagstokeep = $query->fetchAll(); 543 $tagstokeep = $query->fetchAll();
@@ -532,7 +556,8 @@ class Database {
532 556
533 } 557 }
534 558
535 public function retrieveTagByValue($value) { 559 public function retrieveTagByValue($value)
560 {
536 $tag = NULL; 561 $tag = NULL;
537 $sql = "SELECT * FROM tags WHERE value=?"; 562 $sql = "SELECT * FROM tags WHERE value=?";
538 $params = array($value); 563 $params = array($value);
@@ -542,27 +567,29 @@ class Database {
542 return isset($tag[0]) ? $tag[0] : null; 567 return isset($tag[0]) ? $tag[0] : null;
543 } 568 }
544 569
545 public function createTag($value) { 570 public function createTag($value)
571 {
546 $sql_action = 'INSERT INTO tags ( value ) VALUES (?)'; 572 $sql_action = 'INSERT INTO tags ( value ) VALUES (?)';
547 $params_action = array($value); 573 $params_action = array($value);
548 $query = $this->executeQuery($sql_action, $params_action); 574 $query = $this->executeQuery($sql_action, $params_action);
549 return $query; 575 return $query;
550 } 576 }
551 577
552 public function setTagToEntry($tag_id, $entry_id) { 578 public function setTagToEntry($tag_id, $entry_id)
579 {
553 $sql_action = 'INSERT INTO tags_entries ( tag_id, entry_id ) VALUES (?, ?)'; 580 $sql_action = 'INSERT INTO tags_entries ( tag_id, entry_id ) VALUES (?, ?)';
554 $params_action = array($tag_id, $entry_id); 581 $params_action = array($tag_id, $entry_id);
555 $query = $this->executeQuery($sql_action, $params_action); 582 $query = $this->executeQuery($sql_action, $params_action);
556 return $query; 583 return $query;
557 } 584 }
558 585
559 private function getEntriesOrder() { 586 private function getEntriesOrder()
560 if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) { 587 {
561 return $this->order[$_SESSION['sort']]; 588 if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) {
562 } 589 return $this->order[$_SESSION['sort']];
563 else {
564 return $this->order['default'];
565 }
566 } 590 }
567 591 else {
592 return $this->order['default'];
593 }
594 }
568} 595}
diff --git a/inc/poche/Language.class.php b/inc/poche/Language.class.php
new file mode 100644
index 00000000..8d3912f5
--- /dev/null
+++ b/inc/poche/Language.class.php
@@ -0,0 +1,113 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11class Language
12{
13 protected $wallabag;
14
15 private $currentLanguage;
16
17 private $languageNames = array(
18 'cs_CZ.utf8' => 'čeština',
19 'de_DE.utf8' => 'German',
20 'en_EN.utf8' => 'English',
21 'es_ES.utf8' => 'Español',
22 'fa_IR.utf8' => 'فارسی',
23 'fr_FR.utf8' => 'Français',
24 'it_IT.utf8' => 'Italiano',
25 'pl_PL.utf8' => 'Polski',
26 'pt_BR.utf8' => 'Português (Brasil)',
27 'ru_RU.utf8' => 'Pусский',
28 'sl_SI.utf8' => 'Slovenščina',
29 'uk_UA.utf8' => 'Українська',
30 );
31
32 public function __construct(Poche $wallabag)
33 {
34 $this->wallabag = $wallabag;
35 $pocheUser = Session::getParam('poche_user');
36 $language = (is_null($pocheUser) ? LANG : $pocheUser->getConfigValue('language'));
37
38 @putenv('LC_ALL=' . $language);
39 setlocale(LC_ALL, $language);
40 bindtextdomain($language, LOCALE);
41 textdomain($language);
42
43 $this->currentLanguage = $language;
44 }
45
46 public function getLanguage() {
47 return $this->currentLanguage;
48 }
49
50 public function getInstalledLanguages() {
51 $handle = opendir(LOCALE);
52 $languages = array();
53
54 while (($language = readdir($handle)) !== false) {
55 # Languages are stored in a directory, so all directory names are languages
56 # @todo move language installation data to database
57 if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
58 continue;
59 }
60
61 $current = false;
62
63 if ($language === $this->getLanguage()) {
64 $current = true;
65 }
66
67 $languages[] = array('name' => (isset($this->languageNames[$language]) ? $this->languageNames[$language] : $language), 'value' => $language, 'current' => $current);
68 }
69
70 return $languages;
71 }
72
73
74 /**
75 * Update language for current user
76 *
77 * @param $newLanguage
78 */
79 public function updateLanguage($newLanguage)
80 {
81 # we are not going to change it to the current language
82 if ($newLanguage == $this->getLanguage()) {
83 $this->wallabag->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
84 Tools::redirect('?view=config');
85 }
86
87 $languages = $this->getInstalledLanguages();
88 $actualLanguage = false;
89
90 foreach ($languages as $language) {
91 if ($language['value'] == $newLanguage) {
92 $actualLanguage = true;
93 break;
94 }
95 }
96
97 if (!$actualLanguage) {
98 $this->wallabag->messages->add('e', _('that language does not seem to be installed'));
99 Tools::redirect('?view=config');
100 }
101
102 $this->wallabag->store->updateUserConfig($this->wallabag->user->getId(), 'language', $newLanguage);
103 $this->wallabag->messages->add('s', _('you have changed your language preferences'));
104
105 $currentConfig = $_SESSION['poche_user']->config;
106 $currentConfig['language'] = $newLanguage;
107
108 $_SESSION['poche_user']->setConfig($currentConfig);
109
110 Tools::emptyCache();
111 Tools::redirect('?view=config');
112 }
113} \ No newline at end of file
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index bcf2ddeb..64a5c4f7 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -5,402 +5,126 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class Poche 11class Poche
12{ 12{
13 public static $canRenderTemplates = true; 13 /**
14 public static $configFileAvailable = true; 14 * @var User
15 15 */
16 public $user; 16 public $user;
17 /**
18 * @var Database
19 */
17 public $store; 20 public $store;
21 /**
22 * @var Template
23 */
18 public $tpl; 24 public $tpl;
25 /**
26 * @var Language
27 */
28 public $language;
29 /**
30 * @var Routing
31 */
32 public $routing;
33 /**
34 * @var Messages
35 */
19 public $messages; 36 public $messages;
37 /**
38 * @var Paginator
39 */
20 public $pagination; 40 public $pagination;
21 41
22 private $currentTheme = '';
23 private $currentLanguage = '';
24 private $notInstalledMessage = array();
25
26 private $language_names = array(
27 'cs_CZ.utf8' => 'čeština',
28 'de_DE.utf8' => 'German',
29 'en_EN.utf8' => 'English',
30 'es_ES.utf8' => 'Español',
31 'fa_IR.utf8' => 'فارسی',
32 'fr_FR.utf8' => 'Français',
33 'it_IT.utf8' => 'Italiano',
34 'pl_PL.utf8' => 'Polski',
35 'pt_BR.utf8' => 'Português (Brasil)',
36 'ru_RU.utf8' => 'Pусский',
37 'sl_SI.utf8' => 'Slovenščina',
38 'uk_UA.utf8' => 'Українська',
39 );
40 public function __construct() 42 public function __construct()
41 { 43 {
42 if ($this->configFileIsAvailable()) { 44 $this->init();
43 $this->init();
44 }
45
46 if ($this->themeIsInstalled()) {
47 $this->initTpl();
48 }
49
50 if ($this->systemIsInstalled()) {
51 $this->store = new Database();
52 $this->messages = new Messages();
53 # installation
54 if (! $this->store->isInstalled()) {
55 $this->install();
56 }
57 $this->store->checkTags();
58 }
59 } 45 }
60 46
61 private function init() 47 private function init()
62 { 48 {
63 Tools::initPhp(); 49 Tools::initPhp();
64 50
65 if (isset($_SESSION['poche_user']) && $_SESSION['poche_user'] != array()) { 51 $pocheUser = Session::getParam('poche_user');
66 $this->user = $_SESSION['poche_user']; 52
53 if ($pocheUser && $pocheUser != array()) {
54 $this->user = $pocheUser;
67 } else { 55 } else {
68 # fake user, just for install & login screens 56 // fake user, just for install & login screens
69 $this->user = new User(); 57 $this->user = new User();
70 $this->user->setConfig($this->getDefaultConfig()); 58 $this->user->setConfig($this->getDefaultConfig());
71 } 59 }
72 60
73 # l10n 61 $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
74 $language = $this->user->getConfigValue('language'); 62 $this->language = new Language($this);
75 @putenv('LC_ALL=' . $language); 63 $this->tpl = new Template($this);
76 setlocale(LC_ALL, $language); 64 $this->store = new Database();
77 bindtextdomain($language, LOCALE); 65 $this->messages = new Messages();
78 textdomain($language); 66 $this->routing = new Routing($this);
79
80 # Pagination
81 $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
82
83 # Set up theme
84 $themeDirectory = $this->user->getConfigValue('theme');
85
86 if ($themeDirectory === false) {
87 $themeDirectory = DEFAULT_THEME;
88 }
89
90 $this->currentTheme = $themeDirectory;
91
92 # Set up language
93 $languageDirectory = $this->user->getConfigValue('language');
94
95 if ($languageDirectory === false) {
96 $languageDirectory = DEFAULT_THEME;
97 }
98
99 $this->currentLanguage = $languageDirectory;
100 }
101
102 public function configFileIsAvailable() {
103 if (! self::$configFileAvailable) {
104 $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
105
106 return false;
107 }
108
109 return true;
110 } 67 }
111 68
112 public function themeIsInstalled() { 69 public function run()
113 $passTheme = TRUE; 70 {
114 # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet 71 $this->routing->run();
115 if (! self::$canRenderTemplates) {
116 $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download <a href="http://wllbg.org/vendor">vendor.zip</a> and extract it in your wallabag folder.';
117 $passTheme = FALSE;
118 }
119
120 if (! is_writable(CACHE)) {
121 $this->notInstalledMessage[] = 'You don\'t have write access on cache directory.';
122
123 self::$canRenderTemplates = false;
124
125 $passTheme = FALSE;
126 }
127
128 # Check if the selected theme and its requirements are present
129 $theme = $this->getTheme();
130
131 if ($theme != '' && ! is_dir(THEME . '/' . $theme)) {
132 $this->notInstalledMessage[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
133
134 self::$canRenderTemplates = false;
135
136 $passTheme = FALSE;
137 }
138
139 $themeInfo = $this->getThemeInfo($theme);
140 if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
141 foreach ($themeInfo['requirements'] as $requiredTheme) {
142 if (! is_dir(THEME . '/' . $requiredTheme)) {
143 $this->notInstalledMessage[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
144
145 self::$canRenderTemplates = false;
146
147 $passTheme = FALSE;
148 }
149 }
150 }
151
152 if (!$passTheme) {
153 return FALSE;
154 }
155
156
157 return true;
158 } 72 }
159 73
160 /** 74 /**
161 * all checks before installation. 75 * Creates a new user
162 * @todo move HTML to template
163 * @return boolean
164 */ 76 */
165 public function systemIsInstalled() 77 public function createNewUser($username, $password)
166 {
167 $msg = TRUE;
168
169 $configSalt = defined('SALT') ? constant('SALT') : '';
170
171 if (empty($configSalt)) {
172 $this->notInstalledMessage[] = 'You have not yet filled in the SALT value in the config.inc.php file.';
173 $msg = FALSE;
174 }
175 if (STORAGE == 'sqlite' && ! file_exists(STORAGE_SQLITE)) {
176 Tools::logm('sqlite file doesn\'t exist');
177 $this->notInstalledMessage[] = 'sqlite file doesn\'t exist, you can find it in install folder. Copy it in /db folder.';
178 $msg = FALSE;
179 }
180 if (is_dir(ROOT . '/install') && ! DEBUG_POCHE) {
181 $this->notInstalledMessage[] = 'you have to delete the /install folder before using poche.';
182 $msg = FALSE;
183 }
184 if (STORAGE == 'sqlite' && ! is_writable(STORAGE_SQLITE)) {
185 Tools::logm('you don\'t have write access on sqlite file');
186 $this->notInstalledMessage[] = 'You don\'t have write access on sqlite file.';
187 $msg = FALSE;
188 }
189
190 if (! $msg) {
191 return false;
192 }
193
194 return true;
195 }
196
197 public function getNotInstalledMessage() {
198 return $this->notInstalledMessage;
199 }
200
201 private function initTpl()
202 { 78 {
203 $loaderChain = new Twig_Loader_Chain(); 79 if (!empty($username) && !empty($password)){
204 $theme = $this->getTheme(); 80 $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
205 81 if (!$this->store->userExists($newUsername)){
206 # add the current theme as first to the loader chain so Twig will look there first for overridden template files 82 if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername))) {
207 try { 83 Tools::logm('The new user ' . $newUsername . ' has been installed');
208 $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme)); 84 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
209 } catch (Twig_Error_Loader $e) {
210 # @todo isInstalled() should catch this, inject Twig later
211 die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
212 }
213
214 # add all required themes to the loader chain
215 $themeInfo = $this->getThemeInfo($theme);
216 if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
217 foreach ($themeInfo['requirements'] as $requiredTheme) {
218 try {
219 $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
220 } catch (Twig_Error_Loader $e) {
221 # @todo isInstalled() should catch this, inject Twig later
222 die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
223 }
224 }
225 }
226
227 if (DEBUG_POCHE) {
228 $twigParams = array();
229 } else {
230 $twigParams = array('cache' => CACHE);
231 }
232
233 $this->tpl = new Twig_Environment($loaderChain, $twigParams);
234 $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
235
236 # filter to display domain name of an url
237 $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
238 $this->tpl->addFilter($filter);
239
240 # filter for reading time
241 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
242 $this->tpl->addFilter($filter);
243 }
244
245 public function createNewUser() {
246 if (isset($_GET['newuser'])){
247 if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
248 $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
249 if (!$this->store->userExists($newusername)){
250 if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
251 Tools::logm('The new user '.$newusername.' has been installed');
252 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'),$newusername));
253 Tools::redirect();
254 }
255 else {
256 Tools::logm('error during adding new user');
257 Tools::redirect();
258 }
259 }
260 else {
261 $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'),$newusername));
262 Tools::logm('An user with the name '.$newusername.' already exists !');
263 Tools::redirect(); 85 Tools::redirect();
264 } 86 }
265 }
266 }
267 }
268
269 public function deleteUser(){
270 if (isset($_GET['deluser'])){
271 if ($this->store->listUsers() > 1) {
272 if (Tools::encodeString($_POST['password4deletinguser'].$this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
273 $username = $this->user->getUsername();
274 $this->store->deleteUserConfig($this->user->getId());
275 Tools::logm('The configuration for user '. $username .' has been deleted !');
276 $this->store->deleteTagsEntriesAndEntries($this->user->getId());
277 Tools::logm('The entries for user '. $username .' has been deleted !');
278 $this->store->deleteUser($this->user->getId());
279 Tools::logm('User '. $username .' has been completely deleted !');
280 Session::logout();
281 Tools::logm('logout');
282 Tools::redirect();
283 $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'),$newusername));
284 }
285 else { 87 else {
286 Tools::logm('Bad password !'); 88 Tools::logm('error during adding new user');
287 $this->messages->add('e', _('Error : The password is wrong !'));
288 }
289 }
290 else {
291 Tools::logm('Only user !');
292 $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
293 }
294 }
295 }
296
297 private function install()
298 {
299 Tools::logm('poche still not installed');
300 echo $this->tpl->render('install.twig', array(
301 'token' => Session::getToken(),
302 'theme' => $this->getTheme(),
303 'poche_url' => Tools::getPocheUrl()
304 ));
305 if (isset($_GET['install'])) {
306 if (($_POST['password'] == $_POST['password_repeat'])
307 && $_POST['password'] != "" && $_POST['login'] != "") {
308 # let's rock, install poche baby !
309 if ($this->store->install($_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login'])))
310 {
311 Session::logout();
312 Tools::logm('poche is now installed');
313 Tools::redirect(); 89 Tools::redirect();
314 } 90 }
315 } 91 }
316 else { 92 else {
317 Tools::logm('error during installation'); 93 $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'), $newUsername));
94 Tools::logm('An user with the name ' . $newUsername . ' already exists !');
318 Tools::redirect(); 95 Tools::redirect();
319 } 96 }
320 } 97 }
321 exit();
322 }
323
324 public function getTheme() {
325 return $this->currentTheme;
326 } 98 }
327 99
328 /** 100 /**
329 * Provides theme information by parsing theme.ini file if present in the theme's root directory. 101 * Delete an existing user
330 * In all cases, the following data will be returned:
331 * - name: theme's name, or key if the theme is unnamed,
332 * - current: boolean informing if the theme is the current user theme.
333 *
334 * @param string $theme Theme key (directory name)
335 * @return array|boolean Theme information, or false if the theme doesn't exist.
336 */ 102 */
337 public function getThemeInfo($theme) { 103 public function deleteUser($password)
338 if (!is_dir(THEME . '/' . $theme)) { 104 {
339 return false; 105 if ($this->store->listUsers() > 1) {
340 } 106 if (Tools::encodeString($password . $this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
341 107 $username = $this->user->getUsername();
342 $themeIniFile = THEME . '/' . $theme . '/theme.ini'; 108 $this->store->deleteUserConfig($this->user->getId());
343 $themeInfo = array(); 109 Tools::logm('The configuration for user '. $username .' has been deleted !');
344 110 $this->store->deleteTagsEntriesAndEntries($this->user->getId());
345 if (is_file($themeIniFile) && is_readable($themeIniFile)) { 111 Tools::logm('The entries for user '. $username .' has been deleted !');
346 $themeInfo = parse_ini_file($themeIniFile); 112 $this->store->deleteUser($this->user->getId());
347 } 113 Tools::logm('User '. $username .' has been completely deleted !');
348 114 Session::logout();
349 if ($themeInfo === false) { 115 Tools::logm('logout');
350 $themeInfo = array(); 116 Tools::redirect();
351 } 117 $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'), $username));
352 if (!isset($themeInfo['name'])) {
353 $themeInfo['name'] = $theme;
354 }
355 $themeInfo['current'] = ($theme === $this->getTheme());
356
357 return $themeInfo;
358 }
359
360 public function getInstalledThemes() {
361 $handle = opendir(THEME);
362 $themes = array();
363
364 while (($theme = readdir($handle)) !== false) {
365 # Themes are stored in a directory, so all directory names are themes
366 # @todo move theme installation data to database
367 if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
368 continue;
369 }
370
371 $themes[$theme] = $this->getThemeInfo($theme);
372 }
373
374 ksort($themes);
375
376 return $themes;
377 }
378
379 public function getLanguage() {
380 return $this->currentLanguage;
381 }
382
383 public function getInstalledLanguages() {
384 $handle = opendir(LOCALE);
385 $languages = array();
386
387 while (($language = readdir($handle)) !== false) {
388 # Languages are stored in a directory, so all directory names are languages
389 # @todo move language installation data to database
390 if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
391 continue;
392 } 118 }
393 119 else {
394 $current = false; 120 Tools::logm('Bad password !');
395 121 $this->messages->add('e', _('Error : The password is wrong !'));
396 if ($language === $this->getLanguage()) {
397 $current = true;
398 } 122 }
399
400 $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
401 } 123 }
402 124 else {
403 return $languages; 125 Tools::logm('Only user !');
126 $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
127 }
404 } 128 }
405 129
406 public function getDefaultConfig() 130 public function getDefaultConfig()
@@ -425,7 +149,7 @@ class Poche
425 $body = $content['rss']['channel']['item']['description']; 149 $body = $content['rss']['channel']['item']['description'];
426 150
427 // clean content from prevent xss attack 151 // clean content from prevent xss attack
428 $purifier = $this->getPurifier(); 152 $purifier = $this->_getPurifier();
429 $title = $purifier->purify($title); 153 $title = $purifier->purify($title);
430 $body = $purifier->purify($body); 154 $body = $purifier->purify($body);
431 155
@@ -437,7 +161,7 @@ class Poche
437 if ( $last_id ) { 161 if ( $last_id ) {
438 Tools::logm('add link ' . $url->getUrl()); 162 Tools::logm('add link ' . $url->getUrl());
439 if (DOWNLOAD_PICTURES) { 163 if (DOWNLOAD_PICTURES) {
440 $content = filtre_picture($body, $url->getUrl(), $last_id); 164 $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
441 Tools::logm('updating content article'); 165 Tools::logm('updating content article');
442 $this->store->updateContent($last_id, $content, $this->user->getId()); 166 $this->store->updateContent($last_id, $content, $this->user->getId());
443 } 167 }
@@ -472,7 +196,7 @@ class Poche
472 $msg = 'delete link #' . $id; 196 $msg = 'delete link #' . $id;
473 if ($this->store->deleteById($id, $this->user->getId())) { 197 if ($this->store->deleteById($id, $this->user->getId())) {
474 if (DOWNLOAD_PICTURES) { 198 if (DOWNLOAD_PICTURES) {
475 remove_directory(ABS_PATH . $id); 199 Picture::removeDirectory(ABS_PATH . $id);
476 } 200 }
477 $this->messages->add('s', _('the link has been deleted successfully')); 201 $this->messages->add('s', _('the link has been deleted successfully'));
478 } 202 }
@@ -590,16 +314,16 @@ class Poche
590 switch ($view) 314 switch ($view)
591 { 315 {
592 case 'config': 316 case 'config':
593 $dev_infos = $this->getPocheVersion('dev'); 317 $dev_infos = $this->_getPocheVersion('dev');
594 $dev = trim($dev_infos[0]); 318 $dev = trim($dev_infos[0]);
595 $check_time_dev = date('d-M-Y H:i', $dev_infos[1]); 319 $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
596 $prod_infos = $this->getPocheVersion('prod'); 320 $prod_infos = $this->_getPocheVersion('prod');
597 $prod = trim($prod_infos[0]); 321 $prod = trim($prod_infos[0]);
598 $check_time_prod = date('d-M-Y H:i', $prod_infos[1]); 322 $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
599 $compare_dev = version_compare(POCHE, $dev); 323 $compare_dev = version_compare(POCHE, $dev);
600 $compare_prod = version_compare(POCHE, $prod); 324 $compare_prod = version_compare(POCHE, $prod);
601 $themes = $this->getInstalledThemes(); 325 $themes = $this->tpl->getInstalledThemes();
602 $languages = $this->getInstalledLanguages(); 326 $languages = $this->language->getInstalledLanguages();
603 $token = $this->user->getConfigValue('token'); 327 $token = $this->user->getConfigValue('token');
604 $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false; 328 $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
605 $only_user = ($this->store->listUsers() > 1) ? false : true; 329 $only_user = ($this->store->listUsers() > 1) ? false : true;
@@ -703,7 +427,7 @@ class Poche
703 'listmode' => (isset($_COOKIE['listmode']) ? true : false), 427 'listmode' => (isset($_COOKIE['listmode']) ? true : false),
704 ); 428 );
705 429
706 //if id is given - we retrive entries by tag: id is tag id 430 //if id is given - we retrieve entries by tag: id is tag id
707 if ($id) { 431 if ($id) {
708 $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId()); 432 $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId());
709 $tpl_vars['id'] = intval($id); 433 $tpl_vars['id'] = intval($id);
@@ -733,7 +457,7 @@ class Poche
733 * @todo set the new password in function header like this updatePassword($newPassword) 457 * @todo set the new password in function header like this updatePassword($newPassword)
734 * @return boolean 458 * @return boolean
735 */ 459 */
736 public function updatePassword() 460 public function updatePassword($password, $confirmPassword)
737 { 461 {
738 if (MODE_DEMO) { 462 if (MODE_DEMO) {
739 $this->messages->add('i', _('in demo mode, you can\'t update your password')); 463 $this->messages->add('i', _('in demo mode, you can\'t update your password'));
@@ -741,10 +465,10 @@ class Poche
741 Tools::redirect('?view=config'); 465 Tools::redirect('?view=config');
742 } 466 }
743 else { 467 else {
744 if (isset($_POST['password']) && isset($_POST['password_repeat'])) { 468 if (isset($password) && isset($confirmPassword)) {
745 if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") { 469 if ($password == $confirmPassword && !empty($password)) {
746 $this->messages->add('s', _('your password has been updated')); 470 $this->messages->add('s', _('your password has been updated'));
747 $this->store->updatePassword($this->user->getId(), Tools::encodeString($_POST['password'] . $this->user->getUsername())); 471 $this->store->updatePassword($this->user->getId(), Tools::encodeString($password . $this->user->getUsername()));
748 Session::logout(); 472 Session::logout();
749 Tools::logm('password updated'); 473 Tools::logm('password updated');
750 Tools::redirect(); 474 Tools::redirect();
@@ -757,102 +481,25 @@ class Poche
757 } 481 }
758 } 482 }
759 483
760 public function updateTheme()
761 {
762 # no data
763 if (empty($_POST['theme'])) {
764 }
765
766 # we are not going to change it to the current theme...
767 if ($_POST['theme'] == $this->getTheme()) {
768 $this->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
769 Tools::redirect('?view=config');
770 }
771
772 $themes = $this->getInstalledThemes();
773 $actualTheme = false;
774
775 foreach (array_keys($themes) as $theme) {
776 if ($theme == $_POST['theme']) {
777 $actualTheme = true;
778 break;
779 }
780 }
781
782 if (! $actualTheme) {
783 $this->messages->add('e', _('that theme does not seem to be installed'));
784 Tools::redirect('?view=config');
785 }
786
787 $this->store->updateUserConfig($this->user->getId(), 'theme', $_POST['theme']);
788 $this->messages->add('s', _('you have changed your theme preferences'));
789
790 $currentConfig = $_SESSION['poche_user']->config;
791 $currentConfig['theme'] = $_POST['theme'];
792
793 $_SESSION['poche_user']->setConfig($currentConfig);
794
795 $this->emptyCache();
796
797 Tools::redirect('?view=config');
798 }
799
800 public function updateLanguage()
801 {
802 # no data
803 if (empty($_POST['language'])) {
804 }
805
806 # we are not going to change it to the current language...
807 if ($_POST['language'] == $this->getLanguage()) {
808 $this->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
809 Tools::redirect('?view=config');
810 }
811
812 $languages = $this->getInstalledLanguages();
813 $actualLanguage = false;
814
815 foreach ($languages as $language) {
816 if ($language['value'] == $_POST['language']) {
817 $actualLanguage = true;
818 break;
819 }
820 }
821
822 if (! $actualLanguage) {
823 $this->messages->add('e', _('that language does not seem to be installed'));
824 Tools::redirect('?view=config');
825 }
826
827 $this->store->updateUserConfig($this->user->getId(), 'language', $_POST['language']);
828 $this->messages->add('s', _('you have changed your language preferences'));
829
830 $currentConfig = $_SESSION['poche_user']->config;
831 $currentConfig['language'] = $_POST['language'];
832
833 $_SESSION['poche_user']->setConfig($currentConfig);
834
835 $this->emptyCache();
836
837 Tools::redirect('?view=config');
838 }
839 /** 484 /**
840 * get credentials from differents sources 485 * Get credentials from differents sources
841 * it redirects the user to the $referer link 486 * It redirects the user to the $referer link
487 *
842 * @return array 488 * @return array
843 */ 489 */
844 private function credentials() { 490 private function credentials()
845 if(isset($_SERVER['PHP_AUTH_USER'])) { 491 {
846 return array($_SERVER['PHP_AUTH_USER'],'php_auth',true); 492 if (isset($_SERVER['PHP_AUTH_USER'])) {
493 return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
847 } 494 }
848 if(!empty($_POST['login']) && !empty($_POST['password'])) { 495 if (!empty($_POST['login']) && !empty($_POST['password'])) {
849 return array($_POST['login'],$_POST['password'],false); 496 return array($_POST['login'], $_POST['password'], false);
850 } 497 }
851 if(isset($_SERVER['REMOTE_USER'])) { 498 if (isset($_SERVER['REMOTE_USER'])) {
852 return array($_SERVER['REMOTE_USER'],'http_auth',true); 499 return array($_SERVER['REMOTE_USER'], 'http_auth', true);
853 } 500 }
854 501
855 return array(false,false,false); 502 return array(false, false, false);
856 } 503 }
857 504
858 /** 505 /**
@@ -901,9 +548,10 @@ class Poche
901 } 548 }
902 549
903 /** 550 /**
904 * import datas into your poche 551 * import datas into your wallabag
905 * @return boolean 552 * @return boolean
906 */ 553 */
554
907 public function import() { 555 public function import() {
908 556
909 if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) { 557 if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
@@ -935,98 +583,112 @@ class Poche
935 $read = ((sizeof($data) && $read)?0:1); 583 $read = ((sizeof($data) && $read)?0:1);
936 } 584 }
937 } 585 }
938 } 586 }
939 587
940 //for readability structure 588 // for readability structure
941 foreach ($data as $record) { 589
942 if (is_array($record)) { 590 foreach($data as $record) {
943 $data[] = $record; 591 if (is_array($record)) {
944 foreach ($record as $record2) { 592 $data[] = $record;
945 if (is_array($record2)) { 593 foreach($record as $record2) {
946 $data[] = $record2; 594 if (is_array($record2)) {
947 } 595 $data[] = $record2;
596 }
597 }
598 }
948 } 599 }
949 }
950 }
951 600
952 $urlsInserted = array(); //urls of articles inserted 601 $urlsInserted = array(); //urls of articles inserted
953 foreach ($data as $record) { 602 foreach($data as $record) {
954 $url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') ); 603 $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
955 if ( $url and !in_array($url, $urlsInserted) ) { 604 if ($url and !in_array($url, $urlsInserted)) {
956 $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>'); 605 $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
957 $body = (isset($record['content']) ? $record['content'] : ''); 606 $body = (isset($record['content']) ? $record['content'] : '');
958 $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0)); 607 $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
959 $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite'])?intval($record['favorite']):0) ); 608 $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite']) ? intval($record['favorite']) : 0));
960 //insert new record
961 $id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
962 if ( $id ) {
963 $urlsInserted[] = $url; //add
964
965 if ( isset($record['tags']) && trim($record['tags']) ) {
966 //@TODO: set tags
967 609
968 } 610 // insert new record
611
612 $id = $this->store->add($url, $title, $body, $this->user->getId() , $isFavorite, $isRead);
613 if ($id) {
614 $urlsInserted[] = $url; //add
615 if (isset($record['tags']) && trim($record['tags'])) {
616
617 // @TODO: set tags
618
619 }
620 }
621 }
622 }
623
624 $i = sizeof($urlsInserted);
625 if ($i > 0) {
626 $this->messages->add('s', _('Articles inserted: ') . $i . _('. Please note, that some may be marked as "read".'));
969 } 627 }
970 }
971 }
972 628
973 $i = sizeof($urlsInserted);
974 if ( $i > 0 ) {
975 $this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
976 }
977 Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); 629 Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
978 } 630 }
979 else { 631 else {
980 $this->messages->add('s', _('Did you forget to select a file?')); 632 $this->messages->add('s', _('Did you forget to select a file?'));
981 } 633 }
982 //file parsing finished here 634 // file parsing finished here
635 // now download article contents if any
636 // check if we need to download any content
983 637
984 //now download article contents if any 638 $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
985 639
986 //check if we need to download any content 640 if ($recordsDownloadRequired == 0) {
987 $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
988 if ( $recordsDownloadRequired == 0 ) {
989 //nothing to download
990 $this->messages->add('s', _('Import finished.'));
991 Tools::logm('Import finished completely');
992 Tools::redirect();
993 }
994 else {
995 //if just inserted - don't download anything, download will start in next reload
996 if ( !isset($_FILES['file']) ) {
997 //download next batch
998 Tools::logm('Fetching next batch of articles...');
999 $items = $this->store->retrieveUnfetchedEntries($this->user->getId(), IMPORT_LIMIT);
1000 641
1001 $purifier = $this->getPurifier(); 642 // nothing to download
1002 643
1003 foreach ($items as $item) { 644 $this->messages->add('s', _('Import finished.'));
1004 $url = new Url(base64_encode($item['url'])); 645 Tools::logm('Import finished completely');
1005 Tools::logm('Fetching article '.$item['id']); 646 Tools::redirect();
1006 $content = Tools::getPageContent($url); 647 }
648 else {
1007 649
1008 $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled')); 650 // if just inserted - don't download anything, download will start in next reload
1009 $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
1010 651
1011 //clean content to prevent xss attack 652 if (!isset($_FILES['file'])) {
1012 $title = $purifier->purify($title);
1013 $body = $purifier->purify($body);
1014 653
1015 $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId()); 654 // download next batch
1016 Tools::logm('Article '.$item['id'].' updated.'); 655
1017 } 656 Tools::logm('Fetching next batch of articles...');
657 $items = $this->store->retrieveUnfetchedEntries($this->user->getId() , IMPORT_LIMIT);
658 $purifier = $this->_getPurifier();
659 foreach($items as $item) {
660 $url = new Url(base64_encode($item['url']));
661 Tools::logm('Fetching article ' . $item['id']);
662 $content = Tools::getPageContent($url);
663 $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
664 $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
1018 665
666 // clean content to prevent xss attack
667
668 $title = $purifier->purify($title);
669 $body = $purifier->purify($body);
670 $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
671 Tools::logm('Article ' . $item['id'] . ' updated.');
672 }
673 }
1019 } 674 }
1020 }
1021 675
1022 return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) ); 676 return array(
677 'includeImport' => true,
678 'import' => array(
679 'recordsDownloadRequired' => $recordsDownloadRequired,
680 'recordsUnderDownload' => IMPORT_LIMIT,
681 'delay' => IMPORT_DELAY * 1000
682 )
683 );
1023 } 684 }
1024 685
1025 /** 686 /**
1026 * export poche entries in json 687 * export poche entries in json
1027 * @return json all poche entries 688 * @return json all poche entries
1028 */ 689 */
1029 public function export() { 690 public function export()
691 {
1030 $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json"; 692 $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
1031 header('Content-Disposition: attachment; filename='.$filename); 693 header('Content-Disposition: attachment; filename='.$filename);
1032 694
@@ -1042,7 +704,7 @@ class Poche
1042 * @param string $which 'prod' or 'dev' 704 * @param string $which 'prod' or 'dev'
1043 * @return string latest $which version 705 * @return string latest $which version
1044 */ 706 */
1045 private function getPocheVersion($which = 'prod') { 707 private function _getPocheVersion($which = 'prod') {
1046 $cache_file = CACHE . '/' . $which; 708 $cache_file = CACHE . '/' . $which;
1047 $check_time = time(); 709 $check_time = time();
1048 710
@@ -1057,29 +719,27 @@ class Poche
1057 return array($version, $check_time); 719 return array($version, $check_time);
1058 } 720 }
1059 721
1060 public function generateToken() 722 /**
723 * Update token for current user
724 */
725 public function updateToken()
1061 { 726 {
1062 if (ini_get('open_basedir') === '') { 727 $token = Tools::generateToken();
1063 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { 728 $this->store->updateUserConfig($this->user->getId(), 'token', $token);
1064 echo 'This is a server using Windows!'; 729 $currentConfig = $_SESSION['poche_user']->config;
1065 // alternative to /dev/urandom for Windows 730 $currentConfig['token'] = $token;
1066 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); 731 $_SESSION['poche_user']->setConfig($currentConfig);
1067 } else { 732 Tools::redirect();
1068 $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
1069 }
1070 }
1071 else {
1072 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
1073 }
1074
1075 $token = str_replace('+', '', $token);
1076 $this->store->updateUserConfig($this->user->getId(), 'token', $token);
1077 $currentConfig = $_SESSION['poche_user']->config;
1078 $currentConfig['token'] = $token;
1079 $_SESSION['poche_user']->setConfig($currentConfig);
1080 Tools::redirect();
1081 } 733 }
1082 734
735 /**
736 * Generate RSS feeds for current user
737 *
738 * @param $token
739 * @param $user_id
740 * @param $tag_id
741 * @param string $type
742 */
1083 public function generateFeeds($token, $user_id, $tag_id, $type = 'home') 743 public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
1084 { 744 {
1085 $allowed_types = array('home', 'fav', 'archive', 'tag'); 745 $allowed_types = array('home', 'fav', 'archive', 'tag');
@@ -1089,10 +749,9 @@ class Poche
1089 die(sprintf(_('User with this id (%d) does not exist.'), $user_id)); 749 die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
1090 } 750 }
1091 751
1092 if (!in_array($type, $allowed_types) || $token != $config['token']) { 752 if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) {
1093 die(_('Uh, there is a problem while generating feeds.')); 753 die(_('Uh, there is a problem while generating feed. Wrong token used?'));
1094 } 754 }
1095 // Check the token
1096 755
1097 $feed = new FeedWriter(RSS2); 756 $feed = new FeedWriter(RSS2);
1098 $feed->setTitle('wallabag — ' . $type . ' feed'); 757 $feed->setTitle('wallabag — ' . $type . ' feed');
@@ -1124,147 +783,22 @@ class Poche
1124 exit; 783 exit;
1125 } 784 }
1126 785
1127 public function emptyCache() {
1128 $files = new RecursiveIteratorIterator(
1129 new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
1130 RecursiveIteratorIterator::CHILD_FIRST
1131 );
1132 786
1133 foreach ($files as $fileinfo) {
1134 $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink');
1135 $todo($fileinfo->getRealPath());
1136 }
1137
1138 Tools::logm('empty cache');
1139 $this->messages->add('s', _('Cache deleted.'));
1140 Tools::redirect();
1141 }
1142 787
1143 /** 788 /**
1144 * return new purifier object with actual config 789 * Returns new purifier object with actual config
1145 */ 790 */
1146 protected function getPurifier() { 791 private function _getPurifier()
1147 $config = HTMLPurifier_Config::createDefault(); 792 {
1148 $config->set('Cache.SerializerPath', CACHE); 793 $config = HTMLPurifier_Config::createDefault();
1149 $config->set('HTML.SafeIframe', true); 794 $config->set('Cache.SerializerPath', CACHE);
795 $config->set('HTML.SafeIframe', true);
1150 796
1151 //allow YouTube, Vimeo and dailymotion videos 797 //allow YouTube, Vimeo and dailymotion videos
1152 $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%'); 798 $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
1153 799
1154 return new HTMLPurifier($config); 800 return new HTMLPurifier($config);
1155 } 801 }
1156 802
1157 /**
1158 * handle epub
1159 */
1160 public function createEpub() {
1161
1162 switch ($_GET['method']) {
1163 case 'id':
1164 $entryID = filter_var($_GET['id'],FILTER_SANITIZE_NUMBER_INT);
1165 $entry = $this->store->retrieveOneById($entryID, $this->user->getId());
1166 $entries = array($entry);
1167 $bookTitle = $entry['title'];
1168 $bookFileName = substr($bookTitle, 0, 200);
1169 break;
1170 case 'all':
1171 $entries = $this->store->retrieveAll($this->user->getId());
1172 $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
1173 $bookFileName = _('Allarticles') . date(_('dmY'));
1174 break;
1175 case 'tag':
1176 $tag = filter_var($_GET['tag'],FILTER_SANITIZE_STRING);
1177 $tags_id = $this->store->retrieveAllTags($this->user->getId(),$tag);
1178 $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
1179 $entries = $this->store->retrieveEntriesByTag($tag_id,$this->user->getId());
1180 $bookTitle = sprintf(_('Articles tagged %s'),$tag);
1181 $bookFileName = substr(sprintf(_('Tag %s'),$tag), 0, 200);
1182 break;
1183 case 'category':
1184 $category = filter_var($_GET['category'],FILTER_SANITIZE_STRING);
1185 $entries = $this->store->getEntriesByView($category,$this->user->getId());
1186 $bookTitle = sprintf(_('All articles in category %s'), $category);
1187 $bookFileName = substr(sprintf(_('Category %s'),$category), 0, 200);
1188 break;
1189 case 'search':
1190 $search = filter_var($_GET['search'],FILTER_SANITIZE_STRING);
1191 $entries = $this->store->search($search,$this->user->getId());
1192 $bookTitle = sprintf(_('All articles for search %s'), $search);
1193 $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
1194 break;
1195 case 'default':
1196 die(_('Uh, there is a problem while generating epub.'));
1197
1198 }
1199
1200 $content_start =
1201 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
1202 . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
1203 . "<head>"
1204 . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
1205 . "<title>wallabag articles book</title>\n"
1206 . "</head>\n"
1207 . "<body>\n";
1208
1209 $bookEnd = "</body>\n</html>\n";
1210
1211 $log = new Logger("wallabag", TRUE);
1212 $fileDir = CACHE;
1213
1214 $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
1215 $log->logLine("new EPub()");
1216 $log->logLine("EPub class version: " . EPub::VERSION);
1217 $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
1218 $log->logLine("Zip version: " . Zip::VERSION);
1219 $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
1220 $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
1221 803
1222 $book->setTitle(_('wallabag\'s articles'));
1223 $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
1224 //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
1225 $book->setDescription(_("Some articles saved on my wallabag"));
1226 $book->setAuthor("wallabag","wallabag");
1227 $book->setPublisher("wallabag","wallabag"); // I hope this is a non existant address :)
1228 $book->setDate(time()); // Strictly not needed as the book date defaults to time().
1229 //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
1230 $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
1231
1232 $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
1233 $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
1234
1235 $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
1236
1237 $log->logLine("Add Cover");
1238
1239 $fullTitle = "<h1> " . $bookTitle . "</h1>\n";
1240
1241 $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
1242
1243 $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $bookEnd;
1244
1245 //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
1246 $book->addChapter("Notices", "Cover2.html", $cover);
1247
1248 $book->buildTOC();
1249
1250 foreach ($entries as $entry) { //set tags as subjects
1251 $tags = $this->store->retrieveTagsByEntry($entry['id']);
1252 foreach ($tags as $tag) {
1253 $book->setSubject($tag['value']);
1254 }
1255
1256 $log->logLine("Set up parameters");
1257
1258 $chapter = $content_start . $entry['content'] . $bookEnd;
1259 $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
1260 $log->logLine("Added chapter " . $entry['title']);
1261 }
1262
1263 if (DEBUG_POCHE) {
1264 $epuplog = $book->getLog();
1265 $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
1266 }
1267 $book->finalize();
1268 $zipData = $book->sendBook($bookFileName);
1269 }
1270} 804}
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
new file mode 100755
index 00000000..004bd45a
--- /dev/null
+++ b/inc/poche/Routing.class.php
@@ -0,0 +1,153 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11class Routing
12{
13 protected $wallabag;
14 protected $referer;
15 protected $view;
16 protected $action;
17 protected $id;
18 protected $url;
19 protected $file;
20 protected $defaultVars = array();
21 protected $vars = array();
22
23 public function __construct(Poche $wallabag)
24 {
25 $this->wallabag = $wallabag;
26 $this->_init();
27 }
28
29 private function _init()
30 {
31 # Parse GET & REFERER vars
32 $this->referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
33 $this->view = Tools::checkVar('view', 'home');
34 $this->action = Tools::checkVar('action');
35 $this->id = Tools::checkVar('id');
36 $_SESSION['sort'] = Tools::checkVar('sort', 'id');
37 $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
38 }
39
40 public function run()
41 {
42 # vars to _always_ send to templates
43 $this->defaultVars = array(
44 'referer' => $this->referer,
45 'view' => $this->view,
46 'poche_url' => Tools::getPocheUrl(),
47 'title' => _('wallabag, a read it later open source system'),
48 'token' => \Session::getToken(),
49 'theme' => $this->wallabag->tpl->getTheme()
50 );
51
52 $this->_launchAction();
53 $this->_defineTplInformation();
54
55 # because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
56 $this->vars = array_merge($this->vars, array('messages' => $this->wallabag->messages->display('all', FALSE)));
57
58 $this->_render($this->file, $this->vars);
59 }
60
61 private function _defineTplInformation()
62 {
63 $tplFile = array();
64 $tplVars = array();
65
66 if (\Session::isLogged()) {
67 $this->wallabag->action($this->action, $this->url, $this->id);
68 $tplFile = Tools::getTplFile($this->view);
69 $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
70 } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
71 if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
72 $this->wallabag->login($this->referer);
73 } else {
74 $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
75 Tools::logm('user doesn\'t exist');
76 $tplFile = Tools::getTplFile('login');
77 $tplVars['http_auth'] = 1;
78 }
79 } elseif(isset($_SERVER['REMOTE_USER'])) {
80 if($this->wallabag->store->userExists($_SERVER['REMOTE_USER'])) {
81 $this->wallabag->login($this->referer);
82 } else {
83 $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
84 Tools::logm('user doesn\'t exist');
85 $tplFile = Tools::getTplFile('login');
86 $tplVars['http_auth'] = 1;
87 }
88 } else {
89 $tplFile = Tools::getTplFile('login');
90 $tplVars['http_auth'] = 0;
91 \Session::logout();
92 }
93
94 $this->file = $tplFile;
95 $this->vars = array_merge($this->defaultVars, $tplVars);
96 }
97
98 private function _launchAction()
99 {
100 if (isset($_GET['login'])) {
101 // hello to you
102 $this->wallabag->login($this->referer);
103 } elseif (isset($_GET['feed']) && isset($_GET['user_id'])) {
104 $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
105 $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']);
106 }
107
108 //allowed ONLY to logged in user
109 if (\Session::isLogged() === true)
110 {
111 if (isset($_GET['logout'])) {
112 // see you soon !
113 $this->wallabag->logout();
114 } elseif (isset($_GET['config'])) {
115 // update password
116 $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
117 } elseif (isset($_GET['newuser'])) {
118 $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
119 } elseif (isset($_GET['deluser'])) {
120 $this->wallabag->deleteUser($_POST['password4deletinguser']);
121 } elseif (isset($_GET['epub'])) {
122 $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']);
123 $epub->run();
124 } elseif (isset($_GET['import'])) {
125 $import = $this->wallabag->import();
126 $tplVars = array_merge($this->vars, $import);
127 } elseif (isset($_GET['download'])) {
128 Tools::downloadDb();
129 } elseif (isset($_GET['empty-cache'])) {
130 Tools::emptyCache();
131 } elseif (isset($_GET['export'])) {
132 $this->wallabag->export();
133 } elseif (isset($_GET['updatetheme'])) {
134 $this->wallabag->tpl->updateTheme($_POST['theme']);
135 } elseif (isset($_GET['updatelanguage'])) {
136 $this->wallabag->language->updateLanguage($_POST['language']);
137 } elseif (isset($_GET['uploadfile'])) {
138 $this->wallabag->uploadFile();
139 } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') {
140 $this->wallabag->updateToken();
141 }
142 elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
143 $plainUrl = new Url(base64_encode($_GET['plainurl']));
144 $this->wallabag->action('add', $plainUrl);
145 }
146 }
147 }
148
149 public function _render($file, $vars)
150 {
151 echo $this->wallabag->tpl->render($file, $vars);
152 }
153} \ No newline at end of file
diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php
new file mode 100644
index 00000000..b686f2ec
--- /dev/null
+++ b/inc/poche/Template.class.php
@@ -0,0 +1,235 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11class Template extends Twig_Environment
12{
13 protected $wallabag;
14
15 private $canRenderTemplates = TRUE;
16 private $currentTheme = '';
17
18 public function __construct(Poche $wallabag)
19 {
20 $this->wallabag = $wallabag;
21
22 // Set up theme
23 $pocheUser = Session::getParam('poche_user');
24
25 $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
26
27 if ($themeDirectory === false) {
28 $themeDirectory = DEFAULT_THEME;
29 }
30
31 $this->currentTheme = $themeDirectory;
32
33 if ($this->_themeIsInstalled() === array()) {
34 $this->_init();
35 }
36 }
37
38 /**
39 * Returns true if selected theme is installed
40 *
41 * @return bool
42 */
43 private function _themeIsInstalled()
44 {
45 $errors = array();
46
47 // Twig is an absolute requirement for wallabag to function.
48 // Abort immediately if the Composer installer hasn't been run yet
49 if (!$this->canRenderTemplates) {
50 $errors[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download <a href="http://wllbg.org/vendor">vendor.zip</a> and extract it in your wallabag folder.';
51 }
52
53 // Check if the selected theme and its requirements are present
54 $theme = $this->getTheme();
55 if ($theme != '' && !is_dir(THEME . '/' . $theme)) {
56 $errors[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
57 $this->canRenderTemplates = FALSE;
58 }
59
60 $themeInfo = $this->getThemeInfo($theme);
61 if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
62 foreach ($themeInfo['requirements'] as $requiredTheme) {
63 if (! is_dir(THEME . '/' . $requiredTheme)) {
64 $errors[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
65 $this->canRenderTemplates = FALSE;
66 }
67 }
68 }
69
70 $currentErrors = (is_null(Session::getParam('errors'))? array() : Session::getParam('errors'));
71 Session::setParam('errors', array_merge($errors, $currentErrors));
72
73 return $errors;
74 }
75
76 /**
77 * Initialization for templates
78 */
79 private function _init()
80 {
81 $loaderChain = new Twig_Loader_Chain();
82 $theme = $this->getTheme();
83
84 // add the current theme as first to the loader chain
85 // so Twig will look there first for overridden template files
86 try {
87 $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
88 } catch (Twig_Error_Loader $e) {
89 # @todo isInstalled() should catch this, inject Twig later
90 die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
91 }
92
93 // add all required themes to the loader chain
94 $themeInfo = $this->getThemeInfo($theme);
95 if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
96 foreach ($themeInfo['requirements'] as $requiredTheme) {
97 try {
98 $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
99 } catch (Twig_Error_Loader $e) {
100 # @todo isInstalled() should catch this, inject Twig later
101 die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
102 }
103 }
104 }
105
106 if (DEBUG_POCHE) {
107 $twigParams = array();
108 } else {
109 $twigParams = array('cache' => CACHE);
110 }
111
112 parent::__construct($loaderChain, $twigParams);
113
114 //$tpl = new Twig_Environment($loaderChain, $twigParams);
115 $this->addExtension(new Twig_Extensions_Extension_I18n());
116
117 # filter to display domain name of an url
118 $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
119 $this->addFilter($filter);
120
121 # filter for reading time
122 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
123 $this->addFilter($filter);
124 }
125
126 /**
127 * Returns current theme
128 *
129 * @return string
130 */
131 public function getTheme()
132 {
133 return $this->currentTheme;
134 }
135
136 /**
137 * Provides theme information by parsing theme.ini file if present in the theme's root directory.
138 * In all cases, the following data will be returned:
139 * - name: theme's name, or key if the theme is unnamed,
140 * - current: boolean informing if the theme is the current user theme.
141 *
142 * @param string $theme Theme key (directory name)
143 * @return array|boolean Theme information, or false if the theme doesn't exist.
144 */
145 public function getThemeInfo($theme)
146 {
147 if (!is_dir(THEME . '/' . $theme)) {
148 return false;
149 }
150
151 $themeIniFile = THEME . '/' . $theme . '/theme.ini';
152 $themeInfo = array();
153
154 if (is_file($themeIniFile) && is_readable($themeIniFile)) {
155 $themeInfo = parse_ini_file($themeIniFile);
156 }
157
158 if ($themeInfo === false) {
159 $themeInfo = array();
160 }
161
162 if (!isset($themeInfo['name'])) {
163 $themeInfo['name'] = $theme;
164 }
165
166 $themeInfo['current'] = ($theme === $this->getTheme());
167
168 return $themeInfo;
169 }
170
171 /**
172 * Returns an array with installed themes
173 *
174 * @return array
175 */
176 public function getInstalledThemes()
177 {
178 $handle = opendir(THEME);
179 $themes = array();
180
181 while (($theme = readdir($handle)) !== false) {
182 # Themes are stored in a directory, so all directory names are themes
183 # @todo move theme installation data to database
184 if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
185 continue;
186 }
187
188 $themes[$theme] = $this->getThemeInfo($theme);
189 }
190
191 ksort($themes);
192
193 return $themes;
194 }
195
196 /**
197 * Update theme for the current user
198 *
199 * @param $newTheme
200 */
201 public function updateTheme($newTheme)
202 {
203 # we are not going to change it to the current theme...
204 if ($newTheme == $this->getTheme()) {
205 $this->wallabag->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
206 Tools::redirect('?view=config');
207 }
208
209 $themes = $this->getInstalledThemes();
210 $actualTheme = false;
211
212 foreach (array_keys($themes) as $theme) {
213 if ($theme == $newTheme) {
214 $actualTheme = true;
215 break;
216 }
217 }
218
219 if (!$actualTheme) {
220 $this->wallabag->messages->add('e', _('that theme does not seem to be installed'));
221 Tools::redirect('?view=config');
222 }
223
224 $this->wallabag->store->updateUserConfig($this->wallabag->user->getId(), 'theme', $newTheme);
225 $this->wallabag->messages->add('s', _('you have changed your theme preferences'));
226
227 $currentConfig = $_SESSION['poche_user']->config;
228 $currentConfig['theme'] = $newTheme;
229
230 $_SESSION['poche_user']->setConfig($currentConfig);
231
232 Tools::emptyCache();
233 Tools::redirect('?view=config');
234 }
235} \ No newline at end of file
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index cc01f403..63137d76 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -5,19 +5,18 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class Tools 11final class Tools
12{ 12{
13 /**
14 * Initialize PHP environment
15 */
13 public static function initPhp() 16 public static function initPhp()
14 { 17 {
15 define('START_TIME', microtime(true)); 18 define('START_TIME', microtime(true));
16 19
17 if (phpversion() < 5) {
18 die(_('Oops, it seems you don\'t have PHP 5.'));
19 }
20
21 function stripslashesDeep($value) { 20 function stripslashesDeep($value) {
22 return is_array($value) 21 return is_array($value)
23 ? array_map('stripslashesDeep', $value) 22 ? array_map('stripslashesDeep', $value)
@@ -34,6 +33,11 @@ class Tools
34 register_shutdown_function('ob_end_flush'); 33 register_shutdown_function('ob_end_flush');
35 } 34 }
36 35
36 /**
37 * Get wallabag instance URL
38 *
39 * @return string
40 */
37 public static function getPocheUrl() 41 public static function getPocheUrl()
38 { 42 {
39 $https = (!empty($_SERVER['HTTPS']) 43 $https = (!empty($_SERVER['HTTPS'])
@@ -67,6 +71,11 @@ class Tools
67 . $host . $serverport . $scriptname; 71 . $host . $serverport . $scriptname;
68 } 72 }
69 73
74 /**
75 * Redirects to a URL
76 *
77 * @param string $url
78 */
70 public static function redirect($url = '') 79 public static function redirect($url = '')
71 { 80 {
72 if ($url === '') { 81 if ($url === '') {
@@ -87,11 +96,18 @@ class Tools
87 $url = $ref; 96 $url = $ref;
88 } 97 }
89 } 98 }
99
90 self::logm('redirect to ' . $url); 100 self::logm('redirect to ' . $url);
91 header('Location: '.$url); 101 header('Location: '.$url);
92 exit(); 102 exit();
93 } 103 }
94 104
105 /**
106 * Returns name of the template file to display
107 *
108 * @param $view
109 * @return string
110 */
95 public static function getTplFile($view) 111 public static function getTplFile($view)
96 { 112 {
97 $views = array( 113 $views = array(
@@ -99,13 +115,15 @@ class Tools
99 'edit-tags', 'view', 'login', 'error' 115 'edit-tags', 'view', 'login', 'error'
100 ); 116 );
101 117
102 if (in_array($view, $views)) { 118 return (in_array($view, $views) ? $view . '.twig' : 'home.twig');
103 return $view . '.twig';
104 }
105
106 return 'home.twig';
107 } 119 }
108 120
121 /**
122 * Download a file (typically, for downloading pictures on web server)
123 *
124 * @param $url
125 * @return bool|mixed|string
126 */
109 public static function getFile($url) 127 public static function getFile($url)
110 { 128 {
111 $timeout = 15; 129 $timeout = 15;
@@ -186,6 +204,11 @@ class Tools
186 } 204 }
187 } 205 }
188 206
207 /**
208 * Headers for JSON export
209 *
210 * @param $data
211 */
189 public static function renderJson($data) 212 public static function renderJson($data)
190 { 213 {
191 header('Cache-Control: no-cache, must-revalidate'); 214 header('Cache-Control: no-cache, must-revalidate');
@@ -195,6 +218,11 @@ class Tools
195 exit(); 218 exit();
196 } 219 }
197 220
221 /**
222 * Create new line in log file
223 *
224 * @param $message
225 */
198 public static function logm($message) 226 public static function logm($message)
199 { 227 {
200 if (DEBUG_POCHE && php_sapi_name() != 'cli') { 228 if (DEBUG_POCHE && php_sapi_name() != 'cli') {
@@ -204,36 +232,57 @@ class Tools
204 } 232 }
205 } 233 }
206 234
235 /**
236 * Encode a URL by using a salt
237 *
238 * @param $string
239 * @return string
240 */
207 public static function encodeString($string) 241 public static function encodeString($string)
208 { 242 {
209 return sha1($string . SALT); 243 return sha1($string . SALT);
210 } 244 }
211 245
246 /**
247 * Cleans a variable
248 *
249 * @param $var
250 * @param string $default
251 * @return string
252 */
212 public static function checkVar($var, $default = '') 253 public static function checkVar($var, $default = '')
213 { 254 {
214 return ((isset ($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default); 255 return ((isset($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
215 } 256 }
216 257
258 /**
259 * Returns the domain name for a URL
260 *
261 * @param $url
262 * @return string
263 */
217 public static function getDomain($url) 264 public static function getDomain($url)
218 { 265 {
219 return parse_url($url, PHP_URL_HOST); 266 return parse_url($url, PHP_URL_HOST);
220 } 267 }
221 268
222 public static function getReadingTime($text) { 269 /**
223 $word = str_word_count(strip_tags($text)); 270 * For a given text, we calculate reading time for an article
224 $minutes = floor($word / 200); 271 *
225 $seconds = floor($word % 200 / (200 / 60)); 272 * @param $text
226 $time = array('minutes' => $minutes, 'seconds' => $seconds); 273 * @return float
227 274 */
228 return $minutes; 275 public static function getReadingTime($text)
229 } 276 {
230 277 return floor(str_word_count(strip_tags($text)) / 200);
231 public static function getDocLanguage($userlanguage) {
232 $lang = explode('.', $userlanguage);
233 return str_replace('_', '-', $lang[0]);
234 } 278 }
235 279
236 public static function status($status_code) 280 /**
281 * Returns the correct header for a status code
282 *
283 * @param $status_code
284 */
285 private static function _status($status_code)
237 { 286 {
238 if (strpos(php_sapi_name(), 'apache') !== false) { 287 if (strpos(php_sapi_name(), 'apache') !== false) {
239 288
@@ -245,9 +294,13 @@ class Tools
245 } 294 }
246 } 295 }
247 296
248 public static function download_db() { 297 /**
298 * Download the sqlite database
299 */
300 public static function downloadDb()
301 {
249 header('Content-Disposition: attachment; filename="poche.sqlite.gz"'); 302 header('Content-Disposition: attachment; filename="poche.sqlite.gz"');
250 self::status(200); 303 self::_status(200);
251 304
252 header('Content-Transfer-Encoding: binary'); 305 header('Content-Transfer-Encoding: binary');
253 header('Content-Type: application/octet-stream'); 306 header('Content-Type: application/octet-stream');
@@ -256,18 +309,24 @@ class Tools
256 exit; 309 exit;
257 } 310 }
258 311
312 /**
313 * Get the content for a given URL (by a call to FullTextFeed)
314 *
315 * @param Url $url
316 * @return mixed
317 */
259 public static function getPageContent(Url $url) 318 public static function getPageContent(Url $url)
260 { 319 {
261 // Saving and clearing context 320 // Saving and clearing context
262 $REAL = array(); 321 $REAL = array();
263 foreach( $GLOBALS as $key => $value ) { 322 foreach( $GLOBALS as $key => $value ) {
264 if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) { 323 if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
265 $GLOBALS[$key] = array(); 324 $GLOBALS[$key] = array();
266 $REAL[$key] = $value; 325 $REAL[$key] = $value;
267 } 326 }
268 } 327 }
269 // Saving and clearing session 328 // Saving and clearing session
270 if ( isset($_SESSION) ) { 329 if (isset($_SESSION)) {
271 $REAL_SESSION = array(); 330 $REAL_SESSION = array();
272 foreach( $_SESSION as $key => $value ) { 331 foreach( $_SESSION as $key => $value ) {
273 $REAL_SESSION[$key] = $value; 332 $REAL_SESSION[$key] = $value;
@@ -279,12 +338,12 @@ class Tools
279 $scope = function() { 338 $scope = function() {
280 extract( func_get_arg(1) ); 339 extract( func_get_arg(1) );
281 $_GET = $_REQUEST = array( 340 $_GET = $_REQUEST = array(
282 "url" => $url->getUrl(), 341 "url" => $url->getUrl(),
283 "max" => 5, 342 "max" => 5,
284 "links" => "preserve", 343 "links" => "preserve",
285 "exc" => "", 344 "exc" => "",
286 "format" => "json", 345 "format" => "json",
287 "submit" => "Create Feed" 346 "submit" => "Create Feed"
288 ); 347 );
289 ob_start(); 348 ob_start();
290 require func_get_arg(0); 349 require func_get_arg(0);
@@ -292,23 +351,26 @@ class Tools
292 ob_end_clean(); 351 ob_end_clean();
293 return $json; 352 return $json;
294 }; 353 };
295 $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) ); 354
355 $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
296 356
297 // Clearing and restoring context 357 // Clearing and restoring context
298 foreach( $GLOBALS as $key => $value ) { 358 foreach ($GLOBALS as $key => $value) {
299 if( $key != "GLOBALS" && $key != "_SESSION" ) { 359 if($key != "GLOBALS" && $key != "_SESSION" ) {
300 unset($GLOBALS[$key]); 360 unset($GLOBALS[$key]);
301 } 361 }
302 } 362 }
303 foreach( $REAL as $key => $value ) { 363 foreach ($REAL as $key => $value) {
304 $GLOBALS[$key] = $value; 364 $GLOBALS[$key] = $value;
305 } 365 }
366
306 // Clearing and restoring session 367 // Clearing and restoring session
307 if ( isset($REAL_SESSION) ) { 368 if (isset($REAL_SESSION)) {
308 foreach( $_SESSION as $key => $value ) { 369 foreach($_SESSION as $key => $value) {
309 unset($_SESSION[$key]); 370 unset($_SESSION[$key]);
310 } 371 }
311 foreach( $REAL_SESSION as $key => $value ) { 372
373 foreach($REAL_SESSION as $key => $value) {
312 $_SESSION[$key] = $value; 374 $_SESSION[$key] = $value;
313 } 375 }
314 } 376 }
@@ -318,11 +380,48 @@ class Tools
318 380
319 /** 381 /**
320 * Returns whether we handle an AJAX (XMLHttpRequest) request. 382 * Returns whether we handle an AJAX (XMLHttpRequest) request.
383 *
321 * @return boolean whether we handle an AJAX (XMLHttpRequest) request. 384 * @return boolean whether we handle an AJAX (XMLHttpRequest) request.
322 */ 385 */
323 public static function isAjaxRequest() 386 public static function isAjaxRequest()
324 { 387 {
325 return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest'; 388 return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest';
389 }
390
391 /*
392 * Empty cache folder
393 */
394 public static function emptyCache()
395 {
396 $files = new RecursiveIteratorIterator(
397 new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
398 RecursiveIteratorIterator::CHILD_FIRST
399 );
400
401 foreach ($files as $fileInfo) {
402 $todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
403 $todo($fileInfo->getRealPath());
404 }
405
406 Tools::logm('empty cache');
407 Tools::redirect();
408 }
409
410 public static function generateToken()
411 {
412 if (ini_get('open_basedir') === '') {
413 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
414 // alternative to /dev/urandom for Windows
415 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
416 } else {
417 $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
418 }
419 }
420 else {
421 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
422 }
423
424 return str_replace('+', '', $token);
326 } 425 }
327 426
328} 427}
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index aba236fa..d9172b7d 100644
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
@@ -5,7 +5,7 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class Url 11class Url
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php
index cc8bec65..eaadd3e5 100644
--- a/inc/poche/User.class.php
+++ b/inc/poche/User.class.php
@@ -5,7 +5,7 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class User 11class User
@@ -44,7 +44,14 @@ class User
44 $this->config = $config; 44 $this->config = $config;
45 } 45 }
46 46
47 public function getConfigValue($name) { 47 /**
48 * Returns configuration entry for a user
49 *
50 * @param $name
51 * @return bool
52 */
53 public function getConfigValue($name)
54 {
48 return (isset($this->config[$name])) ? $this->config[$name] : FALSE; 55 return (isset($this->config[$name])) ? $this->config[$name] : FALSE;
49 } 56 }
50} \ No newline at end of file 57} \ No newline at end of file
diff --git a/inc/poche/WallabagEpub.class.php b/inc/poche/WallabagEpub.class.php
new file mode 100644
index 00000000..b81d9bfd
--- /dev/null
+++ b/inc/poche/WallabagEpub.class.php
@@ -0,0 +1,137 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11class WallabagEpub
12{
13 protected $wallabag;
14 protected $method;
15 protected $id;
16 protected $value;
17
18 public function __construct(Poche $wallabag, $method, $id, $value)
19 {
20 $this->wallabag = $wallabag;
21 $this->method = $method;
22 $this->id = $id;
23 $this->value = $value;
24 }
25
26 /**
27 * handle ePub
28 */
29 public function run()
30 {
31 switch ($this->method) {
32 case 'id':
33 $entryID = filter_var($this->id, FILTER_SANITIZE_NUMBER_INT);
34 $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId());
35 $entries = array($entry);
36 $bookTitle = $entry['title'];
37 $bookFileName = substr($bookTitle, 0, 200);
38 break;
39 case 'all':
40 $entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId());
41 $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
42 $bookFileName = _('Allarticles') . date(_('dmY'));
43 break;
44 case 'tag':
45 $tag = filter_var($this->value, FILTER_SANITIZE_STRING);
46 $tags_id = $this->wallabag->store->retrieveAllTags($this->wallabag->user->getId(), $tag);
47 $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
48 $entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId());
49 $bookTitle = sprintf(_('Articles tagged %s'), $tag);
50 $bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200);
51 break;
52 case 'category':
53 $category = filter_var($this->value, FILTER_SANITIZE_STRING);
54 $entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId());
55 $bookTitle = sprintf(_('All articles in category %s'), $category);
56 $bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200);
57 break;
58 case 'search':
59 $search = filter_var($this->value, FILTER_SANITIZE_STRING);
60 $entries = $this->store->search($search, $this->wallabag->user->getId());
61 $bookTitle = sprintf(_('All articles for search %s'), $search);
62 $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
63 break;
64 case 'default':
65 die(_('Uh, there is a problem while generating epub.'));
66 }
67
68 $content_start =
69 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
70 . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
71 . "<head>"
72 . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
73 . "<title>wallabag articles book</title>\n"
74 . "</head>\n"
75 . "<body>\n";
76
77 $bookEnd = "</body>\n</html>\n";
78
79 $log = new Logger("wallabag", TRUE);
80 $fileDir = CACHE;
81
82 $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
83 $log->logLine("new EPub()");
84 $log->logLine("EPub class version: " . EPub::VERSION);
85 $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
86 $log->logLine("Zip version: " . Zip::VERSION);
87 $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
88 $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
89
90 $book->setTitle(_('wallabag\'s articles'));
91 $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
92 //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
93 $book->setDescription(_("Some articles saved on my wallabag"));
94 $book->setAuthor("wallabag", "wallabag");
95 $book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :)
96 $book->setDate(time()); // Strictly not needed as the book date defaults to time().
97 //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
98 $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
99
100 $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
101 $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
102
103 $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
104
105 $log->logLine("Add Cover");
106
107 $fullTitle = "<h1> " . $bookTitle . "</h1>\n";
108
109 $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
110
111 $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $bookEnd;
112
113 //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
114 $book->addChapter("Notices", "Cover2.html", $cover);
115
116 $book->buildTOC();
117
118 foreach ($entries as $entry) { //set tags as subjects
119 $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
120 foreach ($tags as $tag) {
121 $book->setSubject($tag['value']);
122 }
123
124 $log->logLine("Set up parameters");
125
126 $chapter = $content_start . $entry['content'] . $bookEnd;
127 $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
128 $log->logLine("Added chapter " . $entry['title']);
129 }
130
131 if (DEBUG_POCHE) {
132 $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
133 }
134 $book->finalize();
135 $zipData = $book->sendBook($bookFileName);
136 }
137} \ No newline at end of file
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 95f727c6..6f03af18 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -5,7 +5,7 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11@define ('SALT', ''); # put a strong string here 11@define ('SALT', ''); # put a strong string here
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 8cf86d03..b8c487e3 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -5,7 +5,7 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11# the poche system root directory (/inc) 11# the poche system root directory (/inc)
@@ -18,6 +18,11 @@ require_once INCLUDES . '/poche/Tools.class.php';
18require_once INCLUDES . '/poche/User.class.php'; 18require_once INCLUDES . '/poche/User.class.php';
19require_once INCLUDES . '/poche/Url.class.php'; 19require_once INCLUDES . '/poche/Url.class.php';
20require_once INCLUDES . '/3rdparty/class.messages.php'; 20require_once INCLUDES . '/3rdparty/class.messages.php';
21require_once ROOT . '/vendor/autoload.php';
22require_once INCLUDES . '/poche/Template.class.php';
23require_once INCLUDES . '/poche/Language.class.php';
24require_once INCLUDES . '/poche/Routing.class.php';
25require_once INCLUDES . '/poche/WallabagEpub.class.php';
21require_once INCLUDES . '/poche/Poche.class.php'; 26require_once INCLUDES . '/poche/Poche.class.php';
22 27
23require_once INCLUDES . '/poche/Database.class.php'; 28require_once INCLUDES . '/poche/Database.class.php';
@@ -36,25 +41,18 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
36require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; 41require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
37require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; 42require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
38 43
39# Composer its autoloader for automatically loading Twig
40if (! file_exists(ROOT . '/vendor/autoload.php')) {
41 Poche::$canRenderTemplates = false;
42} else {
43 require_once ROOT . '/vendor/autoload.php';
44}
45
46# system configuration; database credentials et caetera 44# system configuration; database credentials et caetera
47if (! file_exists(INCLUDES . '/poche/config.inc.php')) { 45require_once INCLUDES . '/poche/config.inc.php';
48 Poche::$configFileAvailable = false; 46require_once INCLUDES . '/poche/config.inc.default.php';
49} else {
50 require_once INCLUDES . '/poche/config.inc.php';
51 require_once INCLUDES . '/poche/config.inc.default.php';
52}
53 47
54if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { 48if (DOWNLOAD_PICTURES) {
55 require_once INCLUDES . '/poche/pochePictures.php'; 49 require_once INCLUDES . '/poche/pochePictures.php';
56} 50}
57 51
58if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) { 52if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
59 date_default_timezone_set('UTC'); 53 date_default_timezone_set('UTC');
60} \ No newline at end of file 54}
55
56if (defined('ERROR_REPORTING')) {
57 error_reporting(ERROR_REPORTING);
58}
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index 7c319a85..7a914f90 100644
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
@@ -5,154 +5,164 @@
5 * @category wallabag 5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11/** 11
12 * On modifie les URLS des images dans le corps de l'article 12final class Picture
13 */
14function filtre_picture($content, $url, $id)
15{ 13{
16 $matches = array(); 14 /**
17 $processing_pictures = array(); // list of processing image to avoid processing the same pictures twice 15 * Changing pictures URL in article content
18 preg_match_all('#<\s*(img)[^>]+src="([^"]*)"[^>]*>#Si', $content, $matches, PREG_SET_ORDER); 16 */
19 foreach($matches as $i => $link) { 17 public static function filterPicture($content, $url, $id)
20 $link[1] = trim($link[1]); 18 {
21 if (!preg_match('#^(([a-z]+://)|(\#))#', $link[1])) { 19 $matches = array();
22 $absolute_path = get_absolute_link($link[2],$url); 20 $processing_pictures = array(); // list of processing image to avoid processing the same pictures twice
23 $filename = basename(parse_url($absolute_path, PHP_URL_PATH)); 21 preg_match_all('#<\s*(img)[^>]+src="([^"]*)"[^>]*>#Si', $content, $matches, PREG_SET_ORDER);
24 $directory = create_assets_directory($id); 22 foreach($matches as $i => $link) {
25 $fullpath = $directory . '/' . $filename; 23 $link[1] = trim($link[1]);
26 24 if (!preg_match('#^(([a-z]+://)|(\#))#', $link[1])) {
27 if (in_array($absolute_path, $processing_pictures) === true) { 25 $absolute_path = self::_getAbsoluteLink($link[2], $url);
28 // replace picture's URL only if processing is OK : already processing -> go to next picture 26 $filename = basename(parse_url($absolute_path, PHP_URL_PATH));
29 continue; 27 $directory = self::_createAssetsDirectory($id);
28 $fullpath = $directory . '/' . $filename;
29
30 if (in_array($absolute_path, $processing_pictures) === true) {
31 // replace picture's URL only if processing is OK : already processing -> go to next picture
32 continue;
33 }
34
35 if (self::_downloadPictures($absolute_path, $fullpath) === true) {
36 $content = str_replace($matches[$i][2], $fullpath, $content);
37 }
38
39 $processing_pictures[] = $absolute_path;
30 } 40 }
31
32 if (download_pictures($absolute_path, $fullpath) === true) {
33 $content = str_replace($matches[$i][2], $fullpath, $content);
34 }
35
36 $processing_pictures[] = $absolute_path;
37 } 41 }
38 42
43 return $content;
39 } 44 }
40 45
41 return $content; 46 /**
42} 47 * Get absolute URL
48 */
49 private static function _getAbsoluteLink($relativeLink, $url)
50 {
51 /* return if already absolute URL */
52 if (parse_url($relativeLink, PHP_URL_SCHEME) != '') return $relativeLink;
43 53
44/** 54 /* queries and anchors */
45 * Retourne le lien absolu 55 if ($relativeLink[0]=='#' || $relativeLink[0]=='?') return $url . $relativeLink;
46 */
47function get_absolute_link($relative_link, $url) {
48 /* return if already absolute URL */
49 if (parse_url($relative_link, PHP_URL_SCHEME) != '') return $relative_link;
50 56
51 /* queries and anchors */ 57 /* parse base URL and convert to local variables:
52 if ($relative_link[0]=='#' || $relative_link[0]=='?') return $url . $relative_link; 58 $scheme, $host, $path */
59 extract(parse_url($url));
53 60
54 /* parse base URL and convert to local variables: 61 /* remove non-directory element from path */
55 $scheme, $host, $path */ 62 $path = preg_replace('#/[^/]*$#', '', $path);
56 extract(parse_url($url));
57 63
58 /* remove non-directory element from path */ 64 /* destroy path if relative url points to root */
59 $path = preg_replace('#/[^/]*$#', '', $path); 65 if ($relativeLink[0] == '/') $path = '';
60 66
61 /* destroy path if relative url points to root */ 67 /* dirty absolute URL */
62 if ($relative_link[0] == '/') $path = ''; 68 $abs = $host . $path . '/' . $relativeLink;
63 69
64 /* dirty absolute URL */ 70 /* replace '//' or '/./' or '/foo/../' with '/' */
65 $abs = $host . $path . '/' . $relative_link; 71 $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#');
72 for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {}
66 73
67 /* replace '//' or '/./' or '/foo/../' with '/' */ 74 /* absolute URL is ready! */
68 $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#'); 75 return $scheme.'://'.$abs;
69 for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {} 76 }
70 77
71 /* absolute URL is ready! */ 78 /**
72 return $scheme.'://'.$abs; 79 * Downloading pictures
73} 80 *
81 * @return bool true if the download and processing is OK, false else
82 */
83 private static function _downloadPictures($absolute_path, $fullpath)
84 {
85 $rawdata = Tools::getFile($absolute_path);
86 $fullpath = urldecode($fullpath);
87
88 if(file_exists($fullpath)) {
89 unlink($fullpath);
90 }
74 91
75/** 92 // check extension
76 * Téléchargement des images 93 $file_ext = strrchr($fullpath, '.');
77 * 94 $whitelist = array(".jpg",".jpeg",".gif",".png");
78 * @return bool true if the download and processing is OK, false else 95 if (!(in_array($file_ext, $whitelist))) {
79 */ 96 Tools::logm('processed image with not allowed extension. Skipping ' . $fullpath);
80function download_pictures($absolute_path, $fullpath) 97 return false;
81{ 98 }
82 $rawdata = Tools::getFile($absolute_path);
83 $fullpath = urldecode($fullpath);
84 99
85 if(file_exists($fullpath)) { 100 // check headers
86 unlink($fullpath); 101 $imageinfo = getimagesize($absolute_path);
87 } 102 if ($imageinfo['mime'] != 'image/gif' && $imageinfo['mime'] != 'image/jpeg'&& $imageinfo['mime'] != 'image/jpg'&& $imageinfo['mime'] != 'image/png') {
88 103 Tools::logm('processed image with bad header. Skipping ' . $fullpath);
89 // check extension 104 return false;
90 $file_ext = strrchr($fullpath, '.'); 105 }
91 $whitelist = array(".jpg",".jpeg",".gif",".png");
92 if (!(in_array($file_ext, $whitelist))) {
93 Tools::logm('processed image with not allowed extension. Skipping ' . $fullpath);
94 return false;
95 }
96
97 // check headers
98 $imageinfo = getimagesize($absolute_path);
99 if ($imageinfo['mime'] != 'image/gif' && $imageinfo['mime'] != 'image/jpeg'&& $imageinfo['mime'] != 'image/jpg'&& $imageinfo['mime'] != 'image/png') {
100 Tools::logm('processed image with bad header. Skipping ' . $fullpath);
101 return false;
102 }
103
104 // regenerate image
105 $im = imagecreatefromstring($rawdata);
106 if ($im === false) {
107 Tools::logm('error while regenerating image ' . $fullpath);
108 return false;
109 }
110
111 switch ($imageinfo['mime']) {
112 case 'image/gif':
113 $result = imagegif($im, $fullpath);
114 break;
115 case 'image/jpeg':
116 case 'image/jpg':
117 $result = imagejpeg($im, $fullpath, REGENERATE_PICTURES_QUALITY);
118 break;
119 case 'image/png':
120 $result = imagepng($im, $fullpath, ceil(REGENERATE_PICTURES_QUALITY / 100 * 9));
121 break;
122 }
123 imagedestroy($im);
124
125 return $result;
126}
127 106
128/** 107 // regenerate image
129 * Crée un répertoire de médias pour l'article 108 $im = imagecreatefromstring($rawdata);
130 */ 109 if ($im === false) {
131function create_assets_directory($id) 110 Tools::logm('error while regenerating image ' . $fullpath);
132{ 111 return false;
133 $assets_path = ABS_PATH; 112 }
134 if(!is_dir($assets_path)) { 113
135 mkdir($assets_path, 0715); 114 switch ($imageinfo['mime']) {
136 } 115 case 'image/gif':
116 $result = imagegif($im, $fullpath);
117 break;
118 case 'image/jpeg':
119 case 'image/jpg':
120 $result = imagejpeg($im, $fullpath, REGENERATE_PICTURES_QUALITY);
121 break;
122 case 'image/png':
123 $result = imagepng($im, $fullpath, ceil(REGENERATE_PICTURES_QUALITY / 100 * 9));
124 break;
125 }
126 imagedestroy($im);
137 127
138 $article_directory = $assets_path . $id; 128 return $result;
139 if(!is_dir($article_directory)) {
140 mkdir($article_directory, 0715);
141 } 129 }
142 130
143 return $article_directory; 131 /**
144} 132 * Create a directory for an article
133 *
134 * @param $id ID of the article
135 * @return string
136 */
137 private static function _createAssetsDirectory($id)
138 {
139 $assets_path = ABS_PATH;
140 if (!is_dir($assets_path)) {
141 mkdir($assets_path, 0715);
142 }
145 143
146/** 144 $article_directory = $assets_path . $id;
147 * Suppression du répertoire d'images 145 if (!is_dir($article_directory)) {
148 */ 146 mkdir($article_directory, 0715);
149function remove_directory($directory) 147 }
150{ 148
151 if(is_dir($directory)) { 149 return $article_directory;
152 $files = array_diff(scandir($directory), array('.','..')); 150 }
153 foreach ($files as $file) { 151
154 (is_dir("$directory/$file")) ? remove_directory("$directory/$file") : unlink("$directory/$file"); 152 /**
153 * Remove the directory
154 *
155 * @param $directory
156 * @return bool
157 */
158 public static function removeDirectory($directory)
159 {
160 if (is_dir($directory)) {
161 $files = array_diff(scandir($directory), array('.','..'));
162 foreach ($files as $file) {
163 (is_dir("$directory/$file")) ? self::removeDirectory("$directory/$file") : unlink("$directory/$file");
164 }
165 return rmdir($directory);
155 } 166 }
156 return rmdir($directory);
157 } 167 }
158} 168} \ No newline at end of file