* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
- * @license http://www.wtfpl.net/ see COPYING file
+ * @license http://opensource.org/licenses/MIT see COPYING file
*/
class Poche
{
- public static $canRenderTemplates = true;
- public static $configFileAvailable = true;
-
+ /**
+ * @var User
+ */
public $user;
+ /**
+ * @var Database
+ */
public $store;
+ /**
+ * @var Template
+ */
public $tpl;
+ /**
+ * @var Language
+ */
+ public $language;
+ /**
+ * @var Routing
+ */
+ public $routing;
+ /**
+ * @var Messages
+ */
public $messages;
+ /**
+ * @var Paginator
+ */
public $pagination;
- private $currentTheme = '';
- private $currentLanguage = '';
- private $notInstalledMessage = array();
-
- private $language_names = array(
- 'cs_CZ.utf8' => 'čeština',
- 'de_DE.utf8' => 'German',
- 'en_EN.utf8' => 'English',
- 'es_ES.utf8' => 'Español',
- 'fa_IR.utf8' => 'فارسی',
- 'fr_FR.utf8' => 'Français',
- 'it_IT.utf8' => 'Italiano',
- 'pl_PL.utf8' => 'Polski',
- 'pt_BR.utf8' => 'Português (Brasil)',
- 'ru_RU.utf8' => 'Pусский',
- 'sl_SI.utf8' => 'Slovenščina',
- 'uk_UA.utf8' => 'Українська',
- );
public function __construct()
{
- if ($this->configFileIsAvailable()) {
- $this->init();
- }
-
- if ($this->themeIsInstalled()) {
- $this->initTpl();
- }
-
- if ($this->systemIsInstalled()) {
- $this->store = new Database();
- $this->messages = new Messages();
- # installation
- if (! $this->store->isInstalled()) {
- $this->install();
- }
- $this->store->checkTags();
- }
+ $this->init();
}
private function init()
{
Tools::initPhp();
- if (isset($_SESSION['poche_user']) && $_SESSION['poche_user'] != array()) {
- $this->user = $_SESSION['poche_user'];
+ $pocheUser = Session::getParam('poche_user');
+
+ if ($pocheUser && $pocheUser != array()) {
+ $this->user = $pocheUser;
} else {
- # fake user, just for install & login screens
+ // fake user, just for install & login screens
$this->user = new User();
$this->user->setConfig($this->getDefaultConfig());
}
- # l10n
- $language = $this->user->getConfigValue('language');
- @putenv('LC_ALL=' . $language);
- setlocale(LC_ALL, $language);
- bindtextdomain($language, LOCALE);
- textdomain($language);
-
- # Pagination
- $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
-
- # Set up theme
- $themeDirectory = $this->user->getConfigValue('theme');
-
- if ($themeDirectory === false) {
- $themeDirectory = DEFAULT_THEME;
- }
-
- $this->currentTheme = $themeDirectory;
-
- # Set up language
- $languageDirectory = $this->user->getConfigValue('language');
-
- if ($languageDirectory === false) {
- $languageDirectory = DEFAULT_THEME;
- }
-
- $this->currentLanguage = $languageDirectory;
+ $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
+ $this->language = new Language($this);
+ $this->tpl = new Template($this);
+ $this->store = new Database();
+ $this->messages = new Messages();
+ $this->routing = new Routing($this);
}
- public function configFileIsAvailable() {
- if (! self::$configFileAvailable) {
- $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
-
- return false;
- }
-
- return true;
- }
-
- public function themeIsInstalled() {
- $passTheme = TRUE;
- # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
- if (! self::$canRenderTemplates) {
- $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.';
- $passTheme = FALSE;
- }
-
- if (! is_writable(CACHE)) {
- $this->notInstalledMessage[] = 'You don\'t have write access on cache directory.';
-
- self::$canRenderTemplates = false;
-
- $passTheme = FALSE;
- }
-
- # Check if the selected theme and its requirements are present
- $theme = $this->getTheme();
-
- if ($theme != '' && ! is_dir(THEME . '/' . $theme)) {
- $this->notInstalledMessage[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
-
- self::$canRenderTemplates = false;
-
- $passTheme = FALSE;
- }
-
- $themeInfo = $this->getThemeInfo($theme);
- if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
- foreach ($themeInfo['requirements'] as $requiredTheme) {
- if (! is_dir(THEME . '/' . $requiredTheme)) {
- $this->notInstalledMessage[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
-
- self::$canRenderTemplates = false;
-
- $passTheme = FALSE;
- }
- }
- }
-
- if (!$passTheme) {
- return FALSE;
- }
-
-
- return true;
+ public function run()
+ {
+ $this->routing->run();
}
/**
- * all checks before installation.
- * @todo move HTML to template
- * @return boolean
+ * Creates a new user
*/
- public function systemIsInstalled()
+ public function createNewUser($username, $password, $email = "")
{
- $msg = TRUE;
-
- $configSalt = defined('SALT') ? constant('SALT') : '';
-
- if (empty($configSalt)) {
- $this->notInstalledMessage[] = 'You have not yet filled in the SALT value in the config.inc.php file.';
- $msg = FALSE;
- }
- if (STORAGE == 'sqlite' && ! file_exists(STORAGE_SQLITE)) {
- Tools::logm('sqlite file doesn\'t exist');
- $this->notInstalledMessage[] = 'sqlite file doesn\'t exist, you can find it in install folder. Copy it in /db folder.';
- $msg = FALSE;
- }
- if (is_dir(ROOT . '/install') && ! DEBUG_POCHE) {
- $this->notInstalledMessage[] = 'you have to delete the /install folder before using poche.';
- $msg = FALSE;
- }
- if (STORAGE == 'sqlite' && ! is_writable(STORAGE_SQLITE)) {
- Tools::logm('you don\'t have write access on sqlite file');
- $this->notInstalledMessage[] = 'You don\'t have write access on sqlite file.';
- $msg = FALSE;
- }
-
- if (! $msg) {
- return false;
- }
-
- return true;
- }
-
- public function getNotInstalledMessage() {
- return $this->notInstalledMessage;
- }
-
- private function initTpl()
- {
- $loaderChain = new Twig_Loader_Chain();
- $theme = $this->getTheme();
-
- # add the current theme as first to the loader chain so Twig will look there first for overridden template files
- try {
- $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
- } catch (Twig_Error_Loader $e) {
- # @todo isInstalled() should catch this, inject Twig later
- die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
- }
-
- # add all required themes to the loader chain
- $themeInfo = $this->getThemeInfo($theme);
- if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
- foreach ($themeInfo['requirements'] as $requiredTheme) {
- try {
- $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
- } catch (Twig_Error_Loader $e) {
- # @todo isInstalled() should catch this, inject Twig later
- die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
- }
- }
- }
-
- if (DEBUG_POCHE) {
- $twigParams = array();
- } else {
- $twigParams = array('cache' => CACHE);
- }
-
- $this->tpl = new Twig_Environment($loaderChain, $twigParams);
- $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
-
- # filter to display domain name of an url
- $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
- $this->tpl->addFilter($filter);
-
- # filter for reading time
- $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
- $this->tpl->addFilter($filter);
- }
-
- public function createNewUser() {
- if (isset($_GET['newuser'])){
- if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
- $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
- if (!$this->store->userExists($newusername)){
- if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
- 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');
- Tools::redirect();
- }
- }
- else {
- $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'),$newusername));
- Tools::logm('An user with the name '.$newusername.' already exists !');
+ if (!empty($username) && !empty($password)){
+ $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
+ $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();
}
- }
- }
- }
-
- public function deleteUser(){
- if (isset($_GET['deluser'])){
- if ($this->store->listUsers() > 1) {
- if (Tools::encodeString($_POST['password4deletinguser'].$this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
- $username = $this->user->getUsername();
- $this->store->deleteUserConfig($this->user->getId());
- Tools::logm('The configuration for user '. $username .' has been deleted !');
- $this->store->deleteTagsEntriesAndEntries($this->user->getId());
- Tools::logm('The entries for user '. $username .' has been deleted !');
- $this->store->deleteUser($this->user->getId());
- Tools::logm('User '. $username .' has been completely deleted !');
- Session::logout();
- Tools::logm('logout');
- Tools::redirect();
- $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'),$newusername));
- }
else {
- Tools::logm('Bad password !');
- $this->messages->add('e', _('Error : The password is wrong !'));
- }
- }
- else {
- Tools::logm('Only user !');
- $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
- }
- }
- }
-
- private function install()
- {
- Tools::logm('poche still not installed');
- echo $this->tpl->render('install.twig', array(
- 'token' => Session::getToken(),
- 'theme' => $this->getTheme(),
- 'poche_url' => Tools::getPocheUrl()
- ));
- if (isset($_GET['install'])) {
- if (($_POST['password'] == $_POST['password_repeat'])
- && $_POST['password'] != "" && $_POST['login'] != "") {
- # let's rock, install poche baby !
- if ($this->store->install($_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login'])))
- {
- Session::logout();
- Tools::logm('poche is now installed');
+ Tools::logm('error during adding new user');
Tools::redirect();
}
}
else {
- Tools::logm('error during installation');
+ $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'), $newUsername));
+ Tools::logm('An user with the name ' . $newUsername . ' already exists !');
Tools::redirect();
}
}
- exit();
- }
-
- public function getTheme() {
- return $this->currentTheme;
}
/**
- * Provides theme information by parsing theme.ini file if present in the theme's root directory.
- * In all cases, the following data will be returned:
- * - name: theme's name, or key if the theme is unnamed,
- * - current: boolean informing if the theme is the current user theme.
- *
- * @param string $theme Theme key (directory name)
- * @return array|boolean Theme information, or false if the theme doesn't exist.
+ * Delete an existing user
*/
- public function getThemeInfo($theme) {
- if (!is_dir(THEME . '/' . $theme)) {
- return false;
- }
-
- $themeIniFile = THEME . '/' . $theme . '/theme.ini';
- $themeInfo = array();
-
- if (is_file($themeIniFile) && is_readable($themeIniFile)) {
- $themeInfo = parse_ini_file($themeIniFile);
- }
-
- if ($themeInfo === false) {
- $themeInfo = array();
- }
- if (!isset($themeInfo['name'])) {
- $themeInfo['name'] = $theme;
- }
- $themeInfo['current'] = ($theme === $this->getTheme());
-
- return $themeInfo;
- }
-
- public function getInstalledThemes() {
- $handle = opendir(THEME);
- $themes = array();
-
- while (($theme = readdir($handle)) !== false) {
- # Themes are stored in a directory, so all directory names are themes
- # @todo move theme installation data to database
- if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
- continue;
- }
-
- $themes[$theme] = $this->getThemeInfo($theme);
- }
-
- ksort($themes);
-
- return $themes;
- }
-
- public function getLanguage() {
- return $this->currentLanguage;
- }
-
- public function getInstalledLanguages() {
- $handle = opendir(LOCALE);
- $languages = array();
-
- while (($language = readdir($handle)) !== false) {
- # Languages are stored in a directory, so all directory names are languages
- # @todo move language installation data to database
- if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
- continue;
+ public function deleteUser($password)
+ {
+ if ($this->store->listUsers() > 1) {
+ if (Tools::encodeString($password . $this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
+ $username = $this->user->getUsername();
+ $this->store->deleteUserConfig($this->user->getId());
+ Tools::logm('The configuration for user '. $username .' has been deleted !');
+ $this->store->deleteTagsEntriesAndEntries($this->user->getId());
+ Tools::logm('The entries for user '. $username .' has been deleted !');
+ $this->store->deleteUser($this->user->getId());
+ Tools::logm('User '. $username .' has been completely deleted !');
+ Session::logout();
+ Tools::logm('logout');
+ Tools::redirect();
+ $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'), $username));
}
-
- $current = false;
-
- if ($language === $this->getLanguage()) {
- $current = true;
+ else {
+ Tools::logm('Bad password !');
+ $this->messages->add('e', _('Error : The password is wrong !'));
}
-
- $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
}
-
- return $languages;
+ else {
+ Tools::logm('Only user !');
+ $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
+ }
}
public function getDefaultConfig()
$body = $content['rss']['channel']['item']['description'];
// clean content from prevent xss attack
- $purifier = $this->getPurifier();
+ $purifier = $this->_getPurifier();
$title = $purifier->purify($title);
$body = $purifier->purify($body);
if ( $last_id ) {
Tools::logm('add link ' . $url->getUrl());
if (DOWNLOAD_PICTURES) {
- $content = filtre_picture($body, $url->getUrl(), $last_id);
+ $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
Tools::logm('updating content article');
$this->store->updateContent($last_id, $content, $this->user->getId());
}
}
}
+ // if there are tags, add them to the new article
+ if (isset($_GET['tags'])) {
+ $_POST['value'] = $_GET['tags'];
+ $_POST['entry_id'] = $last_id;
+ $this->action('add_tag', $url);
+ }
+
$this->messages->add('s', _('the link has been added successfully'));
}
else {
} else {
Tools::redirect('?view=home&closewin=true');
}
+ return $last_id;
break;
case 'delete':
- $msg = 'delete link #' . $id;
- if ($this->store->deleteById($id, $this->user->getId())) {
- if (DOWNLOAD_PICTURES) {
- remove_directory(ABS_PATH . $id);
+ if (isset($_GET['search'])) {
+ //when we want to apply a delete to a search
+ $tags = array($_GET['search']);
+ $allentry_ids = $this->store->search($tags[0], $this->user->getId());
+ $entry_ids = array();
+ foreach ($allentry_ids as $eachentry) {
+ $entry_ids[] = $eachentry[0];
}
- $this->messages->add('s', _('the link has been deleted successfully'));
+ } else { // delete a single article
+ $entry_ids = array($id);
}
- else {
- $this->messages->add('e', _('the link wasn\'t deleted'));
- $msg = 'error : can\'t delete link #' . $id;
+ foreach($entry_ids as $id) {
+ $msg = 'delete link #' . $id;
+ if ($this->store->deleteById($id, $this->user->getId())) {
+ if (DOWNLOAD_PICTURES) {
+ Picture::removeDirectory(ABS_PATH . $id);
+ }
+ $this->messages->add('s', _('the link has been deleted successfully'));
+ }
+ else {
+ $this->messages->add('e', _('the link wasn\'t deleted'));
+ $msg = 'error : can\'t delete link #' . $id;
+ }
+ Tools::logm($msg);
}
- Tools::logm($msg);
Tools::redirect('?');
break;
case 'toggle_fav' :
}
break;
case 'toggle_archive' :
- $this->store->archiveById($id, $this->user->getId());
- Tools::logm('archive link #' . $id);
+ if (isset($_GET['tag_id'])) {
+ //when we want to archive a whole tag
+ $tag_id = $_GET['tag_id'];
+ $allentry_ids = $this->store->retrieveEntriesByTag($tag_id, $this->user->getId());
+ $entry_ids = array();
+ foreach ($allentry_ids as $eachentry) {
+ $entry_ids[] = $eachentry[0];
+ }
+ } else { //archive a single article
+ $entry_ids = array($id);
+ }
+ foreach($entry_ids as $id) {
+ $this->store->archiveById($id, $this->user->getId());
+ Tools::logm('archive link #' . $id);
+ }
if ( Tools::isAjaxRequest() ) {
echo 1;
exit;
case 'add_tag' :
if (isset($_GET['search'])) {
//when we want to apply a tag to a search
- $search = true;
$tags = array($_GET['search']);
$allentry_ids = $this->store->search($tags[0], $this->user->getId());
$entry_ids = array();
}
}
}
- $this->messages->add('s', _('the tag has been applied successfully'));
+ $this->messages->add('s', _('The tag has been applied successfully'));
+ Tools::logm('The tag has been applied successfully');
Tools::redirect();
break;
case 'remove_tag' :
Tools::redirect();
}
$this->store->removeTagForEntry($id, $tag_id);
+ Tools::logm('tag entry deleted');
+ if ($this->store->cleanUnusedTag($tag_id)) {
+ Tools::logm('tag deleted');
+ }
+ $this->messages->add('s', _('The tag has been successfully deleted'));
Tools::redirect();
break;
default:
switch ($view)
{
+ case 'about':
+ break;
case 'config':
- $dev_infos = $this->getPocheVersion('dev');
+ $dev_infos = $this->_getPocheVersion('dev');
$dev = trim($dev_infos[0]);
$check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
- $prod_infos = $this->getPocheVersion('prod');
+ $prod_infos = $this->_getPocheVersion('prod');
$prod = trim($prod_infos[0]);
$check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
$compare_dev = version_compare(POCHE, $dev);
$compare_prod = version_compare(POCHE, $prod);
- $themes = $this->getInstalledThemes();
- $languages = $this->getInstalledLanguages();
+ $themes = $this->tpl->getInstalledThemes();
+ $languages = $this->language->getInstalledLanguages();
$token = $this->user->getConfigValue('token');
$http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
$only_user = ($this->store->listUsers() > 1) ? false : true;
$this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
$tpl_vars['page_links'] = $page_links;
$tpl_vars['nb_results'] = $count;
- $tpl_vars['search_term'] = $search;
+ $tpl_vars['searchterm'] = $search;
}
break;
case 'view':
}
# flattr checking
- $flattr = new FlattrItem();
- $flattr->checkItem($entry['url'], $entry['id']);
-
+ $flattr = NULL;
+ if (FLATTR) {
+ $flattr = new FlattrItem();
+ $flattr->checkItem($entry['url'], $entry['id']);
+ }
+
# tags
$tags = $this->store->retrieveTagsByEntry($entry['id']);
'listmode' => (isset($_COOKIE['listmode']) ? true : false),
);
- //if id is given - we retrive entries by tag: id is tag id
+ //if id is given - we retrieve entries by tag: id is tag id
if ($id) {
$tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId());
$tpl_vars['id'] = intval($id);
* @todo set the new password in function header like this updatePassword($newPassword)
* @return boolean
*/
- public function updatePassword()
+ public function updatePassword($password, $confirmPassword)
{
if (MODE_DEMO) {
$this->messages->add('i', _('in demo mode, you can\'t update your password'));
Tools::redirect('?view=config');
}
else {
- if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
- if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
+ if (isset($password) && isset($confirmPassword)) {
+ if ($password == $confirmPassword && !empty($password)) {
$this->messages->add('s', _('your password has been updated'));
- $this->store->updatePassword($this->user->getId(), Tools::encodeString($_POST['password'] . $this->user->getUsername()));
+ $this->store->updatePassword($this->user->getId(), Tools::encodeString($password . $this->user->getUsername()));
Session::logout();
Tools::logm('password updated');
Tools::redirect();
}
}
- public function updateTheme()
- {
- # no data
- if (empty($_POST['theme'])) {
- }
-
- # we are not going to change it to the current theme...
- if ($_POST['theme'] == $this->getTheme()) {
- $this->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
- Tools::redirect('?view=config');
- }
-
- $themes = $this->getInstalledThemes();
- $actualTheme = false;
-
- foreach (array_keys($themes) as $theme) {
- if ($theme == $_POST['theme']) {
- $actualTheme = true;
- break;
- }
- }
-
- if (! $actualTheme) {
- $this->messages->add('e', _('that theme does not seem to be installed'));
- Tools::redirect('?view=config');
- }
-
- $this->store->updateUserConfig($this->user->getId(), 'theme', $_POST['theme']);
- $this->messages->add('s', _('you have changed your theme preferences'));
-
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['theme'] = $_POST['theme'];
-
- $_SESSION['poche_user']->setConfig($currentConfig);
-
- $this->emptyCache();
-
- Tools::redirect('?view=config');
- }
-
- public function updateLanguage()
- {
- # no data
- if (empty($_POST['language'])) {
- }
-
- # we are not going to change it to the current language...
- if ($_POST['language'] == $this->getLanguage()) {
- $this->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
- Tools::redirect('?view=config');
- }
-
- $languages = $this->getInstalledLanguages();
- $actualLanguage = false;
-
- foreach ($languages as $language) {
- if ($language['value'] == $_POST['language']) {
- $actualLanguage = true;
- break;
- }
- }
-
- if (! $actualLanguage) {
- $this->messages->add('e', _('that language does not seem to be installed'));
- Tools::redirect('?view=config');
- }
-
- $this->store->updateUserConfig($this->user->getId(), 'language', $_POST['language']);
- $this->messages->add('s', _('you have changed your language preferences'));
-
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['language'] = $_POST['language'];
-
- $_SESSION['poche_user']->setConfig($currentConfig);
-
- $this->emptyCache();
-
- Tools::redirect('?view=config');
- }
/**
- * get credentials from differents sources
- * it redirects the user to the $referer link
+ * Get credentials from differents sources
+ * It redirects the user to the $referer link
+ *
* @return array
*/
- private function credentials() {
- if(isset($_SERVER['PHP_AUTH_USER'])) {
- return array($_SERVER['PHP_AUTH_USER'],'php_auth',true);
+ private function credentials()
+ {
+ if (isset($_SERVER['PHP_AUTH_USER'])) {
+ return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
}
- if(!empty($_POST['login']) && !empty($_POST['password'])) {
- return array($_POST['login'],$_POST['password'],false);
+ if (!empty($_POST['login']) && !empty($_POST['password'])) {
+ return array($_POST['login'], $_POST['password'], false);
}
- if(isset($_SERVER['REMOTE_USER'])) {
- return array($_SERVER['REMOTE_USER'],'http_auth',true);
+ if (isset($_SERVER['REMOTE_USER'])) {
+ return array($_SERVER['REMOTE_USER'], 'http_auth', true);
}
- return array(false,false,false);
+ return array(false, false, false);
}
/**
$longlastingsession = isset($_POST['longlastingsession']);
$passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login);
Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user)));
+
+ # reload l10n
+ $language = $user['config']['language'];
+ @putenv('LC_ALL=' . $language);
+ setlocale(LC_ALL, $language);
+ bindtextdomain($language, LOCALE);
+ textdomain($language);
+
$this->messages->add('s', _('welcome to your wallabag'));
Tools::logm('login successful');
Tools::redirect($referer);
}
$this->messages->add('e', _('login failed: bad login or password'));
+ // log login failure in web server log to allow fail2ban usage
+ error_log('user '.$login.' authentication failure');
Tools::logm('login failed');
Tools::redirect();
}
}
/**
- * import datas into your poche
+ * import datas into your wallabag
* @return boolean
*/
+
public function import() {
- if ( isset($_FILES['file']) ) {
+ if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
Tools::logm('Import stated: parsing file');
// assume, that file is in json format
$read = ((sizeof($data) && $read)?0:1);
}
}
- }
+ }
- //for readability structure
- foreach ($data as $record) {
- if (is_array($record)) {
- $data[] = $record;
- foreach ($record as $record2) {
- if (is_array($record2)) {
- $data[] = $record2;
- }
+ // for readability structure
+
+ foreach($data as $record) {
+ if (is_array($record)) {
+ $data[] = $record;
+ foreach($record as $record2) {
+ if (is_array($record2)) {
+ $data[] = $record2;
+ }
+ }
+ }
}
- }
- }
- $urlsInserted = array(); //urls of articles inserted
- foreach ($data as $record) {
- $url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') );
- if ( $url and !in_array($url, $urlsInserted) ) {
- $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
- $body = (isset($record['content']) ? $record['content'] : '');
- $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0));
- $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite'])?intval($record['favorite']):0) );
- //insert new record
- $id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
- if ( $id ) {
- $urlsInserted[] = $url; //add
-
- if ( isset($record['tags']) && trim($record['tags']) ) {
- //@TODO: set tags
+ $urlsInserted = array(); //urls of articles inserted
+ foreach($data as $record) {
+ $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
+ if ($url and !in_array($url, $urlsInserted)) {
+ $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
+ $body = (isset($record['content']) ? $record['content'] : '');
+ $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
+ $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite']) ? intval($record['favorite']) : 0));
+
+ // insert new record
+
+ $id = $this->store->add($url, $title, $body, $this->user->getId() , $isFavorite, $isRead);
+ if ($id) {
+ $urlsInserted[] = $url; //add
+ if (isset($record['tags']) && trim($record['tags'])) {
+
+ $tags = explode(',', $record['tags']);
+ foreach($tags as $tag) {
+ $entry_id = $id;
+ $tag_id = $this->store->retrieveTagByValue($tag);
+ if ($tag_id) {
+ $this->store->setTagToEntry($tag_id['id'], $entry_id);
+ } else {
+ $this->store->createTag($tag);
+ $tag_id = $this->store->retrieveTagByValue($tag);
+ $this->store->setTagToEntry($tag_id['id'], $entry_id);
+ }
+ }
- }
+ }
+ }
+ }
+ }
+
+ $i = sizeof($urlsInserted);
+ if ($i > 0) {
+ $this->messages->add('s', _('Articles inserted: ') . $i . _('. Please note, that some may be marked as "read".'));
}
- }
- }
- $i = sizeof($urlsInserted);
- if ( $i > 0 ) {
- $this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
- }
Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
}
- //file parsing finished here
+ else {
+ $this->messages->add('s', _('Did you forget to select a file?'));
+ }
+ // file parsing finished here
+ // now download article contents if any
+ // check if we need to download any content
- //now download article contents if any
+ $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
- //check if we need to download any content
- $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
- if ( $recordsDownloadRequired == 0 ) {
- //nothing to download
- $this->messages->add('s', _('Import finished.'));
- Tools::logm('Import finished completely');
- Tools::redirect();
- }
- else {
- //if just inserted - don't download anything, download will start in next reload
- if ( !isset($_FILES['file']) ) {
- //download next batch
- Tools::logm('Fetching next batch of articles...');
- $items = $this->store->retrieveUnfetchedEntries($this->user->getId(), IMPORT_LIMIT);
+ if ($recordsDownloadRequired == 0) {
+
+ // nothing to download
+
+ $this->messages->add('s', _('Import finished.'));
+ Tools::logm('Import finished completely');
+ Tools::redirect();
+ }
+ else {
- $purifier = $this->getPurifier();
+ // if just inserted - don't download anything, download will start in next reload
- foreach ($items as $item) {
- $url = new Url(base64_encode($item['url']));
- Tools::logm('Fetching article '.$item['id']);
- $content = Tools::getPageContent($url);
+ if (!isset($_FILES['file'])) {
- $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
- $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+ // download next batch
- //clean content to prevent xss attack
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
+ Tools::logm('Fetching next batch of articles...');
+ $items = $this->store->retrieveUnfetchedEntries($this->user->getId() , IMPORT_LIMIT);
+ $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'));
- $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
- Tools::logm('Article '.$item['id'].' updated.');
- }
+ // 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.');
+ }
+ }
}
- }
- return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
+ return array(
+ 'includeImport' => true,
+ 'import' => array(
+ 'recordsDownloadRequired' => $recordsDownloadRequired,
+ 'recordsUnderDownload' => IMPORT_LIMIT,
+ 'delay' => IMPORT_DELAY * 1000
+ )
+ );
}
/**
* export poche entries in json
* @return json all poche entries
*/
- public function export() {
+ public function export()
+ {
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename);
* @param string $which 'prod' or 'dev'
* @return string latest $which version
*/
- private function getPocheVersion($which = 'prod') {
+ private function _getPocheVersion($which = 'prod') {
$cache_file = CACHE . '/' . $which;
$check_time = time();
return array($version, $check_time);
}
- public function generateToken()
+ /**
+ * Update token for current user
+ */
+ public function updateToken()
{
- if (ini_get('open_basedir') === '') {
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- echo 'This is a server using Windows!';
- // alternative to /dev/urandom for Windows
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
- } else {
- $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
- }
- }
- else {
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
- }
-
- $token = str_replace('+', '', $token);
- $this->store->updateUserConfig($this->user->getId(), 'token', $token);
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['token'] = $token;
- $_SESSION['poche_user']->setConfig($currentConfig);
- Tools::redirect();
+ $token = Tools::generateToken();
+ $this->store->updateUserConfig($this->user->getId(), 'token', $token);
+ $currentConfig = $_SESSION['poche_user']->config;
+ $currentConfig['token'] = $token;
+ $_SESSION['poche_user']->setConfig($currentConfig);
+ Tools::redirect();
}
- public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
+ /**
+ * Generate RSS feeds for current user
+ *
+ * @param $token
+ * @param $user_id
+ * @param $tag_id if $type is 'tag', the id of the tag to generate feed for
+ * @param string $type the type of feed to generate
+ * @param int $limit the maximum number of items (0 means all)
+ */
+ public function generateFeeds($token, $user_id, $tag_id, $type = 'home', $limit = 0)
{
$allowed_types = array('home', 'fav', 'archive', 'tag');
$config = $this->store->getConfigUser($user_id);
if ($config == null) {
- die(_('User with this id (' . $user_id . ') does not exist.'));
+ die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
}
- if (!in_array($type, $allowed_types) ||
- $token != $config['token']) {
- die(_('Uh, there is a problem while generating feeds.'));
+ if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) {
+ die(_('Uh, there is a problem while generating feed. Wrong token used?'));
}
- // Check the token
$feed = new FeedWriter(RSS2);
$feed->setTitle('wallabag — ' . $type . ' feed');
$entries = $this->store->getEntriesByView($type, $user_id);
}
+ // if $limit is set to zero, use all entries
+ if (0 == $limit) {
+ $limit = count($entries);
+ }
if (count($entries) > 0) {
- foreach ($entries as $entry) {
+ for ($i = 0; $i < min(count($entries), $limit); $i++) {
+ $entry = $entries[$i];
$newItem = $feed->createNewItem();
$newItem->setTitle($entry['title']);
$newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
exit;
}
- public function emptyCache() {
- $files = new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
- RecursiveIteratorIterator::CHILD_FIRST
- );
- foreach ($files as $fileinfo) {
- $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink');
- $todo($fileinfo->getRealPath());
- }
-
- Tools::logm('empty cache');
- $this->messages->add('s', _('Cache deleted.'));
- Tools::redirect();
- }
/**
- * return new purifier object with actual config
+ * Returns new purifier object with actual config
*/
- protected function getPurifier() {
- $config = HTMLPurifier_Config::createDefault();\r
- $config->set('Cache.SerializerPath', CACHE);\r
- $config->set('HTML.SafeIframe', true);\r
- $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo$purifier = new HTMLPurifier($config);
-\r
- return new HTMLPurifier($config);
+ private function _getPurifier()
+ {
+ $config = HTMLPurifier_Config::createDefault();
+ $config->set('Cache.SerializerPath', CACHE);
+ $config->set('HTML.SafeIframe', true);
+
+ //allow YouTube, Vimeo and dailymotion videos
+ $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
+
+ return new HTMLPurifier($config);
}
+
+
}