pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into register

Browse Source
This commit is contained in:
Thomas Citharel
2015-02-13 19:15:31 +01:00
parent 1fbef3bfb5 dc6ec98758
commit 0eae6d14b8
41 changed files with 2062 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/3rdparty/site_config/standard/gist.github.com.txt vendored
View File

@ -1,6 +1,4 @@
body: //div[@class="highlight"]/pre
prune: no
tidy: no
test_url: https://gist.github.com/1258908
title: //div[contains(@class,'gist-description')]
body: //div[contains(@class,'blob-wrapper')]
test_url: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754

3
inc/3rdparty/site_config/standard/jungle-world.com.txt vendored Normal file
View File

@ -0,0 +1,3 @@
title: //h1
body: //div[contains(@class,'story')]
test_url: http://jungle-world.com/artikel/2015/02/51207.html

5
inc/3rdparty/site_config/standard/toolinux.com.txt vendored Executable file
View File

@ -0,0 +1,5 @@
title: //h2[contains(@class,'news')]
body: //div[contains(@class,'articleContent')]
date: substring-after(//div[@class = 'SupaDate']/text(), 'le')
test_url: http://www.toolinux.com/Wi-Fi-Linksys-WRT-la-legende-de

4
inc/poche/Database.class.php
View File

@ -293,7 +293,7 @@ class Database {
$sql_limit = "LIMIT ".$limit." OFFSET 0";
}
$sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=? ORDER BY id " . $sql_limit;
$sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE '%Import%' AND user_id=? ORDER BY id " . $sql_limit;
$query = $this->executeQuery($sql, array($user_id));
$entries = $query->fetchAll();
@ -302,7 +302,7 @@ class Database {
public function retrieveUnfetchedEntriesCount($user_id)
{
$sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?";
$sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE '%Import%' AND user_id=?";
$query = $this->executeQuery($sql, array($user_id));
list($count) = $query->fetch();

91
inc/poche/Poche.class.php
View File

@ -74,7 +74,7 @@ class Poche
/**
* Creates a new user
*/
public function createNewUser($username, $password, $email = "")
public function createNewUser($username, $password, $email = "", $internalRegistration = false)
{
Tools::logm('Trying to create a new user...');
if (!empty($username) && !empty($password)){
@ -82,9 +82,43 @@ class Poche
$email = filter_var($email, FILTER_SANITIZE_STRING);
if (!$this->store->userExists($newUsername)){
if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
Tools::logm('The new user ' . $newUsername . ' has been installed');
$this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
Tools::redirect();
if ($email != "") { // if email is filled
if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
// if internal registration
$body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
"\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
_('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
_('Have fun with it !') . "\r\n\r\n" .
_('This is an automatically generated message, no one will answer if you respond to it.');
// if external (public) registration
$body = "Hi, " . $newUsername . "\r\n\r\nYou've just created a wallabag account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !";
$body = $internalRegistration ? $body_internal : $body;
$body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
if (mail($email, sprintf(_('Your new wallabag account on %1$s'), Tools::getPocheUrl()), $body,
'X-Mailer: PHP/' . phpversion() . "\r\n" .
'Content-type: text/plain; charset=UTF-8' . "\r\n" .
"From: " . $newUsername . "@" . gethostname() . "\r\n")) {
Tools::logm('The user ' . $newUsername . ' has been emailed');
$this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
} else {
Tools::logm('A problem has been encountered while sending an email');
$this->messages->add('e', _('A problem has been encountered while sending an email'));
}
} else {
Tools::logm('The user has been created, but the server did not authorize sending emails');
$this->messages->add('i', _('The server did not authorize sending a confirmation email'));
}
} else {
Tools::logm('The user has been created, but no email was saved, so no confimation email was sent');
$this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
}
Tools::logm('The new user ' . $newUsername . ' has been installed');
$this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
Tools::redirect();
}
else {
Tools::logm('error during adding new user');
@ -199,9 +233,9 @@ class Poche
}
if ($autoclose == TRUE) {
Tools::redirect('?view=home');
Tools::redirect('?view=home&closewin=true');
} else {
Tools::redirect('?view=home&closewin=true');
Tools::redirect('?view=home');
}
return $last_id;
break;
@ -341,6 +375,27 @@ class Poche
$this->messages->add('s', _('The tag has been successfully deleted'));
Tools::redirect();
break;
case 'reload_article' :
Tools::logm('reload article');
$id = $_GET['id'];
$entry = $this->store->retrieveOneById($id, $this->user->getId());
Tools::logm('reload url ' . $entry['url']);
$url = new Url(base64_encode($entry['url']));
$this->action('add', $url);
break;
/* For some unknown reason I can't get displayView() to work here (it redirects to home view afterwards). So here's a dirty fix which redirects directly to URL */
case 'random':
$id = 0;
while ($this->store->retrieveOneById($id,$this->user->getId()) == null) {
$count = $this->store->getEntriesByViewCount($view, $this->user->getId());
$id = rand(1,$count);
}
Tools::logm('get a random article');
Tools::redirect('?view=view&id=' . $id);
//$this->displayView('view', $id);
break;
default:
break;
}
@ -723,17 +778,23 @@ class Poche
$purifier = $this->_getPurifier();
foreach($items as $item) {
$url = new Url(base64_encode($item['url']));
Tools::logm('Fetching article ' . $item['id']);
$content = Tools::getPageContent($url);
$title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
$body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
if( $url->isCorrect() )
{
Tools::logm('Fetching article ' . $item['id']);
$content = Tools::getPageContent($url);
$title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
$body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
// clean content to prevent xss attack
// clean content to prevent xss attack
$title = $purifier->purify($title);
$body = $purifier->purify($body);
$this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
Tools::logm('Article ' . $item['id'] . ' updated.');
$title = $purifier->purify($title);
$body = $purifier->purify($body);
$this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
Tools::logm('Article ' . $item['id'] . ' updated.');
} else
{
Tools::logm('Unvalid URL (' . $item['url'] .') to fetch for article ' . $item['id']);
}
}
}
}

5
inc/poche/Routing.class.php
View File

@ -33,6 +33,7 @@ class Routing
$this->view = Tools::checkVar('view', 'home');
$this->action = Tools::checkVar('action');
$this->id = Tools::checkVar('id');
$this->autoclose = Tools::checkVar('autoclose',FALSE);
$_SESSION['sort'] = Tools::checkVar('sort', 'id');
$this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
}
@ -64,7 +65,7 @@ class Routing
$tplVars = array();
if (\Session::isLogged()) {
$this->wallabag->action($this->action, $this->url, $this->id);
$this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
$tplFile = Tools::getTplFile($this->view);
$tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
} elseif(ALLOW_REGISTER && isset($_GET['registerform'])) {
@ -124,7 +125,7 @@ class Routing
// update password
$this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
} elseif (isset($_GET['newuser'])) {
$this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
$this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true);
} elseif (isset($_GET['deluser'])) {
$this->wallabag->deleteUser($_POST['password4deletinguser']);
} elseif (isset($_GET['epub'])) {

3
inc/poche/WallabagEBooks.class.php
View File

@ -202,6 +202,9 @@ class WallabagMobi extends WallabagEBooks
}
$mobi->setContentProvider($content);
// the browser inside Kindle Devices doesn't likes special caracters either, we limit to A-z/0-9
$this->bookFileName = preg_replace('/[^A-Za-z0-9\-]/', '', $this->bookFileName);
// we offer file to download
$mobi->download($this->bookFileName.'.mobi');
Tools::logm('Mobi file produced');

5
inc/poche/config.inc.default.php
View File

@ -46,6 +46,7 @@
@define ('SHARE_MAIL', TRUE);
@define ('SHARE_SHAARLI', FALSE);
@define ('SHAARLI_URL', 'http://myshaarliurl.com');
@define ('SHARE_EVERNOTE', FALSE);
@define ('SHARE_DIASPORA', FALSE);
@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
@define ('FLATTR', TRUE);
@ -60,10 +61,14 @@
@define ('MOBI', FALSE);
@define ('PDF', FALSE);
// registration
@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
// display or not print link in article view
@define ('SHOW_PRINTLINK', '1');
// display or not percent of read in article view. Affects only default theme.
@define ('SHOW_READPERCENT', '1');
@define ('RELOAD_ARTICLE', TRUE);
@define ('ABS_PATH', 'assets/');
@define ('DEFAULT_THEME', 'baggy');