From 29c6fd460700e67fa538af337dcfce2787f2cc4e Mon Sep 17 00:00:00 2001 From: nicosomb Date: Tue, 23 Apr 2013 09:38:57 +0200 Subject: messages d'erreur si pas possible d'ajouter ou de supprimer un lien --- inc/functions.php | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index 205f3968..750d430e 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -125,8 +125,6 @@ function prepare_url($url) } } - $msg->add('e', 'error during url preparation'); - logm('error during url preparation'); return FALSE; } @@ -311,26 +309,39 @@ function action_to_do($action, $url, $id = 0) if (MyTool::isUrl($url)) { if($parametres_url = prepare_url($url)) { - $store->add($url, $parametres_url['title'], $parametres_url['content']); - $last_id = $store->getLastId(); - if (DOWNLOAD_PICTURES) { - $content = filtre_picture($parametres_url['content'], $url, $last_id); + if ($store->add($url, $parametres_url['title'], $parametres_url['content'])) { + $last_id = $store->getLastId(); + if (DOWNLOAD_PICTURES) { + $content = filtre_picture($parametres_url['content'], $url, $last_id); + } + $msg->add('s', 'the link has been added successfully'); } - $msg->add('s', 'the link has been added successfully'); + else { + $msg->add('e', 'error during insertion : the link wasn\'t added'); + } + } + else { + $msg->add('e', 'error during url preparation : the link wasn\'t added'); + logm('error during url preparation'); } } else { - $msg->add('e', 'the link has been added successfully'); + $msg->add('e', 'error during url preparation : the link is not valid'); logm($url . ' is not a valid url'); } logm('add link ' . $url); break; case 'delete': - remove_directory(ABS_PATH . $id); - $store->deleteById($id); - $msg->add('s', 'the link has been deleted successfully'); - logm('delete link #' . $id); + if ($store->deleteById($id)) { + remove_directory(ABS_PATH . $id); + $msg->add('s', 'the link has been deleted successfully'); + logm('delete link #' . $id); + } + else { + $msg->add('e', 'the link wasn\'t deleted'); + logm('error : can\'t delete link #' . $id); + } break; case 'toggle_fav' : $store->favoriteById($id); -- cgit v1.2.3 From 4ddbd26787ebbf4c5e01061ac9dbee4f8c21421b Mon Sep 17 00:00:00 2001 From: memiks Date: Tue, 23 Apr 2013 07:22:19 -0500 Subject: Ajout du global msg et gestion du retour dans Readability --- inc/functions.php | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index 205f3968..b27120c5 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -39,6 +39,10 @@ function get_external_file($url) curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_HEADER, false); + // FOR SSL do not verified certificate + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE); + curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE ); + // FeedBurner requires a proper USER-AGENT... curl_setopt($curl, CURL_HTTP_VERSION_1_1, true); curl_setopt($curl, CURLOPT_ENCODING, "gzip, deflate"); @@ -54,7 +58,15 @@ function get_external_file($url) } else { // create http context and add timeout and user-agent - $context = stream_context_create(array('http'=>array('timeout' => $timeout,'header'=> "User-Agent: ".$useragent,/*spoot Mozilla Firefox*/'follow_location' => true))); + $context = stream_context_create(array( + 'http'=>array('timeout' => $timeout, + 'header'=> "User-Agent: ".$useragent, /*spoot Mozilla Firefox*/ + 'follow_location' => true), + // FOR SSL do not verified certificate + 'ssl' => array('verify_peer' => false, + 'allow_self_signed' => true) + ) + ); // only download page lesser than 4MB $data = @file_get_contents($url, false, $context, -1, 4000000); // We download at most 4 MB from source. @@ -98,6 +110,8 @@ function get_external_file($url) */ function prepare_url($url) { + global $msg; + $parametres = array(); $url = html_entity_decode(trim($url)); @@ -108,14 +122,21 @@ function prepare_url($url) $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i); $title = $url; - if (!preg_match('!^https?://!i', $url)) - $url = 'http://' . $url; + $html = Encoding::toUTF8(get_external_file($url,15)); + // If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol + if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) { + $url = 'http://' . $url; + $html = Encoding::toUTF8(get_external_file($url,15)); + } - $html = Encoding::toUTF8(get_external_file($url,15)); if (isset($html) and strlen($html) > 0) { $r = new Readability($html, $url); + $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES; + $r->debug=true; + $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; + if($r->init()) { $content = $r->articleContent->innerHTML; -- cgit v1.2.3 From cdcc8d2533d2ed65ac6a89c9a6d0041de7361ce1 Mon Sep 17 00:00:00 2001 From: memiks Date: Tue, 23 Apr 2013 08:09:54 -0500 Subject: Remove debug on Readability output --- inc/functions.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index b27120c5..0303aab6 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -134,8 +134,7 @@ function prepare_url($url) $r = new Readability($html, $url); $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES; - $r->debug=true; - $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; + $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; if($r->init()) { @@ -372,4 +371,4 @@ function logm($message) { $t = strval(date('Y/m/d_H:i:s')).' - '.$_SERVER["REMOTE_ADDR"].' - '.strval($message)."\n"; file_put_contents('./log.txt',$t,FILE_APPEND); -} \ No newline at end of file +} -- cgit v1.2.3 From 2987031bc3d30437e7b34c3fe912a0ccbcc87f10 Mon Sep 17 00:00:00 2001 From: nicosomb Date: Tue, 23 Apr 2013 15:25:12 +0200 Subject: Fixed #73 - Can't Poch url with special caracter --- inc/functions.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index b830b616..c6cde82f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -39,9 +39,9 @@ function get_external_file($url) curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_HEADER, false); - // FOR SSL do not verified certificate + // FOR SSL do not verified certificate curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE); - curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE ); + curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE ); // FeedBurner requires a proper USER-AGENT... curl_setopt($curl, CURL_HTTP_VERSION_1_1, true); @@ -59,14 +59,14 @@ function get_external_file($url) // create http context and add timeout and user-agent $context = stream_context_create(array( - 'http'=>array('timeout' => $timeout, - 'header'=> "User-Agent: ".$useragent, /*spoot Mozilla Firefox*/ - 'follow_location' => true), - // FOR SSL do not verified certificate - 'ssl' => array('verify_peer' => false, - 'allow_self_signed' => true) - ) - ); + 'http'=>array('timeout' => $timeout, + 'header'=> "User-Agent: ".$useragent, /*spoot Mozilla Firefox*/ + 'follow_location' => true), + // FOR SSL do not verified certificate + 'ssl' => array('verify_peer' => false, + 'allow_self_signed' => true) + ) + ); // only download page lesser than 4MB $data = @file_get_contents($url, false, $context, -1, 4000000); // We download at most 4 MB from source. @@ -122,19 +122,19 @@ function prepare_url($url) $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i); $title = $url; - $html = Encoding::toUTF8(get_external_file($url,15)); - // If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol - if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) { - $url = 'http://' . $url; - $html = Encoding::toUTF8(get_external_file($url,15)); - } + $html = Encoding::toUTF8(get_external_file($url,15)); + // If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol + if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) { + $url = 'http://' . $url; + $html = Encoding::toUTF8(get_external_file($url,15)); + } if (isset($html) and strlen($html) > 0) { $r = new Readability($html, $url); - + $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES; - $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; + $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; if($r->init()) { -- cgit v1.2.3 From c1c9f252f7f0133903dc4143a0db8ed8104f8733 Mon Sep 17 00:00:00 2001 From: nicosomb Date: Tue, 23 Apr 2013 15:37:03 +0200 Subject: display flash message in article view --- inc/functions.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index c6cde82f..7db9e909 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -110,8 +110,6 @@ function get_external_file($url) */ function prepare_url($url) { - global $msg; - $parametres = array(); $url = html_entity_decode(trim($url)); -- cgit v1.2.3 From 494e21b4da955912b9e521787650e269818b1147 Mon Sep 17 00:00:00 2001 From: nicosomb Date: Tue, 23 Apr 2013 16:03:52 +0200 Subject: add tidy call to clean html output --- inc/functions.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index 7db9e909..c2a149c6 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -127,6 +127,12 @@ function prepare_url($url) $html = Encoding::toUTF8(get_external_file($url,15)); } + if (function_exists('tidy_parse_string')) { + $tidy = tidy_parse_string($html, array(), 'UTF8'); + $tidy->cleanRepair(); + $html = $tidy->value; + } + if (isset($html) and strlen($html) > 0) { $r = new Readability($html, $url); @@ -279,7 +285,13 @@ function display_view($view, $id = 0, $full_head = 'yes') $tpl->assign('id', $entry['id']); $tpl->assign('url', $entry['url']); $tpl->assign('title', $entry['title']); - $tpl->assign('content', $entry['content']); + $content = $entry['content']; + if (function_exists('tidy_parse_string')) { + $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8'); + $tidy->cleanRepair(); + $content = $tidy->value; + } + $tpl->assign('content', $content); $tpl->assign('is_fav', $entry['is_fav']); $tpl->assign('is_read', $entry['is_read']); $tpl->assign('load_all_js', 0); -- cgit v1.2.3 From aa8c9f2a32ea75278d52c86c6a3a39d34bce5cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 31 May 2013 22:55:52 +0200 Subject: Installation mode --- inc/functions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index c2a149c6..73e591c5 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -23,6 +23,11 @@ function get_poche_url() return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; } +function encode_string($string) +{ + return sha1($string . SALT); +} + // function define to retrieve url content function get_external_file($url) { @@ -375,12 +380,10 @@ function action_to_do($action, $url, $id = 0) break; case 'toggle_fav' : $store->favoriteById($id); - $msg->add('s', 'the favorite toggle has been done successfully'); logm('mark as favorite link #' . $id); break; case 'toggle_archive' : $store->archiveById($id); - $msg->add('s', 'the archive toggle has been done successfully'); logm('archive link #' . $id); break; default: -- cgit v1.2.3