# l10n
$language = $this->user->getConfigValue('language');
- putenv('LC_ALL=' . $language);
+ @putenv('LC_ALL=' . $language);
setlocale(LC_ALL, $language);
bindtextdomain($language, LOCALE);
textdomain($language);
public function configFileIsAvailable() {
if (! self::$configFileAvailable) {
- $this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.';
+ $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
return false;
}
$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 !');
+ 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');
switch ($action)
{
case 'add':
- if (!$import) {
- $content = Tools::getPageContent($url);
- $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
- $body = $content['rss']['channel']['item']['description'];
-
- // clean content from prevent xss attack
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.SerializerPath', CACHE);
- $purifier = new HTMLPurifier($config);
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
- }
- else {
- $title = '';
- $body = '';
- }
+ $content = Tools::getPageContent($url);
+ $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
+ $body = $content['rss']['channel']['item']['description'];
+
+ // clean content from prevent xss attack
+ $purifier = $this->getPurifier();
+ $title = $purifier->purify($title);
+ $body = $purifier->purify($body);
//search for possible duplicate
$duplicate = NULL;
- if (!$import) {
- $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
- }
+ $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
$last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
- if ( $last_id && !$import ) {
+ if ( $last_id ) {
Tools::logm('add link ' . $url->getUrl());
if (DOWNLOAD_PICTURES) {
$content = filtre_picture($body, $url->getUrl(), $last_id);
$this->messages->add('s', _('the link has been added successfully'));
}
else {
- if (!$import) {
- $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
- Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
- }
+ $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
+ Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
}
- if (!$import) {
- if ($autoclose == TRUE) {
- Tools::redirect('?view=home');
- } else {
- Tools::redirect('?view=home&closewin=true');
- }
+ if ($autoclose == TRUE) {
+ Tools::redirect('?view=home');
+ } else {
+ Tools::redirect('?view=home&closewin=true');
}
break;
case 'delete':
case 'toggle_fav' :
$this->store->favoriteById($id, $this->user->getId());
Tools::logm('mark as favorite link #' . $id);
- if (!$import) {
- Tools::redirect();
+ if ( Tools::isAjaxRequest() ) {
+ echo 1;
+ exit;
+ }
+ else {
+ Tools::redirect();
}
break;
case 'toggle_archive' :
$this->store->archiveById($id, $this->user->getId());
Tools::logm('archive link #' . $id);
- if (!$import) {
- Tools::redirect();
+ if ( Tools::isAjaxRequest() ) {
+ echo 1;
+ exit;
+ }
+ else {
+ Tools::redirect();
}
break;
case 'archive_all' :
$this->store->archiveAll($this->user->getId());
Tools::logm('archive all links');
- if (!$import) {
- Tools::redirect();
- }
+ Tools::redirect();
break;
case 'add_tag' :
- if($import){
- $entry_id = $id;
- $tags = explode(',', $tags);
- }
- else{
+ if (isset($_GET['search'])) {
+ //when we want to apply a tag 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];
+ }
+ } else { //add a tag to a single article
$tags = explode(',', $_POST['value']);
- $entry_id = $_POST['entry_id'];
- }
- $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
- if (!$entry) {
- $this->messages->add('e', _('Article not found!'));
- Tools::logm('error : article not found');
- Tools::redirect();
+ $entry_ids = array($_POST['entry_id']);
}
- //get all already set tags to preven duplicates
- $already_set_tags = array();
- $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
- foreach ($entry_tags as $tag) {
- $already_set_tags[] = $tag['value'];
- }
- foreach($tags as $key => $tag_value) {
- $value = trim($tag_value);
- if ($value && !in_array($value, $already_set_tags)) {
- $tag = $this->store->retrieveTagByValue($value);
-
- if (is_null($tag)) {
- # we create the tag
- $tag = $this->store->createTag($value);
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'tags_id_seq';
+ foreach($entry_ids as $entry_id) {
+ $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
+ if (!$entry) {
+ $this->messages->add('e', _('Article not found!'));
+ Tools::logm('error : article not found');
+ Tools::redirect();
+ }
+ //get all already set tags to preven duplicates
+ $already_set_tags = array();
+ $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
+ foreach ($entry_tags as $tag) {
+ $already_set_tags[] = $tag['value'];
+ }
+ foreach($tags as $key => $tag_value) {
+ $value = trim($tag_value);
+ if ($value && !in_array($value, $already_set_tags)) {
+ $tag = $this->store->retrieveTagByValue($value);
+ if (is_null($tag)) {
+ # we create the tag
+ $tag = $this->store->createTag($value);
+ $sequence = '';
+ if (STORAGE == 'postgres') {
+ $sequence = 'tags_id_seq';
+ }
+ $tag_id = $this->store->getLastId($sequence);
}
- $tag_id = $this->store->getLastId($sequence);
- }
- else {
- $tag_id = $tag['id'];
- }
-
- # we assign the tag to the article
- $this->store->setTagToEntry($tag_id, $entry_id);
+ else {
+ $tag_id = $tag['id'];
+ }
+
+ # we assign the tag to the article
+ $this->store->setTagToEntry($tag_id, $entry_id);
+ }
}
}
- if(!$import) {
- Tools::redirect();
- }
+ $this->messages->add('s', _('The tag has been applied successfully'));
+ Tools::logm('The tag has been applied successfully');
+ Tools::redirect();
break;
case 'remove_tag' :
$tag_id = $_GET['tag_id'];
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:
$languages = $this->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;
$tpl_vars = array(
'themes' => $themes,
'languages' => $languages,
'token' => $token,
'user_id' => $this->user->getId(),
'http_auth' => $http_auth,
+ 'only_user' => $only_user
);
Tools::logm('config view');
break;
'tags' => $tags,
);
break;
-
- case 'search':
- if (isset($_GET['search'])){
- $search = $_GET['search'];
- $tpl_vars['entries'] = $this->store->search($search);
- $tpl_vars['nb_results'] = count($tpl_vars['entries']);
- }
- break;
+ case 'search':
+ if (isset($_GET['search'])) {
+ $search = filter_var($_GET['search'], FILTER_SANITIZE_STRING);
+ $tpl_vars['entries'] = $this->store->search($search, $this->user->getId());
+ $count = count($tpl_vars['entries']);
+ $this->pagination->set_total($count);
+ $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
+ $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;
+ }
+ break;
case 'view':
$entry = $this->store->retrieveOneById($id, $this->user->getId());
if ($entry != NULL) {
Tools::redirect();
}
- /**
- * import from Instapaper. poche needs a ./instapaper-export.html file
- * @todo add the return value
- * @param string $targetFile the file used for importing
- * @return boolean
- */
- private function importFromInstapaper($targetFile)
- {
- # TODO gestion des articles favs
- $html = new simple_html_dom();
- $html->load_file($targetFile);
- Tools::logm('starting import from instapaper');
-
- $read = 0;
- $errors = array();
- foreach($html->find('ol') as $ul)
- {
- foreach($ul->find('li') as $li)
- {
- $a = $li->find('a');
- $url = new Url(base64_encode($a[0]->href));
- $this->action('add', $url, 0, TRUE);
- if ($read == '1') {
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'entries_id_seq';
- }
- $last_id = $this->store->getLastId($sequence);
- $this->action('toggle_archive', $url, $last_id, TRUE);
- }
- }
-
- # the second <ol> is for read links
- $read = 1;
- }
-
- $unlink = unlink($targetFile);
- $this->messages->add('s', _('import from instapaper completed. You have to execute the cron to fetch content.'));
- Tools::logm('import from instapaper completed');
- Tools::redirect();
- }
-
- /**
- * import from Pocket. poche needs a ./ril_export.html file
- * @todo add the return value
- * @param string $targetFile the file used for importing
- * @return boolean
- */
- private function importFromPocket($targetFile)
- {
- # TODO gestion des articles favs
- $html = new simple_html_dom();
- $html->load_file($targetFile);
- Tools::logm('starting import from pocket');
-
- $read = 0;
- $errors = array();
- foreach($html->find('ul') as $ul)
- {
- foreach($ul->find('li') as $li)
- {
- $a = $li->find('a');
- $url = new Url(base64_encode($a[0]->href));
- $this->action('add', $url, 0, TRUE);
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'entries_id_seq';
- }
- $last_id = $this->store->getLastId($sequence);
- if ($read == '1') {
- $this->action('toggle_archive', $url, $last_id, TRUE);
- }
- $tags = $a[0]->tags;
- if(!empty($tags)) {
- $this->action('add_tag',$url,$last_id,true,false,$tags);
- }
- }
-
- # the second <ul> is for read links
- $read = 1;
- }
-
- $unlink = unlink($targetFile);
- $this->messages->add('s', _('import from pocket completed. You have to execute the cron to fetch content.'));
- Tools::logm('import from pocket completed');
- Tools::redirect();
- }
-
- /**
- * import from Readability. poche needs a ./readability file
- * @todo add the return value
- * @param string $targetFile the file used for importing
- * @return boolean
- */
- private function importFromReadability($targetFile)
- {
- # TODO gestion des articles lus / favs
- $str_data = file_get_contents($targetFile);
- $data = json_decode($str_data,true);
- Tools::logm('starting import from Readability');
- $count = 0;
- foreach ($data as $key => $value) {
- $url = NULL;
- $favorite = FALSE;
- $archive = FALSE;
- foreach ($value as $item) {
- foreach ($item as $attr => $value) {
- if ($attr == 'article__url') {
- $url = new Url(base64_encode($value));
- }
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'entries_id_seq';
- }
- if ($value == 'true') {
- if ($attr == 'favorite') {
- $favorite = TRUE;
- }
- if ($attr == 'archive') {
- $archive = TRUE;
- }
- }
- }
-
- # we can add the url
- if (!is_null($url) && $url->isCorrect()) {
- $this->action('add', $url, 0, TRUE);
- $count++;
- if ($favorite) {
- $last_id = $this->store->getLastId($sequence);
- $this->action('toggle_fav', $url, $last_id, TRUE);
- }
- if ($archive) {
- $last_id = $this->store->getLastId($sequence);
- $this->action('toggle_archive', $url, $last_id, TRUE);
- }
- }
- }
- }
-
- unlink($targetFile);
- $this->messages->add('s', _('import from Readability completed. You have to execute the cron to fetch content.'));
- Tools::logm('import from Readability completed');
- Tools::redirect();
- }
-
- /**
- * import from Poche exported file
- * @param string $targetFile the file used for importing
- * @return boolean
- */
- private function importFromPoche($targetFile)
- {
- $str_data = file_get_contents($targetFile);
- $data = json_decode($str_data,true);
- Tools::logm('starting import from Poche');
-
-
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'entries_id_seq';
- }
-
- $count = 0;
- foreach ($data as $value) {
-
- $url = new Url(base64_encode($value['url']));
- $favorite = ($value['is_fav'] == -1);
- $archive = ($value['is_read'] == -1);
-
- # we can add the url
- if (!is_null($url) && $url->isCorrect()) {
-
- $this->action('add', $url, 0, TRUE);
-
- $count++;
- if ($favorite) {
- $last_id = $this->store->getLastId($sequence);
- $this->action('toggle_fav', $url, $last_id, TRUE);
- }
- if ($archive) {
- $last_id = $this->store->getLastId($sequence);
- $this->action('toggle_archive', $url, $last_id, TRUE);
- }
- }
-
- }
-
- unlink($targetFile);
- $this->messages->add('s', _('import from Poche completed. You have to execute the cron to fetch content.'));
- Tools::logm('import from Poche completed');
- Tools::redirect();
- }
-
/**
* import datas into your poche
* @return boolean
public function import() {
if ( isset($_FILES['file']) ) {
+ Tools::logm('Import stated: parsing file');
+
// assume, that file is in json format
$str_data = file_get_contents($_FILES['file']['tmp_name']);
$data = json_decode($str_data, true);
$read = 0;
foreach (array('ol','ul') as $list) {
foreach ($html->find($list) as $ul) {
- foreach ($ul->find('li') as $li) {
- $tmpEntry = array();
- $a = $li->find('a');
- $tmpEntry['url'] = $a[0]->href;
- $tmpEntry['tags'] = $a[0]->tags;
- $tmpEntry['is_read'] = $read;
- if ($tmpEntry['url']) {
- $data[] = $tmpEntry;
- }
- }
-
# the second <ol/ul> is for read links
- $read = ((sizeof($data) && $read)?0:1);
+ foreach ($ul->find('li') as $li) {
+ $tmpEntry = array();
+ $a = $li->find('a');
+ $tmpEntry['url'] = $a[0]->href;
+ $tmpEntry['tags'] = $a[0]->tags;
+ $tmpEntry['is_read'] = $read;
+ if ($tmpEntry['url']) {
+ $data[] = $tmpEntry;
+ }
+ }
+ # the second <ol/ul> is for read links
+ $read = ((sizeof($data) && $read)?0:1);
}
}
}
- $i = 0; //counter for articles inserted
+ //for readability structure
foreach ($data as $record) {
- //echo '<pre>';
- //var_dump($record);
- // foreach ($record as $key=>$val) {
- // echo "\n=================\n$i: $key: $val\n";
- // }
- // exit;
-
- $url = trim($record['url']);
- if ( $url ) {
+ 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']) : 0);
- $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : 0);
+ $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 ) {
- //increment no of records inserted
- $i++;
+ $urlsInserted[] = $url; //add
+
if ( isset($record['tags']) && trim($record['tags']) ) {
- //@TODO: set tags
+ //@TODO: set tags
}
}
}
}
+ $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
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);
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.SerializerPath', CACHE);
- $purifier = new HTMLPurifier($config);
+ $purifier = $this->getPurifier();
foreach ($items as $item) {
- $url = new Url(base64_encode($item['url']));
- $content = Tools::getPageContent($url);
+ $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'));
+ $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
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
+ //clean content to prevent xss attack
+ $title = $purifier->purify($title);
+ $body = $purifier->purify($body);
- $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+ $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) );
}
- public function uploadFile() {
- if (isset($_FILES['file']))
- {
- $dir = CACHE . '/';
- $file = basename($_FILES['file']['name']);
- if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
- $this->messages->add('s', _('File uploaded. You can now execute import.'));
- }
- else {
- $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
- }
- }
-
- Tools::redirect('?view=config');
- }
-
/**
* export poche entries in json
* @return json all poche entries
*/
- public function export()
- {
- $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
- header('Content-Disposition: attachment; filename='.$filename);
-
- $entries = $this->store->retrieveAll($this->user->getId());
- echo $this->tpl->render('export.twig', array(
- 'export' => Tools::renderJson($entries),
- ));
- Tools::logm('export view');
+ public function export() {
+ $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
+ header('Content-Disposition: attachment; filename='.$filename);
+
+ $entries = $this->store->retrieveAll($this->user->getId());
+ echo $this->tpl->render('export.twig', array(
+ 'export' => Tools::renderJson($entries),
+ ));
+ Tools::logm('export view');
}
/**
* @param string $which 'prod' or 'dev'
* @return string latest $which version
*/
- private function getPocheVersion($which = 'prod')
- {
- $cache_file = CACHE . '/' . $which;
- $check_time = time();
-
- # checks if the cached version file exists
- if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
- $version = file_get_contents($cache_file);
- $check_time = filemtime($cache_file);
- } else {
- $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
- file_put_contents($cache_file, $version, LOCK_EX);
- }
- return array($version, $check_time);
+ private function getPocheVersion($which = 'prod') {
+ $cache_file = CACHE . '/' . $which;
+ $check_time = time();
+
+ # checks if the cached version file exists
+ if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
+ $version = file_get_contents($cache_file);
+ $check_time = filemtime($cache_file);
+ } else {
+ $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
+ file_put_contents($cache_file, $version, LOCK_EX);
+ }
+ return array($version, $check_time);
}
public function generateToken()
{
- 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);
+ 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 = 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();
}
public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
$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']) {
+ if (!in_array($type, $allowed_types) || $token != $config['token']) {
die(_('Uh, there is a problem while generating feeds.'));
}
// Check the token
foreach ($entries as $entry) {
$newItem = $feed->createNewItem();
$newItem->setTitle($entry['title']);
+ $newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
$newItem->setLink($entry['url']);
$newItem->setDate(time());
$newItem->setDescription($entry['content']);
$this->messages->add('s', _('Cache deleted.'));
Tools::redirect();
}
+
+ /**
+ * return new purifier object with actual config
+ */
+ protected 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);
+ }
+
+ /**
+ * handle epub
+ */
+ public function createEpub() {
+
+ switch ($_GET['method']) {
+ case 'id':
+ $entryID = filter_var($_GET['id'],FILTER_SANITIZE_NUMBER_INT);
+ $entry = $this->store->retrieveOneById($entryID, $this->user->getId());
+ $entries = array($entry);
+ $bookTitle = $entry['title'];
+ $bookFileName = substr($bookTitle, 0, 200);
+ break;
+ case 'all':
+ $entries = $this->store->retrieveAll($this->user->getId());
+ $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
+ $bookFileName = _('Allarticles') . date(_('dmY'));
+ break;
+ case 'tag':
+ $tag = filter_var($_GET['tag'],FILTER_SANITIZE_STRING);
+ $tags_id = $this->store->retrieveAllTags($this->user->getId(),$tag);
+ $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
+ $entries = $this->store->retrieveEntriesByTag($tag_id,$this->user->getId());
+ $bookTitle = sprintf(_('Articles tagged %s'),$tag);
+ $bookFileName = substr(sprintf(_('Tag %s'),$tag), 0, 200);
+ break;
+ case 'category':
+ $category = filter_var($_GET['category'],FILTER_SANITIZE_STRING);
+ $entries = $this->store->getEntriesByView($category,$this->user->getId());
+ $bookTitle = sprintf(_('All articles in category %s'), $category);
+ $bookFileName = substr(sprintf(_('Category %s'),$category), 0, 200);
+ break;
+ case 'search':
+ $search = filter_var($_GET['search'],FILTER_SANITIZE_STRING);
+ $entries = $this->store->search($search,$this->user->getId());
+ $bookTitle = sprintf(_('All articles for search %s'), $search);
+ $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
+ break;
+ case 'default':
+ die(_('Uh, there is a problem while generating epub.'));
+
+ }
+
+ $content_start =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
+ . "<head>"
+ . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
+ . "<title>wallabag articles book</title>\n"
+ . "</head>\n"
+ . "<body>\n";
+
+ $bookEnd = "</body>\n</html>\n";
+
+ $log = new Logger("wallabag", TRUE);
+ $fileDir = CACHE;
+
+ $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
+ $log->logLine("new EPub()");
+ $log->logLine("EPub class version: " . EPub::VERSION);
+ $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
+ $log->logLine("Zip version: " . Zip::VERSION);
+ $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
+ $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
+
+ $book->setTitle(_('wallabag\'s articles'));
+ $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
+ //$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.
+ $book->setDescription(_("Some articles saved on my wallabag"));
+ $book->setAuthor("wallabag","wallabag");
+ $book->setPublisher("wallabag","wallabag"); // I hope this is a non existant address :)
+ $book->setDate(time()); // Strictly not needed as the book date defaults to time().
+ //$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.
+ $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
+
+ $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
+ $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
+
+ $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";
+
+ $log->logLine("Add Cover");
+
+ $fullTitle = "<h1> " . $bookTitle . "</h1>\n";
+
+ $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
+
+ $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;
+
+ //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
+ $book->addChapter("Notices", "Cover2.html", $cover);
+
+ $book->buildTOC();
+
+ foreach ($entries as $entry) { //set tags as subjects
+ $tags = $this->store->retrieveTagsByEntry($entry['id']);
+ foreach ($tags as $tag) {
+ $book->setSubject($tag['value']);
+ }
+
+ $log->logLine("Set up parameters");
+
+ $chapter = $content_start . $entry['content'] . $bookEnd;
+ $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
+ $log->logLine("Added chapter " . $entry['title']);
+ }
+
+ if (DEBUG_POCHE) {
+ $epuplog = $book->getLog();
+ $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
+ }
+ $book->finalize();
+ $zipData = $book->sendBook($bookFileName);
+ }
}
projects / github / wallabag / wallabag.git / blobdiff