From 3db95a85de1297908e780742cd0b7d779c5f522e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 Jul 2013 19:09:06 +0200 Subject: update external libs --- inc/JSLikeHTMLElement.php | 12 +-- inc/Readability.php | 198 +++++++++++++++++++++++----------------------- 2 files changed, 105 insertions(+), 105 deletions(-) (limited to 'inc') diff --git a/inc/JSLikeHTMLElement.php b/inc/JSLikeHTMLElement.php index dfcc1be5..238ba8a8 100644 --- a/inc/JSLikeHTMLElement.php +++ b/inc/JSLikeHTMLElement.php @@ -4,7 +4,7 @@ * * This class extends PHP's DOMElement to allow * users to get and set the innerHTML property of -* HTML elements in the same way it's done in +* HTML elements in the same way it's done in * JavaScript. * * Example usage: @@ -15,16 +15,16 @@ * $doc->registerNodeClass('DOMElement', 'JSLikeHTMLElement'); * $doc->loadHTML('

Para 1

Para 2

'); * $elem = $doc->getElementsByTagName('div')->item(0); -* +* * // print innerHTML * echo $elem->innerHTML; // prints '

Para 1

Para 2

' * echo "\n\n"; -* +* * // set innerHTML * $elem->innerHTML = 'FiveFilters.org'; * echo $elem->innerHTML; // prints 'FiveFilters.org' * echo "\n\n"; -* +* * // print document (with our changes) * echo $doc->saveXML(); * @endcode @@ -59,7 +59,7 @@ class JSLikeHTMLElement extends DOMElement $value = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8'); // Using will generate a warning, but so will bad HTML // (and by this point, bad HTML is what we've got). - // We use it (and suppress the warning) because an HTML fragment will + // We use it (and suppress the warning) because an HTML fragment will // be wrapped around tags which we don't really want to keep. // Note: despite the warning, if loadHTML succeeds it will return true. $result = @$f->loadHTML(''.$value.''); @@ -86,7 +86,7 @@ class JSLikeHTMLElement extends DOMElement * @code * $string = $div->innerHTML; * @endcode - */ + */ public function __get($name) { if ($name == 'innerHTML') { diff --git a/inc/Readability.php b/inc/Readability.php index d28d28f9..e1e8738b 100644 --- a/inc/Readability.php +++ b/inc/Readability.php @@ -1,5 +1,5 @@ '/((\s| ?)*){1,}/', 'video' => '!//(player\.|www\.)?(youtube|vimeo|viddler)\.com!i', 'skipFootnoteLink' => '/^\s*(\[?[a-z0-9]{1,2}\]?|^|edit|citation needed)\s*$/i' - ); - + ); + /* constants */ const FLAG_STRIP_UNLIKELYS = 1; const FLAG_WEIGHT_CLASSES = 2; const FLAG_CLEAN_CONDITIONALLY = 4; - + /** * Create instance of Readability * @param string UTF-8 encoded string * @param string (optional) URL associated with HTML (used for footnotes) * @param string which parser to use for turning raw HTML into a DOMDocument (either 'libxml' or 'html5lib') - */ + */ function __construct($html, $url=null, $parser='libxml') { $this->url = $url; @@ -135,18 +135,18 @@ class Readability public function getTitle() { return $this->articleTitle; } - + /** * Get article content element * @return DOMElement */ public function getContent() { return $this->articleContent; - } - + } + /** * Runs readability. - * + * * Workflow: * 1. Prep the document by removing script tags, css, etc. * 2. Build readability's DOM tree. @@ -161,7 +161,7 @@ class Readability if (!isset($this->dom->documentElement)) return false; $this->removeScripts($this->dom); //die($this->getInnerHTML($this->dom->documentElement)); - + // Assume successful outcome $this->success = true; @@ -176,7 +176,7 @@ class Readability } $this->prepDocument(); - + //die($this->dom->documentElement->parentNode->nodeType); //$this->setInnerHTML($this->dom->documentElement, $this->getInnerHTML($this->dom->documentElement)); //die($this->getInnerHTML($this->dom->documentElement)); @@ -191,9 +191,9 @@ class Readability $this->success = false; $articleContent = $this->dom->createElement('div'); $articleContent->setAttribute('id', 'readability-content'); - $articleContent->innerHTML = '

Sorry, Readability was unable to parse this page for content.

'; + $articleContent->innerHTML = '

Sorry, Readability was unable to parse this page for content.

'; } - + $overlay->setAttribute('id', 'readOverlay'); $innerDiv->setAttribute('id', 'readInner'); @@ -201,7 +201,7 @@ class Readability $innerDiv->appendChild($articleTitle); $innerDiv->appendChild($articleContent); $overlay->appendChild($innerDiv); - + /* Clear the old HTML, insert the new content. */ $this->body->innerHTML = ''; $this->body->appendChild($overlay); @@ -209,21 +209,21 @@ class Readability $this->body->removeAttribute('style'); $this->postProcessContent($articleContent); - + // Set title and content instance variables $this->articleTitle = $articleTitle; $this->articleContent = $articleContent; - + return $this->success; } - + /** * Debug */ protected function dbg($msg) { if ($this->debug) echo '* ',$msg, "\n"; } - + /** * Run any post-process modifications to article content as necessary. * @@ -231,11 +231,11 @@ class Readability * @return void */ public function postProcessContent($articleContent) { - if ($this->convertLinksToFootnotes && !preg_match('/wikipedia\.org/', @$this->url)) { + if ($this->convertLinksToFootnotes && !preg_match('/wikipedia\.org/', @$this->url)) { $this->addFootnotes($articleContent); } } - + /** * Get the article title as an H1. * @@ -248,11 +248,11 @@ class Readability try { $curTitle = $origTitle = $this->getInnerText($this->dom->getElementsByTagName('title')->item(0)); } catch(Exception $e) {} - + if (preg_match('/ [\|\-] /', $curTitle)) { $curTitle = preg_replace('/(.*)[\|\-] .*/i', '$1', $origTitle); - + if (count(explode(' ', $curTitle)) < 3) { $curTitle = preg_replace('/[^\|\-]*[\|\-](.*)/i', '$1', $origTitle); } @@ -279,17 +279,17 @@ class Readability if (count(explode(' ', $curTitle)) <= 4) { $curTitle = $origTitle; } - + $articleTitle = $this->dom->createElement('h1'); $articleTitle->innerHTML = $curTitle; - + return $articleTitle; } - + /** * Prepare the HTML document for readability to scrape it. * This includes things like stripping javascript, CSS, and handling terrible markup. - * + * * @return void **/ protected function prepDocument() { @@ -328,13 +328,13 @@ class Readability $footnotesWrapper = $this->dom->createElement('div'); $footnotesWrapper->setAttribute('id', 'readability-footnotes'); $footnotesWrapper->innerHTML = '

References

'; - + $articleFootnotes = $this->dom->createElement('ol'); $articleFootnotes->setAttribute('id', 'readability-footnotes-list'); $footnotesWrapper->appendChild($articleFootnotes); - + $articleLinks = $articleContent->getElementsByTagName('a'); - + $linkCount = 0; for ($i = 0; $i < $articleLinks->length; $i++) { @@ -346,11 +346,11 @@ class Readability if (!$linkDomain && isset($this->url)) $linkDomain = @parse_url($this->url, PHP_URL_HOST); //linkDomain = footnoteLink.host ? footnoteLink.host : document.location.host, $linkText = $this->getInnerText($articleLink); - + if ((strpos($articleLink->getAttribute('class'), 'readability-DoNotFootnote') !== false) || preg_match($this->regexps['skipFootnoteLink'], $linkText)) { continue; } - + $linkCount++; /** Add a superscript reference after the article link */ @@ -358,7 +358,7 @@ class Readability $refLink->innerHTML = '^{[' . $linkCount . ']}'; $refLink->setAttribute('class', 'readability-DoNotFootnote'); $refLink->setAttribute('style', 'color: inherit;'); - + //TODO: does this work or should we use DOMNode.isSameNode()? if ($articleLink->parentNode->lastChild == $articleLink) { $articleLink->parentNode->appendChild($refLink); @@ -373,15 +373,15 @@ class Readability $footnoteLink->innerHTML = ($footnoteLink->getAttribute('title') != '' ? $footnoteLink->getAttribute('title') : $linkText); $footnoteLink->setAttribute('name', 'readabilityFootnoteLink-' . $linkCount); - + $footnote->appendChild($footnoteLink); if ($linkDomain) $footnote->innerHTML = $footnote->innerHTML . ' (' . $linkDomain . ')'; - + $articleFootnotes->appendChild($footnote); } if ($linkCount > 0) { - $articleContent->appendChild($footnotesWrapper); + $articleContent->appendChild($footnotesWrapper); } } @@ -404,7 +404,7 @@ class Readability //} } } - + /** * Prepare the article node for display. Clean out any inline styles, * iframes, forms, strip extraneous

tags, etc. @@ -429,7 +429,7 @@ class Readability * as a header and not a subheader, so remove it since we already have a header. ***/ if (!$this->lightClean && ($articleContent->getElementsByTagName('h2')->length == 1)) { - $this->clean($articleContent, 'h2'); + $this->clean($articleContent, 'h2'); } $this->clean($articleContent, 'iframe'); @@ -448,7 +448,7 @@ class Readability $embedCount = $articleParagraphs->item($i)->getElementsByTagName('embed')->length; $objectCount = $articleParagraphs->item($i)->getElementsByTagName('object')->length; $iframeCount = $articleParagraphs->item($i)->getElementsByTagName('iframe')->length; - + if ($imgCount === 0 && $embedCount === 0 && $objectCount === 0 && $iframeCount === 0 && $this->getInnerText($articleParagraphs->item($i), false) == '') { $articleParagraphs->item($i)->parentNode->removeChild($articleParagraphs->item($i)); @@ -457,13 +457,13 @@ class Readability try { $articleContent->innerHTML = preg_replace('/]*>\s*

innerHTML); - //articleContent.innerHTML = articleContent.innerHTML.replace(/]*>\s*

]*>\s*

dbg("Cleaning innerHTML of breaks failed. This is an IE strict-block-elements bug. Ignoring.: " . $e); } } - + /** * Initialize a node with the readability object. Also checks the * className/id for special names to add to its score. @@ -474,7 +474,7 @@ class Readability protected function initializeNode($node) { $readability = $this->dom->createAttribute('readability'); $readability->value = 0; // this is our contentScore - $node->setAttributeNode($readability); + $node->setAttributeNode($readability); switch (strtoupper($node->tagName)) { // unsure if strtoupper is needed, but using it just in case case 'DIV': @@ -486,7 +486,7 @@ class Readability case 'BLOCKQUOTE': $readability->value += 3; break; - + case 'ADDRESS': case 'OL': case 'UL': @@ -510,7 +510,7 @@ class Readability } $readability->value += $this->getClassWeight($node); } - + /*** * grabArticle - Using a variety of metrics (content score, classname, element types), find the content that is * most likely to be the stuff a user wants to read. Then return it wrapped up in a div. @@ -548,7 +548,7 @@ class Readability $node->parentNode->removeChild($node); $nodeIndex--; continue; - } + } } if ($tagName == 'P' || $tagName == 'TD' || $tagName == 'PRE') { @@ -589,7 +589,7 @@ class Readability } } } - + /** * Loop through all paragraphs, and assign a score to them based on how content-y they look. * Then add their score to their parent node. @@ -613,7 +613,7 @@ class Readability } /* Initialize readability data for the parent. */ - if (!$parentNode->hasAttribute('readability')) + if (!$parentNode->hasAttribute('readability')) { $this->initializeNode($parentNode); $candidates[] = $parentNode; @@ -633,15 +633,15 @@ class Readability /* Add points for any commas within this paragraph */ $contentScore += count(explode(',', $innerText)); - + /* For every 100 characters in this paragraph, add another point. Up to 3 points. */ $contentScore += min(floor(strlen($innerText) / 100), 3); - + /* Add the score to the parent. The grandparent gets half. */ $parentNode->getAttributeNode('readability')->value += $contentScore; if ($grandParentNode) { - $grandParentNode->getAttributeNode('readability')->value += $contentScore/2; + $grandParentNode->getAttributeNode('readability')->value += $contentScore/2; } } @@ -727,12 +727,12 @@ class Readability { $append = true; } - + if (strtoupper($siblingNode->nodeName) == 'P') { $linkDensity = $this->getLinkDensity($siblingNode); $nodeContent = $this->getInnerText($siblingNode); $nodeLength = strlen($nodeContent); - + if ($nodeLength > 80 && $linkDensity < 0.25) { $append = true; @@ -751,7 +751,7 @@ class Readability $sibNodeName = strtoupper($siblingNode->nodeName); if ($sibNodeName != 'DIV' && $sibNodeName != 'P') { /* We have a node that isn't a common block level element, like a form or td tag. Turn it into a div so it doesn't get filtered out later by accident. */ - + $this->dbg('Altering siblingNode of ' . $sibNodeName . ' to div.'); $nodeToAppend = $this->dom->createElement('div'); try { @@ -770,7 +770,7 @@ class Readability $s--; $sl--; } - + /* To ensure a node does not interfere with readability styles, remove its classnames */ $nodeToAppend->removeAttribute('class'); @@ -796,14 +796,14 @@ class Readability // in the meantime, we check and create an empty element if it's not there. if (!isset($this->body->childNodes)) $this->body = $this->dom->createElement('body'); $this->body->innerHTML = $this->bodyCache; - + if ($this->flagIsActive(self::FLAG_STRIP_UNLIKELYS)) { $this->removeFlag(self::FLAG_STRIP_UNLIKELYS); return $this->grabArticle($this->body); } else if ($this->flagIsActive(self::FLAG_WEIGHT_CLASSES)) { $this->removeFlag(self::FLAG_WEIGHT_CLASSES); - return $this->grabArticle($this->body); + return $this->grabArticle($this->body); } else if ($this->flagIsActive(self::FLAG_CLEAN_CONDITIONALLY)) { $this->removeFlag(self::FLAG_CLEAN_CONDITIONALLY); @@ -815,7 +815,7 @@ class Readability } return $articleContent; } - + /** * Remove script tags from document * @@ -829,7 +829,7 @@ class Readability $scripts->item($i)->parentNode->removeChild($scripts->item($i)); } } - + /** * Get the inner text of a node. * This also strips out any excess whitespace to be found. @@ -878,11 +878,11 @@ class Readability $elem->removeAttribute('style'); } } - + /** * Get the density of links as a percentage of the content * This is the amount of text that is inside a link divided by the total text in the node. - * + * * @param DOMElement $e * @return number (float) */ @@ -900,9 +900,9 @@ class Readability return 0; } } - + /** - * Get an elements class/id weight. Uses regular expressions to tell if this + * Get an elements class/id weight. Uses regular expressions to tell if this * element looks good or bad. * * @param DOMElement $e @@ -964,7 +964,7 @@ class Readability public function clean($e, $tag) { $targetList = $e->getElementsByTagName($tag); $isEmbed = ($tag == 'iframe' || $tag == 'object' || $tag == 'embed'); - + for ($y=$targetList->length-1; $y >= 0; $y--) { /* Allow youtube and vimeo videos through as people usually want to see those. */ if ($isEmbed) { @@ -972,7 +972,7 @@ class Readability for ($i=0, $il=$targetList->item($y)->attributes->length; $i < $il; $i++) { $attributeValues .= $targetList->item($y)->attributes->item($i)->value . '|'; // DOMAttr? (TODO: test) } - + /* First, check the elements attributes to see if any of them contain youtube or vimeo */ if (preg_match($this->regexps['video'], $attributeValues)) { continue; @@ -986,10 +986,10 @@ class Readability $targetList->item($y)->parentNode->removeChild($targetList->item($y)); } } - + /** * Clean an element of all tags of type "tag" if they look fishy. - * "Fishy" is an algorithm based on content length, classnames, + * "Fishy" is an algorithm based on content length, classnames, * link density, number of images & embeds, etc. * * @param DOMElement $e @@ -1013,7 +1013,7 @@ class Readability for ($i=$curTagsLength-1; $i >= 0; $i--) { $weight = $this->getClassWeight($tagsList->item($i)); $contentScore = ($tagsList->item($i)->hasAttribute('readability')) ? (int)$tagsList->item($i)->getAttribute('readability') : 0; - + $this->dbg('Cleaning Conditionally ' . $tagsList->item($i)->tagName . ' (' . $tagsList->item($i)->getAttribute('class') . ':' . $tagsList->item($i)->getAttribute('id') . ')' . (($tagsList->item($i)->hasAttribute('readability')) ? (' with score ' . $tagsList->item($i)->getAttribute('readability')) : '')); if ($weight + $contentScore < 0) { @@ -1034,13 +1034,13 @@ class Readability $embeds = $tagsList->item($i)->getElementsByTagName('embed'); for ($ei=0, $il=$embeds->length; $ei < $il; $ei++) { if (preg_match($this->regexps['video'], $embeds->item($ei)->getAttribute('src'))) { - $embedCount++; + $embedCount++; } } $embeds = $tagsList->item($i)->getElementsByTagName('iframe'); for ($ei=0, $il=$embeds->length; $ei < $il; $ei++) { if (preg_match($this->regexps['video'], $embeds->item($ei)->getAttribute('src'))) { - $embedCount++; + $embedCount++; } } @@ -1058,7 +1058,7 @@ class Readability $toRemove = true; } else if ( $input > floor($p/3) ) { $this->dbg(' too many elements'); - $toRemove = true; + $toRemove = true; } else if ($contentLength < 25 && ($embedCount === 0 && ($img === 0 || $img > 2))) { $this->dbg(' content length less than 25 chars, 0 embeds and either 0 images or more than 2 images'); $toRemove = true; @@ -1082,7 +1082,7 @@ class Readability $toRemove = true; } else if ( $input > floor($p/3) ) { $this->dbg(' too many elements'); - $toRemove = true; + $toRemove = true; } else if ($contentLength < 25 && ($img === 0 || $img > 2) ) { $this->dbg(' content length less than 25 chars and 0 images, or more than 2 images'); $toRemove = true; @@ -1126,11 +1126,11 @@ class Readability public function flagIsActive($flag) { return ($this->flags & $flag) > 0; } - + public function addFlag($flag) { $this->flags = $this->flags | $flag; } - + public function removeFlag($flag) { $this->flags = $this->flags & ~$flag; } -- cgit v1.2.3 From 538cdfa8839ca9a3d0bfe9b1a89af8e125aa3490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 Jul 2013 19:37:14 +0200 Subject: fix #70: if demo mode, fields are filled --- inc/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/config.php b/inc/config.php index bd9287fe..a21b388d 100644 --- a/inc/config.php +++ b/inc/config.php @@ -8,13 +8,13 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE_VERSION', '0.2.1'); +define ('POCHE_VERSION', '0.3'); if (!is_dir('db/')) { @mkdir('db/',0705); } -define ('MODE_DEMO', FALSE); +define ('MODE_DEMO', TRUE); define ('ABS_PATH', 'assets/'); define ('CONVERT_LINKS_FOOTNOTES', TRUE); define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); -- cgit v1.2.3 From 4d8bcc0c6b4902f3c7a37f3c8eaf18a064028869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 Jul 2013 19:58:14 +0200 Subject: set demo mode to false --- inc/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/config.php b/inc/config.php index a21b388d..4b46366d 100644 --- a/inc/config.php +++ b/inc/config.php @@ -14,7 +14,7 @@ if (!is_dir('db/')) { @mkdir('db/',0705); } -define ('MODE_DEMO', TRUE); +define ('MODE_DEMO', FALSE); define ('ABS_PATH', 'assets/'); define ('CONVERT_LINKS_FOOTNOTES', TRUE); define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); -- cgit v1.2.3 From 2ee436eaa19fd5819a0e6c705b5fcc93f11fb338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 2 Aug 2013 10:39:03 +0200 Subject: poche / pocket / bolsillo / Tasche & more --- inc/MyTool.class.php | 2 +- inc/config.php | 7 +++++++ inc/functions.php | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/MyTool.class.php b/inc/MyTool.class.php index 1f5051a4..b11f18e9 100644 --- a/inc/MyTool.class.php +++ b/inc/MyTool.class.php @@ -15,7 +15,7 @@ class MyTool define('START_TIME', microtime(true)); if (phpversion() < 5) { - die("Argh you don't have PHP 5 !"); + die(_('Oops, it seems you don\'t have PHP 5.')); } error_reporting(E_ALL); diff --git a/inc/config.php b/inc/config.php index 4b46366d..6e3f80b8 100644 --- a/inc/config.php +++ b/inc/config.php @@ -20,6 +20,13 @@ define ('CONVERT_LINKS_FOOTNOTES', TRUE); define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); define ('DOWNLOAD_PICTURES', TRUE); define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX'); +define ('LANG', 'fr_FR.UTF8'); + +putenv("LC_ALL=".LANG); +setlocale(LC_ALL, LANG); +bindtextdomain(LANG, "./locale"); +textdomain(LANG); + $storage_type = 'sqlite'; # sqlite or file include 'functions.php'; diff --git a/inc/functions.php b/inc/functions.php index 73e591c5..34ecf510 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -349,19 +349,19 @@ function action_to_do($action, $url, $id = 0) 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'); + $msg->add('e', _('error during insertion : the link wasn\'t added')); } } else { - $msg->add('e', 'error during url preparation : the link wasn\'t added'); + $msg->add('e', _('error during url preparation : the link wasn\'t added')); logm('error during url preparation'); } } else { - $msg->add('e', 'error during url preparation : the link is not valid'); + $msg->add('e', _('error during url preparation : the link is not valid')); logm($url . ' is not a valid url'); } @@ -370,11 +370,11 @@ function action_to_do($action, $url, $id = 0) case 'delete': if ($store->deleteById($id)) { remove_directory(ABS_PATH . $id); - $msg->add('s', 'the link has been deleted successfully'); + $msg->add('s', _('the link has been deleted successfully')); logm('delete link #' . $id); } else { - $msg->add('e', 'the link wasn\'t deleted'); + $msg->add('e', _('the link wasn\'t deleted')); logm('error : can\'t delete link #' . $id); } break; -- cgit v1.2.3 From 408f3df28e0b872847d2c4b6a91c63bbd18cd7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 2 Aug 2013 11:48:57 +0200 Subject: URL is now encoded --- inc/functions.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc') diff --git a/inc/functions.php b/inc/functions.php index 34ecf510..ee26fbaa 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -342,6 +342,8 @@ function action_to_do($action, $url, $id = 0) if ($url == '') continue; + $url = base64_decode($url); + error_log(print_r($url, TRUE)); if (MyTool::isUrl($url)) { if($parametres_url = prepare_url($url)) { if ($store->add($url, $parametres_url['title'], $parametres_url['content'])) { -- cgit v1.2.3 From f6c9baab3efeec1d0efa151e276fc08d5b58f9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 2 Aug 2013 21:40:29 +0200 Subject: rename myTool -> pocheTool and delete some stuff --- inc/MyTool.class.php | 265 ------------------------------------------------ inc/class.messages.php | 231 ----------------------------------------- inc/pocheTool.class.php | 101 ++++++++++++++++++ 3 files changed, 101 insertions(+), 496 deletions(-) delete mode 100644 inc/MyTool.class.php delete mode 100644 inc/class.messages.php create mode 100644 inc/pocheTool.class.php (limited to 'inc') diff --git a/inc/MyTool.class.php b/inc/MyTool.class.php deleted file mode 100644 index b11f18e9..00000000 --- a/inc/MyTool.class.php +++ /dev/null @@ -1,265 +0,0 @@ - - * @copyright 2013 - * @license http://www.wtfpl.net/ see COPYING file - */ - -class MyTool -{ - public static function initPhp() - { - define('START_TIME', microtime(true)); - - if (phpversion() < 5) { - die(_('Oops, it seems you don\'t have PHP 5.')); - } - - error_reporting(E_ALL); - - function stripslashesDeep($value) { - return is_array($value) - ? array_map('stripslashesDeep', $value) - : stripslashes($value); - } - - if (get_magic_quotes_gpc()) { - $_POST = array_map('stripslashesDeep', $_POST); - $_GET = array_map('stripslashesDeep', $_GET); - $_COOKIE = array_map('stripslashesDeep', $_COOKIE); - } - - ob_start(); - register_shutdown_function('ob_end_flush'); - } - - public static function isUrl($url) - { - // http://neo22s.com/check-if-url-exists-and-is-online-php/ - $pattern='|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i'; - - return preg_match($pattern, $url); - } - - public static function isEmail($email) - { - $pattern = "/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2, 4}$/i"; - - return (preg_match($pattern, $email)); - } - - public static function formatBBCode($text) - { - $replace = array( - '/\[m\](.+?)\[\/m\]/is' - => '/* moderate */', - '/\[b\](.+?)\[\/b\]/is' - => '$1', - '/\[i\](.+?)\[\/i\]/is' - => '$1', - '/\[s\](.+?)\[\/s\]/is' - => '$1', - '/\[u\](.+?)\[\/u\]/is' - => '$1', - '/\[url\](.+?)\[\/url]/is' - => '$1', - '/\[url=(\w+:\/\/[^\]]+)\](.+?)\[\/url]/is' - => '$2', - '/\[quote\](.+?)\[\/quote\]/is' - => '

$1

', - '/\[code\](.+?)\[\/code\]/is' - => '$1', - '/\[([^[]+)\|([^[]+)\]/is' - => '$1' - ); - $text = preg_replace( - array_keys($replace), - array_values($replace), - $text - ); - - return $text; - } - - public static function formatText($text) - { - $text = preg_replace_callback( - '/(.*?)<\/code_html>/is', - create_function( - '$matches', - 'return htmlspecialchars($matches[1]);' - ), - $text - ); - $text = preg_replace_callback( - '/(.*?)<\/code_php>/is', - create_function( - '$matches', - 'return highlight_string("", true);' - ), - $text - ); - $text = preg_replace('/
/is', '', $text); - - $text = preg_replace( - '#(^|\s)([a-z]+://([^\s\w/]?[\w/])*)(\s|$)#im', - '\\1\\2\\4', - $text - ); - $text = preg_replace( - '#(^|\s)wp:?([a-z]{2}|):([\w]+)#im', - '\\1\\3', - $text - ); - $text = str_replace( - 'http://.wikipedia.org/wiki/', - 'http://www.wikipedia.org/wiki/', - $text - ); - $text = str_replace('\wp:', 'wp:', $text); - $text = str_replace('\http:', 'http:', $text); - $text = MyTool::formatBBCode($text); - $text = nl2br($text); - - return $text; - } - - public static function getUrl() - { - $https = (!empty($_SERVER['HTTPS']) - && (strtolower($_SERVER['HTTPS']) == 'on')) - || (isset($_SERVER["SERVER_PORT"]) - && $_SERVER["SERVER_PORT"] == '443'); // HTTPS detection. - $serverport = (!isset($_SERVER["SERVER_PORT"]) - || $_SERVER["SERVER_PORT"] == '80' - || ($https && $_SERVER["SERVER_PORT"] == '443') - ? '' - : ':' . $_SERVER["SERVER_PORT"]); - - $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); - - if (!isset($_SERVER["SERVER_NAME"])) { - return $scriptname; - } - - return 'http' . ($https ? 's' : '') . '://' - . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; - } - - public static function rrmdir($dir) - { - if (is_dir($dir) && ($d = @opendir($dir))) { - while (($file = @readdir($d)) !== false) { - if ( $file == '.' || $file == '..' ) { - continue; - } else { - unlink($dir . '/' . $file); - } - } - } - } - - public static function humanBytes($bytes) - { - $siPrefix = array( 'bytes', 'KB', 'MB', 'GB', 'TB', 'EB', 'ZB', 'YB' ); - $base = 1024; - $class = min((int) log($bytes, $base), count($siPrefix) - 1); - $val = sprintf('%1.2f', $bytes / pow($base, $class)); - - return $val . ' ' . $siPrefix[$class]; - } - - public static function returnBytes($val) - { - $val = trim($val); - $last = strtolower($val[strlen($val)-1]); - switch($last) - { - case 'g': $val *= 1024; - case 'm': $val *= 1024; - case 'k': $val *= 1024; - } - - return $val; - } - - public static function getMaxFileSize() - { - $sizePostMax = MyTool::returnBytes(ini_get('post_max_size')); - $sizeUploadMax = MyTool::returnBytes(ini_get('upload_max_filesize')); - - // Return the smaller of two: - return min($sizePostMax, $sizeUploadMax); - } - - public static function smallHash($text) - { - $t = rtrim(base64_encode(hash('crc32', $text, true)), '='); - // Get rid of characters which need encoding in URLs. - $t = str_replace('+', '-', $t); - $t = str_replace('/', '_', $t); - $t = str_replace('=', '@', $t); - - return $t; - } - - public static function renderJson($data) - { - header('Cache-Control: no-cache, must-revalidate'); - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); - header('Content-type: application/json; charset=UTF-8'); - - echo json_encode($data); - exit(); - } - - public static function grabToLocal($url, $file, $force = false) - { - if ((!file_exists($file) || $force) && in_array('curl', get_loaded_extensions())){ - $ch = curl_init ($url); - curl_setopt($ch, CURLOPT_HEADER, false); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); - $raw = curl_exec($ch); - if (curl_getinfo($ch, CURLINFO_HTTP_CODE) == 200) { - $fp = fopen($file, 'x'); - fwrite($fp, $raw); - fclose($fp); - } - curl_close ($ch); - } - } - - public static function redirect($rurl = '') - { - if ($rurl === '') { - // if (!empty($_SERVER['HTTP_REFERER']) && strcmp(parse_url($_SERVER['HTTP_REFERER'],PHP_URL_HOST),$_SERVER['SERVER_NAME'])==0) - $rurl = (empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']); - if (isset($_POST['returnurl'])) { - $rurl = $_POST['returnurl']; - } - } - - // prevent loop - if (empty($rurl) || parse_url($rurl, PHP_URL_QUERY) === $_SERVER['QUERY_STRING']) { - $rurl = MyTool::getUrl(); - } - - if (substr($rurl, 0, 1) !== '?') { - $ref = MyTool::getUrl(); - if (substr($rurl, 0, strlen($ref)) !== $ref) { - $rurl = $ref; - } - } - header('Location: '.$rurl); - exit(); - } - - public static function silence_errors($num, $str) - { -// No-op - } -} \ No newline at end of file diff --git a/inc/class.messages.php b/inc/class.messages.php deleted file mode 100644 index 6d515bf6..00000000 --- a/inc/class.messages.php +++ /dev/null @@ -1,231 +0,0 @@ -\n%s\n"; - var $msgBefore = '

'; - var $msgAfter = "

\n"; - - - /** - * Constructor - * @author Mike Everhart - */ - public function __construct() { - - // Generate a unique ID for this user and session - $this->msgId = md5(uniqid()); - - // Create the session array if it doesnt already exist - if( !array_key_exists('flash_messages', $_SESSION) ) $_SESSION['flash_messages'] = array(); - - } - - /** - * Add a message to the queue - * - * @author Mike Everhart - * - * @param string $type The type of message to add - * @param string $message The message - * @param string $redirect_to (optional) If set, the user will be redirected to this URL - * @return bool - * - */ - public function add($type, $message, $redirect_to=null) { - - if( !isset($_SESSION['flash_messages']) ) return false; - - if( !isset($type) || !isset($message[0]) ) return false; - - // Replace any shorthand codes with their full version - if( strlen(trim($type)) == 1 ) { - $type = str_replace( array('h', 'i', 'w', 'e', 's'), array('help', 'info', 'warning', 'error', 'success'), $type ); - - // Backwards compatibility... - } elseif( $type == 'information' ) { - $type = 'info'; - } - - // Make sure it's a valid message type - if( !in_array($type, $this->msgTypes) ) die('"' . strip_tags($type) . '" is not a valid message type!' ); - - // If the session array doesn't exist, create it - if( !array_key_exists( $type, $_SESSION['flash_messages'] ) ) $_SESSION['flash_messages'][$type] = array(); - - $_SESSION['flash_messages'][$type][] = $message; - - if( !is_null($redirect_to) ) { - header("Location: $redirect_to"); - exit(); - } - - return true; - - } - - //----------------------------------------------------------------------------------------------- - // display() - // print queued messages to the screen - //----------------------------------------------------------------------------------------------- - /** - * Display the queued messages - * - * @author Mike Everhart - * - * @param string $type Which messages to display - * @param bool $print True = print the messages on the screen - * @return mixed - * - */ - public function display($type='all', $print=true) { - $messages = ''; - $data = ''; - - if( !isset($_SESSION['flash_messages']) ) return false; - - if( $type == 'g' || $type == 'growl' ) { - $this->displayGrowlMessages(); - return true; - } - - // Print a certain type of message? - if( in_array($type, $this->msgTypes) ) { - foreach( $_SESSION['flash_messages'][$type] as $msg ) { - $messages .= $this->msgBefore . $msg . $this->msgAfter; - } - - $data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages); - - // Clear the viewed messages - $this->clear($type); - - // Print ALL queued messages - } elseif( $type == 'all' ) { - foreach( $_SESSION['flash_messages'] as $type => $msgArray ) { - $messages = ''; - foreach( $msgArray as $msg ) { - $messages .= $this->msgBefore . $msg . $this->msgAfter; - } - $data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages); - } - - // Clear ALL of the messages - $this->clear(); - - // Invalid Message Type? - } else { - return false; - } - - // Print everything to the screen or return the data - if( $print ) { - echo $data; - } else { - return $data; - } - } - - - /** - * Check to see if there are any queued error messages - * - * @author Mike Everhart - * - * @return bool true = There ARE error messages - * false = There are NOT any error messages - * - */ - public function hasErrors() { - return empty($_SESSION['flash_messages']['error']) ? false : true; - } - - /** - * Check to see if there are any ($type) messages queued - * - * @author Mike Everhart - * - * @param string $type The type of messages to check for - * @return bool - * - */ - public function hasMessages($type=null) { - if( !is_null($type) ) { - if( !empty($_SESSION['flash_messages'][$type]) ) return $_SESSION['flash_messages'][$type]; - } else { - foreach( $this->msgTypes as $type ) { - if( !empty($_SESSION['flash_messages']) ) return true; - } - } - return false; - } - - /** - * Clear messages from the session data - * - * @author Mike Everhart - * - * @param string $type The type of messages to clear - * @return bool - * - */ - public function clear($type='all') { - if( $type == 'all' ) { - unset($_SESSION['flash_messages']); - } else { - unset($_SESSION['flash_messages'][$type]); - } - return true; - } - - public function __toString() { return $this->hasMessages(); } - - public function __destruct() { - //$this->clear(); - } - - -} // end class -?> \ No newline at end of file diff --git a/inc/pocheTool.class.php b/inc/pocheTool.class.php new file mode 100644 index 00000000..9aab76b9 --- /dev/null +++ b/inc/pocheTool.class.php @@ -0,0 +1,101 @@ + + * @copyright 2013 + * @license http://www.wtfpl.net/ see COPYING file + */ + +class pocheTools +{ + public static function initPhp() + { + define('START_TIME', microtime(true)); + + if (phpversion() < 5) { + die(_('Oops, it seems you don\'t have PHP 5.')); + } + + error_reporting(E_ALL); + + function stripslashesDeep($value) { + return is_array($value) + ? array_map('stripslashesDeep', $value) + : stripslashes($value); + } + + if (get_magic_quotes_gpc()) { + $_POST = array_map('stripslashesDeep', $_POST); + $_GET = array_map('stripslashesDeep', $_GET); + $_COOKIE = array_map('stripslashesDeep', $_COOKIE); + } + + ob_start(); + register_shutdown_function('ob_end_flush'); + } + + public static function isUrl($url) + { + // http://neo22s.com/check-if-url-exists-and-is-online-php/ + $pattern='|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i'; + + return preg_match($pattern, $url); + } + + public static function getUrl() + { + $https = (!empty($_SERVER['HTTPS']) + && (strtolower($_SERVER['HTTPS']) == 'on')) + || (isset($_SERVER["SERVER_PORT"]) + && $_SERVER["SERVER_PORT"] == '443'); // HTTPS detection. + $serverport = (!isset($_SERVER["SERVER_PORT"]) + || $_SERVER["SERVER_PORT"] == '80' + || ($https && $_SERVER["SERVER_PORT"] == '443') + ? '' : ':' . $_SERVER["SERVER_PORT"]); + + $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); + + if (!isset($_SERVER["SERVER_NAME"])) { + return $scriptname; + } + + return 'http' . ($https ? 's' : '') . '://' + . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; + } + + public static function renderJson($data) + { + header('Cache-Control: no-cache, must-revalidate'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); + header('Content-type: application/json; charset=UTF-8'); + + echo json_encode($data); + exit(); + } + + public static function redirect($rurl = '') + { + if ($rurl === '') { + $rurl = (empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']); + if (isset($_POST['returnurl'])) { + $rurl = $_POST['returnurl']; + } + } + + // prevent loop + if (empty($rurl) || parse_url($rurl, PHP_URL_QUERY) === $_SERVER['QUERY_STRING']) { + $rurl = pocheTool::getUrl(); + } + + if (substr($rurl, 0, 1) !== '?') { + $ref = pocheTool::getUrl(); + if (substr($rurl, 0, strlen($ref)) !== $ref) { + $rurl = $ref; + } + } + header('Location: '.$rurl); + exit(); + } +} \ No newline at end of file -- cgit v1.2.3 From a4565e88edbc8e3bd092a475469769c86a4c350c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 2 Aug 2013 22:40:51 +0200 Subject: add Twig & refactor poche --- inc/3rdparty/Encoding.php | 262 +++ inc/3rdparty/JSLikeHTMLElement.php | 109 ++ inc/3rdparty/Readability.php | 1137 +++++++++++++ inc/3rdparty/Session.class.php | 136 ++ inc/3rdparty/simple_html_dom.php | 1722 ++++++++++++++++++++ inc/Encoding.php | 262 --- inc/JSLikeHTMLElement.php | 109 -- inc/Readability.php | 1137 ------------- inc/Session.class.php | 136 -- inc/Twig/Autoloader.php | 48 + inc/Twig/Compiler.php | 267 +++ inc/Twig/CompilerInterface.php | 35 + inc/Twig/Environment.php | 1224 ++++++++++++++ inc/Twig/Error.php | 239 +++ inc/Twig/Error/Loader.php | 31 + inc/Twig/Error/Runtime.php | 20 + inc/Twig/Error/Syntax.php | 20 + inc/Twig/ExistsLoaderInterface.php | 28 + inc/Twig/ExpressionParser.php | 600 +++++++ inc/Twig/Extension.php | 93 ++ inc/Twig/Extension/Core.php | 1355 +++++++++++++++ inc/Twig/Extension/Debug.php | 71 + inc/Twig/Extension/Escaper.php | 107 ++ inc/Twig/Extension/Optimizer.php | 35 + inc/Twig/Extension/Sandbox.php | 112 ++ inc/Twig/Extension/Staging.php | 113 ++ inc/Twig/Extension/StringLoader.php | 64 + inc/Twig/ExtensionInterface.php | 83 + inc/Twig/Extensions/Autoloader.php | 45 + inc/Twig/Extensions/Extension/Debug.php | 34 + inc/Twig/Extensions/Extension/I18n.php | 44 + inc/Twig/Extensions/Extension/Intl.php | 66 + inc/Twig/Extensions/Extension/Text.php | 109 ++ inc/Twig/Extensions/Gettext/Extractor.php | 95 ++ inc/Twig/Extensions/Gettext/Loader/Filesystem.php | 58 + .../Gettext/Routing/Generator/UrlGenerator.php | 39 + inc/Twig/Extensions/Gettext/Test/ExtractorTest.php | 123 ++ .../Gettext/Test/Fixtures/twig/empty.twig | 1 + .../Gettext/Test/Fixtures/twig/plural.twig | 5 + .../Gettext/Test/Fixtures/twig/singular.twig | 9 + inc/Twig/Extensions/Grammar.php | 30 + inc/Twig/Extensions/Grammar/Arguments.php | 22 + inc/Twig/Extensions/Grammar/Array.php | 22 + inc/Twig/Extensions/Grammar/Body.php | 39 + inc/Twig/Extensions/Grammar/Boolean.php | 24 + inc/Twig/Extensions/Grammar/Constant.php | 37 + inc/Twig/Extensions/Grammar/Expression.php | 22 + inc/Twig/Extensions/Grammar/Hash.php | 22 + inc/Twig/Extensions/Grammar/Number.php | 24 + inc/Twig/Extensions/Grammar/Optional.php | 69 + inc/Twig/Extensions/Grammar/Switch.php | 24 + inc/Twig/Extensions/Grammar/Tag.php | 56 + inc/Twig/Extensions/GrammarInterface.php | 18 + inc/Twig/Extensions/Node/Debug.php | 69 + inc/Twig/Extensions/Node/Trans.php | 133 ++ inc/Twig/Extensions/SimpleTokenParser.php | 132 ++ inc/Twig/Extensions/TokenParser/Debug.php | 42 + inc/Twig/Extensions/TokenParser/Trans.php | 80 + inc/Twig/Filter.php | 81 + inc/Twig/Filter/Function.php | 37 + inc/Twig/Filter/Method.php | 39 + inc/Twig/Filter/Node.php | 39 + inc/Twig/FilterCallableInterface.php | 23 + inc/Twig/FilterInterface.php | 42 + inc/Twig/Function.php | 71 + inc/Twig/Function/Function.php | 38 + inc/Twig/Function/Method.php | 40 + inc/Twig/Function/Node.php | 39 + inc/Twig/FunctionCallableInterface.php | 23 + inc/Twig/FunctionInterface.php | 39 + inc/Twig/Gettext/Extractor.php | 95 ++ inc/Twig/Gettext/Loader/Filesystem.php | 58 + .../Gettext/Routing/Generator/UrlGenerator.php | 39 + inc/Twig/Gettext/Test/ExtractorTest.php | 123 ++ inc/Twig/Gettext/Test/Fixtures/twig/empty.twig | 1 + inc/Twig/Gettext/Test/Fixtures/twig/plural.twig | 5 + inc/Twig/Gettext/Test/Fixtures/twig/singular.twig | 9 + inc/Twig/Lexer.php | 408 +++++ inc/Twig/LexerInterface.php | 29 + inc/Twig/Loader/Array.php | 98 ++ inc/Twig/Loader/Chain.php | 139 ++ inc/Twig/Loader/Filesystem.php | 223 +++ inc/Twig/Loader/String.php | 59 + inc/Twig/LoaderInterface.php | 52 + inc/Twig/Markup.php | 37 + inc/Twig/Node.php | 226 +++ inc/Twig/Node/AutoEscape.php | 39 + inc/Twig/Node/Block.php | 44 + inc/Twig/Node/BlockReference.php | 37 + inc/Twig/Node/Body.php | 19 + inc/Twig/Node/Do.php | 38 + inc/Twig/Node/Embed.php | 38 + inc/Twig/Node/Expression.php | 20 + inc/Twig/Node/Expression/Array.php | 86 + inc/Twig/Node/Expression/AssignName.php | 28 + inc/Twig/Node/Expression/Binary.php | 40 + inc/Twig/Node/Expression/Binary/Add.php | 18 + inc/Twig/Node/Expression/Binary/And.php | 18 + inc/Twig/Node/Expression/Binary/BitwiseAnd.php | 18 + inc/Twig/Node/Expression/Binary/BitwiseOr.php | 18 + inc/Twig/Node/Expression/Binary/BitwiseXor.php | 18 + inc/Twig/Node/Expression/Binary/Concat.php | 18 + inc/Twig/Node/Expression/Binary/Div.php | 18 + inc/Twig/Node/Expression/Binary/Equal.php | 17 + inc/Twig/Node/Expression/Binary/FloorDiv.php | 29 + inc/Twig/Node/Expression/Binary/Greater.php | 17 + inc/Twig/Node/Expression/Binary/GreaterEqual.php | 17 + inc/Twig/Node/Expression/Binary/In.php | 33 + inc/Twig/Node/Expression/Binary/Less.php | 17 + inc/Twig/Node/Expression/Binary/LessEqual.php | 17 + inc/Twig/Node/Expression/Binary/Mod.php | 18 + inc/Twig/Node/Expression/Binary/Mul.php | 18 + inc/Twig/Node/Expression/Binary/NotEqual.php | 17 + inc/Twig/Node/Expression/Binary/NotIn.php | 33 + inc/Twig/Node/Expression/Binary/Or.php | 18 + inc/Twig/Node/Expression/Binary/Power.php | 33 + inc/Twig/Node/Expression/Binary/Range.php | 33 + inc/Twig/Node/Expression/Binary/Sub.php | 18 + inc/Twig/Node/Expression/BlockReference.php | 51 + inc/Twig/Node/Expression/Call.php | 178 ++ inc/Twig/Node/Expression/Conditional.php | 31 + inc/Twig/Node/Expression/Constant.php | 23 + inc/Twig/Node/Expression/ExtensionReference.php | 33 + inc/Twig/Node/Expression/Filter.php | 36 + inc/Twig/Node/Expression/Filter/Default.php | 43 + inc/Twig/Node/Expression/Function.php | 35 + inc/Twig/Node/Expression/GetAttr.php | 53 + inc/Twig/Node/Expression/MethodCall.php | 41 + inc/Twig/Node/Expression/Name.php | 88 + inc/Twig/Node/Expression/Parent.php | 47 + inc/Twig/Node/Expression/TempName.php | 26 + inc/Twig/Node/Expression/Test.php | 32 + inc/Twig/Node/Expression/Test/Constant.php | 46 + inc/Twig/Node/Expression/Test/Defined.php | 54 + inc/Twig/Node/Expression/Test/Divisibleby.php | 33 + inc/Twig/Node/Expression/Test/Even.php | 32 + inc/Twig/Node/Expression/Test/Null.php | 31 + inc/Twig/Node/Expression/Test/Odd.php | 32 + inc/Twig/Node/Expression/Test/Sameas.php | 29 + inc/Twig/Node/Expression/Unary.php | 30 + inc/Twig/Node/Expression/Unary/Neg.php | 18 + inc/Twig/Node/Expression/Unary/Not.php | 18 + inc/Twig/Node/Expression/Unary/Pos.php | 18 + inc/Twig/Node/Flush.php | 36 + inc/Twig/Node/For.php | 112 ++ inc/Twig/Node/ForLoop.php | 55 + inc/Twig/Node/If.php | 66 + inc/Twig/Node/Import.php | 50 + inc/Twig/Node/Include.php | 99 ++ inc/Twig/Node/Macro.php | 96 ++ inc/Twig/Node/Module.php | 371 +++++ inc/Twig/Node/Print.php | 39 + inc/Twig/Node/Sandbox.php | 47 + inc/Twig/Node/SandboxedModule.php | 60 + inc/Twig/Node/SandboxedPrint.php | 59 + inc/Twig/Node/Set.php | 101 ++ inc/Twig/Node/SetTemp.php | 35 + inc/Twig/Node/Spaceless.php | 40 + inc/Twig/Node/Text.php | 39 + inc/Twig/NodeInterface.php | 30 + inc/Twig/NodeOutputInterface.php | 19 + inc/Twig/NodeTraverser.php | 88 + inc/Twig/NodeVisitor/Escaper.php | 167 ++ inc/Twig/NodeVisitor/Optimizer.php | 246 +++ inc/Twig/NodeVisitor/SafeAnalysis.php | 131 ++ inc/Twig/NodeVisitor/Sandbox.php | 92 ++ inc/Twig/NodeVisitorInterface.php | 47 + inc/Twig/Parser.php | 394 +++++ inc/Twig/ParserInterface.php | 28 + inc/Twig/Sandbox/SecurityError.php | 19 + inc/Twig/Sandbox/SecurityPolicy.php | 119 ++ inc/Twig/Sandbox/SecurityPolicyInterface.php | 24 + inc/Twig/SimpleFilter.php | 94 ++ inc/Twig/SimpleFunction.php | 84 + inc/Twig/SimpleTest.php | 46 + inc/Twig/Template.php | 455 ++++++ inc/Twig/TemplateInterface.php | 47 + inc/Twig/Test.php | 34 + inc/Twig/Test/Function.php | 35 + inc/Twig/Test/IntegrationTestCase.php | 154 ++ inc/Twig/Test/Method.php | 37 + inc/Twig/Test/Node.php | 37 + inc/Twig/Test/NodeTestCase.php | 58 + inc/Twig/TestCallableInterface.php | 21 + inc/Twig/TestInterface.php | 26 + inc/Twig/Token.php | 218 +++ inc/Twig/TokenParser.php | 33 + inc/Twig/TokenParser/AutoEscape.php | 89 + inc/Twig/TokenParser/Block.php | 83 + inc/Twig/TokenParser/Do.php | 42 + inc/Twig/TokenParser/Embed.php | 66 + inc/Twig/TokenParser/Extends.php | 52 + inc/Twig/TokenParser/Filter.php | 61 + inc/Twig/TokenParser/Flush.php | 42 + inc/Twig/TokenParser/For.php | 136 ++ inc/Twig/TokenParser/From.php | 74 + inc/Twig/TokenParser/If.php | 94 ++ inc/Twig/TokenParser/Import.php | 49 + inc/Twig/TokenParser/Include.php | 80 + inc/Twig/TokenParser/Macro.php | 68 + inc/Twig/TokenParser/Sandbox.php | 68 + inc/Twig/TokenParser/Set.php | 84 + inc/Twig/TokenParser/Spaceless.php | 59 + inc/Twig/TokenParser/Use.php | 82 + inc/Twig/TokenParserBroker.php | 136 ++ inc/Twig/TokenParserBrokerInterface.php | 45 + inc/Twig/TokenParserInterface.php | 41 + inc/Twig/TokenStream.php | 144 ++ inc/config.php | 76 +- inc/functions.php | 400 ----- inc/poche/pocheCore.php | 257 +++ inc/poche/pochePictures.php | 114 ++ inc/poche/pocheTool.class.php | 124 ++ inc/pocheTool.class.php | 101 -- inc/rain.tpl.class.php | 1043 ------------ inc/simple_html_dom.php | 1722 -------------------- 216 files changed, 19642 insertions(+), 4946 deletions(-) create mode 100644 inc/3rdparty/Encoding.php create mode 100644 inc/3rdparty/JSLikeHTMLElement.php create mode 100644 inc/3rdparty/Readability.php create mode 100644 inc/3rdparty/Session.class.php create mode 100644 inc/3rdparty/simple_html_dom.php delete mode 100644 inc/Encoding.php delete mode 100644 inc/JSLikeHTMLElement.php delete mode 100644 inc/Readability.php delete mode 100644 inc/Session.class.php create mode 100644 inc/Twig/Autoloader.php create mode 100644 inc/Twig/Compiler.php create mode 100644 inc/Twig/CompilerInterface.php create mode 100644 inc/Twig/Environment.php create mode 100644 inc/Twig/Error.php create mode 100644 inc/Twig/Error/Loader.php create mode 100644 inc/Twig/Error/Runtime.php create mode 100644 inc/Twig/Error/Syntax.php create mode 100644 inc/Twig/ExistsLoaderInterface.php create mode 100644 inc/Twig/ExpressionParser.php create mode 100644 inc/Twig/Extension.php create mode 100644 inc/Twig/Extension/Core.php create mode 100644 inc/Twig/Extension/Debug.php create mode 100644 inc/Twig/Extension/Escaper.php create mode 100644 inc/Twig/Extension/Optimizer.php create mode 100644 inc/Twig/Extension/Sandbox.php create mode 100644 inc/Twig/Extension/Staging.php create mode 100644 inc/Twig/Extension/StringLoader.php create mode 100644 inc/Twig/ExtensionInterface.php create mode 100644 inc/Twig/Extensions/Autoloader.php create mode 100644 inc/Twig/Extensions/Extension/Debug.php create mode 100644 inc/Twig/Extensions/Extension/I18n.php create mode 100644 inc/Twig/Extensions/Extension/Intl.php create mode 100644 inc/Twig/Extensions/Extension/Text.php create mode 100644 inc/Twig/Extensions/Gettext/Extractor.php create mode 100644 inc/Twig/Extensions/Gettext/Loader/Filesystem.php create mode 100644 inc/Twig/Extensions/Gettext/Routing/Generator/UrlGenerator.php create mode 100644 inc/Twig/Extensions/Gettext/Test/ExtractorTest.php create mode 100644 inc/Twig/Extensions/Gettext/Test/Fixtures/twig/empty.twig create mode 100644 inc/Twig/Extensions/Gettext/Test/Fixtures/twig/plural.twig create mode 100644 inc/Twig/Extensions/Gettext/Test/Fixtures/twig/singular.twig create mode 100644 inc/Twig/Extensions/Grammar.php create mode 100644 inc/Twig/Extensions/Grammar/Arguments.php create mode 100644 inc/Twig/Extensions/Grammar/Array.php create mode 100644 inc/Twig/Extensions/Grammar/Body.php create mode 100644 inc/Twig/Extensions/Grammar/Boolean.php create mode 100644 inc/Twig/Extensions/Grammar/Constant.php create mode 100644 inc/Twig/Extensions/Grammar/Expression.php create mode 100644 inc/Twig/Extensions/Grammar/Hash.php create mode 100644 inc/Twig/Extensions/Grammar/Number.php create mode 100644 inc/Twig/Extensions/Grammar/Optional.php create mode 100644 inc/Twig/Extensions/Grammar/Switch.php create mode 100644 inc/Twig/Extensions/Grammar/Tag.php create mode 100644 inc/Twig/Extensions/GrammarInterface.php create mode 100644 inc/Twig/Extensions/Node/Debug.php create mode 100644 inc/Twig/Extensions/Node/Trans.php create mode 100644 inc/Twig/Extensions/SimpleTokenParser.php create mode 100644 inc/Twig/Extensions/TokenParser/Debug.php create mode 100644 inc/Twig/Extensions/TokenParser/Trans.php create mode 100644 inc/Twig/Filter.php create mode 100644 inc/Twig/Filter/Function.php create mode 100644 inc/Twig/Filter/Method.php create mode 100644 inc/Twig/Filter/Node.php create mode 100644 inc/Twig/FilterCallableInterface.php create mode 100644 inc/Twig/FilterInterface.php create mode 100644 inc/Twig/Function.php create mode 100644 inc/Twig/Function/Function.php create mode 100644 inc/Twig/Function/Method.php create mode 100644 inc/Twig/Function/Node.php create mode 100644 inc/Twig/FunctionCallableInterface.php create mode 100644 inc/Twig/FunctionInterface.php create mode 100644 inc/Twig/Gettext/Extractor.php create mode 100644 inc/Twig/Gettext/Loader/Filesystem.php create mode 100644 inc/Twig/Gettext/Routing/Generator/UrlGenerator.php create mode 100644 inc/Twig/Gettext/Test/ExtractorTest.php create mode 100644 inc/Twig/Gettext/Test/Fixtures/twig/empty.twig create mode 100644 inc/Twig/Gettext/Test/Fixtures/twig/plural.twig create mode 100644 inc/Twig/Gettext/Test/Fixtures/twig/singular.twig create mode 100644 inc/Twig/Lexer.php create mode 100644 inc/Twig/LexerInterface.php create mode 100644 inc/Twig/Loader/Array.php create mode 100644 inc/Twig/Loader/Chain.php create mode 100644 inc/Twig/Loader/Filesystem.php create mode 100644 inc/Twig/Loader/String.php create mode 100644 inc/Twig/LoaderInterface.php create mode 100644 inc/Twig/Markup.php create mode 100644 inc/Twig/Node.php create mode 100644 inc/Twig/Node/AutoEscape.php create mode 100644 inc/Twig/Node/Block.php create mode 100644 inc/Twig/Node/BlockReference.php create mode 100644 inc/Twig/Node/Body.php create mode 100644 inc/Twig/Node/Do.php create mode 100644 inc/Twig/Node/Embed.php create mode 100644 inc/Twig/Node/Expression.php create mode 100644 inc/Twig/Node/Expression/Array.php create mode 100644 inc/Twig/Node/Expression/AssignName.php create mode 100644 inc/Twig/Node/Expression/Binary.php create mode 100644 inc/Twig/Node/Expression/Binary/Add.php create mode 100644 inc/Twig/Node/Expression/Binary/And.php create mode 100644 inc/Twig/Node/Expression/Binary/BitwiseAnd.php create mode 100644 inc/Twig/Node/Expression/Binary/BitwiseOr.php create mode 100644 inc/Twig/Node/Expression/Binary/BitwiseXor.php create mode 100644 inc/Twig/Node/Expression/Binary/Concat.php create mode 100644 inc/Twig/Node/Expression/Binary/Div.php create mode 100644 inc/Twig/Node/Expression/Binary/Equal.php create mode 100644 inc/Twig/Node/Expression/Binary/FloorDiv.php create mode 100644 inc/Twig/Node/Expression/Binary/Greater.php create mode 100644 inc/Twig/Node/Expression/Binary/GreaterEqual.php create mode 100644 inc/Twig/Node/Expression/Binary/In.php create mode 100644 inc/Twig/Node/Expression/Binary/Less.php create mode 100644 inc/Twig/Node/Expression/Binary/LessEqual.php create mode 100644 inc/Twig/Node/Expression/Binary/Mod.php create mode 100644 inc/Twig/Node/Expression/Binary/Mul.php create mode 100644 inc/Twig/Node/Expression/Binary/NotEqual.php create mode 100644 inc/Twig/Node/Expression/Binary/NotIn.php create mode 100644 inc/Twig/Node/Expression/Binary/Or.php create mode 100644 inc/Twig/Node/Expression/Binary/Power.php create mode 100644 inc/Twig/Node/Expression/Binary/Range.php create mode 100644 inc/Twig/Node/Expression/Binary/Sub.php create mode 100644 inc/Twig/Node/Expression/BlockReference.php create mode 100644 inc/Twig/Node/Expression/Call.php create mode 100644 inc/Twig/Node/Expression/Conditional.php create mode 100644 inc/Twig/Node/Expression/Constant.php create mode 100644 inc/Twig/Node/Expression/ExtensionReference.php create mode 100644 inc/Twig/Node/Expression/Filter.php create mode 100644 inc/Twig/Node/Expression/Filter/Default.php create mode 100644 inc/Twig/Node/Expression/Function.php create mode 100644 inc/Twig/Node/Expression/GetAttr.php create mode 100644 inc/Twig/Node/Expression/MethodCall.php create mode 100644 inc/Twig/Node/Expression/Name.php create mode 100644 inc/Twig/Node/Expression/Parent.php create mode 100644 inc/Twig/Node/Expression/TempName.php create mode 100644 inc/Twig/Node/Expression/Test.php create mode 100644 inc/Twig/Node/Expression/Test/Constant.php create mode 100644 inc/Twig/Node/Expression/Test/Defined.php create mode 100644 inc/Twig/Node/Expression/Test/Divisibleby.php create mode 100644 inc/Twig/Node/Expression/Test/Even.php create mode 100644 inc/Twig/Node/Expression/Test/Null.php create mode 100644 inc/Twig/Node/Expression/Test/Odd.php create mode 100644 inc/Twig/Node/Expression/Test/Sameas.php create mode 100644 inc/Twig/Node/Expression/Unary.php create mode 100644 inc/Twig/Node/Expression/Unary/Neg.php create mode 100644 inc/Twig/Node/Expression/Unary/Not.php create mode 100644 inc/Twig/Node/Expression/Unary/Pos.php create mode 100644 inc/Twig/Node/Flush.php create mode 100644 inc/Twig/Node/For.php create mode 100644 inc/Twig/Node/ForLoop.php create mode 100644 inc/Twig/Node/If.php create mode 100644 inc/Twig/Node/Import.php create mode 100644 inc/Twig/Node/Include.php create mode 100644 inc/Twig/Node/Macro.php create mode 100644 inc/Twig/Node/Module.php create mode 100644 inc/Twig/Node/Print.php create mode 100644 inc/Twig/Node/Sandbox.php create mode 100644 inc/Twig/Node/SandboxedModule.php create mode 100644 inc/Twig/Node/SandboxedPrint.php create mode 100644 inc/Twig/Node/Set.php create mode 100644 inc/Twig/Node/SetTemp.php create mode 100644 inc/Twig/Node/Spaceless.php create mode 100644 inc/Twig/Node/Text.php create mode 100644 inc/Twig/NodeInterface.php create mode 100644 inc/Twig/NodeOutputInterface.php create mode 100644 inc/Twig/NodeTraverser.php create mode 100644 inc/Twig/NodeVisitor/Escaper.php create mode 100644 inc/Twig/NodeVisitor/Optimizer.php create mode 100644 inc/Twig/NodeVisitor/SafeAnalysis.php create mode 100644 inc/Twig/NodeVisitor/Sandbox.php create mode 100644 inc/Twig/NodeVisitorInterface.php create mode 100644 inc/Twig/Parser.php create mode 100644 inc/Twig/ParserInterface.php create mode 100644 inc/Twig/Sandbox/SecurityError.php create mode 100644 inc/Twig/Sandbox/SecurityPolicy.php create mode 100644 inc/Twig/Sandbox/SecurityPolicyInterface.php create mode 100644 inc/Twig/SimpleFilter.php create mode 100644 inc/Twig/SimpleFunction.php create mode 100644 inc/Twig/SimpleTest.php create mode 100644 inc/Twig/Template.php create mode 100644 inc/Twig/TemplateInterface.php create mode 100644 inc/Twig/Test.php create mode 100644 inc/Twig/Test/Function.php create mode 100644 inc/Twig/Test/IntegrationTestCase.php create mode 100644 inc/Twig/Test/Method.php create mode 100644 inc/Twig/Test/Node.php create mode 100644 inc/Twig/Test/NodeTestCase.php create mode 100644 inc/Twig/TestCallableInterface.php create mode 100644 inc/Twig/TestInterface.php create mode 100644 inc/Twig/Token.php create mode 100644 inc/Twig/TokenParser.php create mode 100644 inc/Twig/TokenParser/AutoEscape.php create mode 100644 inc/Twig/TokenParser/Block.php create mode 100644 inc/Twig/TokenParser/Do.php create mode 100644 inc/Twig/TokenParser/Embed.php create mode 100644 inc/Twig/TokenParser/Extends.php create mode 100644 inc/Twig/TokenParser/Filter.php create mode 100644 inc/Twig/TokenParser/Flush.php create mode 100644 inc/Twig/TokenParser/For.php create mode 100644 inc/Twig/TokenParser/From.php create mode 100644 inc/Twig/TokenParser/If.php create mode 100644 inc/Twig/TokenParser/Import.php create mode 100644 inc/Twig/TokenParser/Include.php create mode 100644 inc/Twig/TokenParser/Macro.php create mode 100644 inc/Twig/TokenParser/Sandbox.php create mode 100644 inc/Twig/TokenParser/Set.php create mode 100644 inc/Twig/TokenParser/Spaceless.php create mode 100644 inc/Twig/TokenParser/Use.php create mode 100644 inc/Twig/TokenParserBroker.php create mode 100644 inc/Twig/TokenParserBrokerInterface.php create mode 100644 inc/Twig/TokenParserInterface.php create mode 100644 inc/Twig/TokenStream.php delete mode 100644 inc/functions.php create mode 100644 inc/poche/pocheCore.php create mode 100644 inc/poche/pochePictures.php create mode 100644 inc/poche/pocheTool.class.php delete mode 100644 inc/pocheTool.class.php delete mode 100644 inc/rain.tpl.class.php delete mode 100644 inc/simple_html_dom.php (limited to 'inc') diff --git a/inc/3rdparty/Encoding.php b/inc/3rdparty/Encoding.php new file mode 100644 index 00000000..577763b4 --- /dev/null +++ b/inc/3rdparty/Encoding.php @@ -0,0 +1,262 @@ + + * @package Encoding + * @version 1.1 + * @link http://www.framework2.com.ar/dzone/forceUTF8-es/ + * @example http://www.framework2.com.ar/dzone/forceUTF8-es/ + */ + +class Encoding { + + protected static $win1252ToUtf8 = array( + 128 => "\xe2\x82\xac", + + 130 => "\xe2\x80\x9a", + 131 => "\xc6\x92", + 132 => "\xe2\x80\x9e", + 133 => "\xe2\x80\xa6", + 134 => "\xe2\x80\xa0", + 135 => "\xe2\x80\xa1", + 136 => "\xcb\x86", + 137 => "\xe2\x80\xb0", + 138 => "\xc5\xa0", + 139 => "\xe2\x80\xb9", + 140 => "\xc5\x92", + + 142 => "\xc5\xbd", + + + 145 => "\xe2\x80\x98", + 146 => "\xe2\x80\x99", + 147 => "\xe2\x80\x9c", + 148 => "\xe2\x80\x9d", + 149 => "\xe2\x80\xa2", + 150 => "\xe2\x80\x93", + 151 => "\xe2\x80\x94", + 152 => "\xcb\x9c", + 153 => "\xe2\x84\xa2", + 154 => "\xc5\xa1", + 155 => "\xe2\x80\xba", + 156 => "\xc5\x93", + + 158 => "\xc5\xbe", + 159 => "\xc5\xb8" + ); + + protected static $brokenUtf8ToUtf8 = array( + "\xc2\x80" => "\xe2\x82\xac", + + "\xc2\x82" => "\xe2\x80\x9a", + "\xc2\x83" => "\xc6\x92", + "\xc2\x84" => "\xe2\x80\x9e", + "\xc2\x85" => "\xe2\x80\xa6", + "\xc2\x86" => "\xe2\x80\xa0", + "\xc2\x87" => "\xe2\x80\xa1", + "\xc2\x88" => "\xcb\x86", + "\xc2\x89" => "\xe2\x80\xb0", + "\xc2\x8a" => "\xc5\xa0", + "\xc2\x8b" => "\xe2\x80\xb9", + "\xc2\x8c" => "\xc5\x92", + + "\xc2\x8e" => "\xc5\xbd", + + + "\xc2\x91" => "\xe2\x80\x98", + "\xc2\x92" => "\xe2\x80\x99", + "\xc2\x93" => "\xe2\x80\x9c", + "\xc2\x94" => "\xe2\x80\x9d", + "\xc2\x95" => "\xe2\x80\xa2", + "\xc2\x96" => "\xe2\x80\x93", + "\xc2\x97" => "\xe2\x80\x94", + "\xc2\x98" => "\xcb\x9c", + "\xc2\x99" => "\xe2\x84\xa2", + "\xc2\x9a" => "\xc5\xa1", + "\xc2\x9b" => "\xe2\x80\xba", + "\xc2\x9c" => "\xc5\x93", + + "\xc2\x9e" => "\xc5\xbe", + "\xc2\x9f" => "\xc5\xb8" + ); + + protected static $utf8ToWin1252 = array( + "\xe2\x82\xac" => "\x80", + + "\xe2\x80\x9a" => "\x82", + "\xc6\x92" => "\x83", + "\xe2\x80\x9e" => "\x84", + "\xe2\x80\xa6" => "\x85", + "\xe2\x80\xa0" => "\x86", + "\xe2\x80\xa1" => "\x87", + "\xcb\x86" => "\x88", + "\xe2\x80\xb0" => "\x89", + "\xc5\xa0" => "\x8a", + "\xe2\x80\xb9" => "\x8b", + "\xc5\x92" => "\x8c", + + "\xc5\xbd" => "\x8e", + + + "\xe2\x80\x98" => "\x91", + "\xe2\x80\x99" => "\x92", + "\xe2\x80\x9c" => "\x93", + "\xe2\x80\x9d" => "\x94", + "\xe2\x80\xa2" => "\x95", + "\xe2\x80\x93" => "\x96", + "\xe2\x80\x94" => "\x97", + "\xcb\x9c" => "\x98", + "\xe2\x84\xa2" => "\x99", + "\xc5\xa1" => "\x9a", + "\xe2\x80\xba" => "\x9b", + "\xc5\x93" => "\x9c", + + "\xc5\xbe" => "\x9e", + "\xc5\xb8" => "\x9f" + ); + + static function toUTF8($text){ + /** + * Function Encoding::toUTF8 + * + * This function leaves UTF8 characters alone, while converting almost all non-UTF8 to UTF8. + * + * It assumes that the encoding of the original string is either Windows-1252 or ISO 8859-1. + * + * It may fail to convert characters to UTF-8 if they fall into one of these scenarios: + * + * 1) when any of these characters: ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß + * are followed by any of these: ("group B") + * ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶•¸¹º»¼½¾¿ + * For example: %ABREPRESENT%C9%BB. «REPRESENTÉ» + * The "«" (%AB) character will be converted, but the "É" followed by "»" (%C9%BB) + * is also a valid unicode character, and will be left unchanged. + * + * 2) when any of these: àáâãäåæçèéêëìíîï are followed by TWO chars from group B, + * 3) when any of these: ðñòó are followed by THREE chars from group B. + * + * @name toUTF8 + * @param string $text Any string. + * @return string The same string, UTF8 encoded + * + */ + + if(is_array($text)) + { + foreach($text as $k => $v) + { + $text[$k] = self::toUTF8($v); + } + return $text; + } elseif(is_string($text)) { + + $max = strlen($text); + $buf = ""; + for($i = 0; $i < $max; $i++){ + $c1 = $text{$i}; + if($c1>="\xc0"){ //Should be converted to UTF8, if it's not UTF8 already + $c2 = $i+1 >= $max? "\x00" : $text{$i+1}; + $c3 = $i+2 >= $max? "\x00" : $text{$i+2}; + $c4 = $i+3 >= $max? "\x00" : $text{$i+3}; + if($c1 >= "\xc0" & $c1 <= "\xdf"){ //looks like 2 bytes UTF8 + if($c2 >= "\x80" && $c2 <= "\xbf"){ //yeah, almost sure it's UTF8 already + $buf .= $c1 . $c2; + $i++; + } else { //not valid UTF8. Convert it. + $cc1 = (chr(ord($c1) / 64) | "\xc0"); + $cc2 = ($c1 & "\x3f") | "\x80"; + $buf .= $cc1 . $cc2; + } + } elseif($c1 >= "\xe0" & $c1 <= "\xef"){ //looks like 3 bytes UTF8 + if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf"){ //yeah, almost sure it's UTF8 already + $buf .= $c1 . $c2 . $c3; + $i = $i + 2; + } else { //not valid UTF8. Convert it. + $cc1 = (chr(ord($c1) / 64) | "\xc0"); + $cc2 = ($c1 & "\x3f") | "\x80"; + $buf .= $cc1 . $cc2; + } + } elseif($c1 >= "\xf0" & $c1 <= "\xf7"){ //looks like 4 bytes UTF8 + if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf"){ //yeah, almost sure it's UTF8 already + $buf .= $c1 . $c2 . $c3; + $i = $i + 2; + } else { //not valid UTF8. Convert it. + $cc1 = (chr(ord($c1) / 64) | "\xc0"); + $cc2 = ($c1 & "\x3f") | "\x80"; + $buf .= $cc1 . $cc2; + } + } else { //doesn't look like UTF8, but should be converted + $cc1 = (chr(ord($c1) / 64) | "\xc0"); + $cc2 = (($c1 & "\x3f") | "\x80"); + $buf .= $cc1 . $cc2; + } + } elseif(($c1 & "\xc0") == "\x80"){ // needs conversion + if(isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases + $buf .= self::$win1252ToUtf8[ord($c1)]; + } else { + $cc1 = (chr(ord($c1) / 64) | "\xc0"); + $cc2 = (($c1 & "\x3f") | "\x80"); + $buf .= $cc1 . $cc2; + } + } else { // it doesn't need convesion + $buf .= $c1; + } + } + return $buf; + } else { + return $text; + } + } + + static function toWin1252($text) { + if(is_array($text)) { + foreach($text as $k => $v) { + $text[$k] = self::toWin1252($v); + } + return $text; + } elseif(is_string($text)) { + return utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), self::toUTF8($text))); + } else { + return $text; + } + } + + static function toISO8859($text) { + return self::toWin1252($text); + } + + static function toLatin1($text) { + return self::toWin1252($text); + } + + static function fixUTF8($text){ + if(is_array($text)) { + foreach($text as $k => $v) { + $text[$k] = self::fixUTF8($v); + } + return $text; + } + + $last = ""; + while($last <> $text){ + $last = $text; + $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text))); + } + $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text))); + return $text; + } + + static function UTF8FixWin1252Chars($text){ + // If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1 + // (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it. + // See: http://en.wikipedia.org/wiki/Windows-1252 + + return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text); + } + + static function removeBOM($str=""){ + if(substr($str, 0,3) == pack("CCC",0xef,0xbb,0xbf)) { + $str=substr($str, 3); + } + return $str; + } +} \ No newline at end of file diff --git a/inc/3rdparty/JSLikeHTMLElement.php b/inc/3rdparty/JSLikeHTMLElement.php new file mode 100644 index 00000000..238ba8a8 --- /dev/null +++ b/inc/3rdparty/JSLikeHTMLElement.php @@ -0,0 +1,109 @@ +registerNodeClass('DOMElement', 'JSLikeHTMLElement'); +* $doc->loadHTML('

Para 1

Para 2

'); +* $elem = $doc->getElementsByTagName('div')->item(0); +* +* // print innerHTML +* echo $elem->innerHTML; // prints '

Para 1

Para 2

' +* echo "\n\n"; +* +* // set innerHTML +* $elem->innerHTML = 'FiveFilters.org'; +* echo $elem->innerHTML; // prints 'FiveFilters.org' +* echo "\n\n"; +* +* // print document (with our changes) +* echo $doc->saveXML(); +* @endcode +* +* @author Keyvan Minoukadeh - http://www.keyvan.net - keyvan@keyvan.net +* @see http://fivefilters.org (the project this was written for) +*/ +class JSLikeHTMLElement extends DOMElement +{ + /** + * Used for setting innerHTML like it's done in JavaScript: + * @code + * $div->innerHTML = '

Chapter 2

The story begins...

'; + * @endcode + */ + public function __set($name, $value) { + if ($name == 'innerHTML') { + // first, empty the element + for ($x=$this->childNodes->length-1; $x>=0; $x--) { + $this->removeChild($this->childNodes->item($x)); + } + // $value holds our new inner HTML + if ($value != '') { + $f = $this->ownerDocument->createDocumentFragment(); + // appendXML() expects well-formed markup (XHTML) + $result = @$f->appendXML($value); // @ to suppress PHP warnings + if ($result) { + if ($f->hasChildNodes()) $this->appendChild($f); + } else { + // $value is probably ill-formed + $f = new DOMDocument(); + $value = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8'); + // Using will generate a warning, but so will bad HTML + // (and by this point, bad HTML is what we've got). + // We use it (and suppress the warning) because an HTML fragment will + // be wrapped around tags which we don't really want to keep. + // Note: despite the warning, if loadHTML succeeds it will return true. + $result = @$f->loadHTML(''.$value.''); + if ($result) { + $import = $f->getElementsByTagName('htmlfragment')->item(0); + foreach ($import->childNodes as $child) { + $importedNode = $this->ownerDocument->importNode($child, true); + $this->appendChild($importedNode); + } + } else { + // oh well, we tried, we really did. :( + // this element is now empty + } + } + } + } else { + $trace = debug_backtrace(); + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_NOTICE); + } + } + + /** + * Used for getting innerHTML like it's done in JavaScript: + * @code + * $string = $div->innerHTML; + * @endcode + */ + public function __get($name) + { + if ($name == 'innerHTML') { + $inner = ''; + foreach ($this->childNodes as $child) { + $inner .= $this->ownerDocument->saveXML($child); + } + return $inner; + } + + $trace = debug_backtrace(); + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_NOTICE); + return null; + } + + public function __toString() + { + return '['.$this->tagName.']'; + } +} \ No newline at end of file diff --git a/inc/3rdparty/Readability.php b/inc/3rdparty/Readability.php new file mode 100644 index 00000000..e1e8738b --- /dev/null +++ b/inc/3rdparty/Readability.php @@ -0,0 +1,1137 @@ +init(); +echo $r->articleContent->innerHTML; +*/ + +class Readability +{ + public $version = '1.7.1-without-multi-page'; + public $convertLinksToFootnotes = false; + public $revertForcedParagraphElements = true; + public $articleTitle; + public $articleContent; + public $dom; + public $url = null; // optional - URL where HTML was retrieved + public $debug = false; + public $lightClean = true; // preserves more content (experimental) added 2012-09-19 + protected $body = null; // + protected $bodyCache = null; // Cache the body HTML in case we need to re-use it later + protected $flags = 7; // 1 | 2 | 4; // Start with all flags set. + protected $success = false; // indicates whether we were able to extract or not + + /** + * All of the regular expressions in use within readability. + * Defined up here so we don't instantiate them repeatedly in loops. + **/ + public $regexps = array( + 'unlikelyCandidates' => '/combx|comment|community|disqus|extra|foot|header|menu|remark|rss|shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup/i', + 'okMaybeItsACandidate' => '/and|article|body|column|main|shadow/i', + 'positive' => '/article|body|content|entry|hentry|main|page|attachment|pagination|post|text|blog|story/i', + 'negative' => '/combx|comment|com-|contact|foot|footer|_nav|footnote|masthead|media|meta|outbrain|promo|related|scroll|shoutbox|sidebar|sponsor|shopping|tags|tool|widget/i', + 'divToPElements' => '/<(a|blockquote|dl|div|img|ol|p|pre|table|ul)/i', + 'replaceBrs' => '/(]*>[ \n\r\t]*){2,}/i', + 'replaceFonts' => '/<(\/?)font[^>]*>/i', + // 'trimRe' => '/^\s+|\s+$/g', // PHP has trim() + 'normalize' => '/\s{2,}/', + 'killBreaks' => '/((\s| ?)*){1,}/', + 'video' => '!//(player\.|www\.)?(youtube|vimeo|viddler)\.com!i', + 'skipFootnoteLink' => '/^\s*(\[?[a-z0-9]{1,2}\]?|^|edit|citation needed)\s*$/i' + ); + + /* constants */ + const FLAG_STRIP_UNLIKELYS = 1; + const FLAG_WEIGHT_CLASSES = 2; + const FLAG_CLEAN_CONDITIONALLY = 4; + + /** + * Create instance of Readability + * @param string UTF-8 encoded string + * @param string (optional) URL associated with HTML (used for footnotes) + * @param string which parser to use for turning raw HTML into a DOMDocument (either 'libxml' or 'html5lib') + */ + function __construct($html, $url=null, $parser='libxml') + { + $this->url = $url; + /* Turn all double br's into p's */ + $html = preg_replace($this->regexps['replaceBrs'], '

', $html); + $html = preg_replace($this->regexps['replaceFonts'], '<$1span>', $html); + $html = mb_convert_encoding($html, 'HTML-ENTITIES', "UTF-8"); + if (trim($html) == '') $html = ''; + if ($parser=='html5lib' && ($this->dom = HTML5_Parser::parse($html))) { + // all good + } else { + $this->dom = new DOMDocument(); + $this->dom->preserveWhiteSpace = false; + @$this->dom->loadHTML($html); + } + $this->dom->registerNodeClass('DOMElement', 'JSLikeHTMLElement'); + } + + /** + * Get article title element + * @return DOMElement + */ + public function getTitle() { + return $this->articleTitle; + } + + /** + * Get article content element + * @return DOMElement + */ + public function getContent() { + return $this->articleContent; + } + + /** + * Runs readability. + * + * Workflow: + * 1. Prep the document by removing script tags, css, etc. + * 2. Build readability's DOM tree. + * 3. Grab the article content from the current dom tree. + * 4. Replace the current DOM tree with the new one. + * 5. Read peacefully. + * + * @return boolean true if we found content, false otherwise + **/ + public function init() + { + if (!isset($this->dom->documentElement)) return false; + $this->removeScripts($this->dom); + //die($this->getInnerHTML($this->dom->documentElement)); + + // Assume successful outcome + $this->success = true; + + $bodyElems = $this->dom->getElementsByTagName('body'); + if ($bodyElems->length > 0) { + if ($this->bodyCache == null) { + $this->bodyCache = $bodyElems->item(0)->innerHTML; + } + if ($this->body == null) { + $this->body = $bodyElems->item(0); + } + } + + $this->prepDocument(); + + //die($this->dom->documentElement->parentNode->nodeType); + //$this->setInnerHTML($this->dom->documentElement, $this->getInnerHTML($this->dom->documentElement)); + //die($this->getInnerHTML($this->dom->documentElement)); + + /* Build readability's DOM tree */ + $overlay = $this->dom->createElement('div'); + $innerDiv = $this->dom->createElement('div'); + $articleTitle = $this->getArticleTitle(); + $articleContent = $this->grabArticle(); + + if (!$articleContent) { + $this->success = false; + $articleContent = $this->dom->createElement('div'); + $articleContent->setAttribute('id', 'readability-content'); + $articleContent->innerHTML = '

Sorry, Readability was unable to parse this page for content.

'; + } + + $overlay->setAttribute('id', 'readOverlay'); + $innerDiv->setAttribute('id', 'readInner'); + + /* Glue the structure of our document together. */ + $innerDiv->appendChild($articleTitle); + $innerDiv->appendChild($articleContent); + $overlay->appendChild($innerDiv); + + /* Clear the old HTML, insert the new content. */ + $this->body->innerHTML = ''; + $this->body->appendChild($overlay); + //document.body.insertBefore(overlay, document.body.firstChild); + $this->body->removeAttribute('style'); + + $this->postProcessContent($articleContent); + + // Set title and content instance variables + $this->articleTitle = $articleTitle; + $this->articleContent = $articleContent; + + return $this->success; + } + + /** + * Debug + */ + protected function dbg($msg) { + if ($this->debug) echo '* ',$msg, "\n"; + } + + /** + * Run any post-process modifications to article content as necessary. + * + * @param DOMElement + * @return void + */ + public function postProcessContent($articleContent) { + if ($this->convertLinksToFootnotes && !preg_match('/wikipedia\.org/', @$this->url)) { + $this->addFootnotes($articleContent); + } + } + + /** + * Get the article title as an H1. + * + * @return DOMElement + */ + protected function getArticleTitle() { + $curTitle = ''; + $origTitle = ''; + + try { + $curTitle = $origTitle = $this->getInnerText($this->dom->getElementsByTagName('title')->item(0)); + } catch(Exception $e) {} + + if (preg_match('/ [\|\-] /', $curTitle)) + { + $curTitle = preg_replace('/(.*)[\|\-] .*/i', '$1', $origTitle); + + if (count(explode(' ', $curTitle)) < 3) { + $curTitle = preg_replace('/[^\|\-]*[\|\-](.*)/i', '$1', $origTitle); + } + } + else if (strpos($curTitle, ': ') !== false) + { + $curTitle = preg_replace('/.*:(.*)/i', '$1', $origTitle); + + if (count(explode(' ', $curTitle)) < 3) { + $curTitle = preg_replace('/[^:]*[:](.*)/i','$1', $origTitle); + } + } + else if(strlen($curTitle) > 150 || strlen($curTitle) < 15) + { + $hOnes = $this->dom->getElementsByTagName('h1'); + if($hOnes->length == 1) + { + $curTitle = $this->getInnerText($hOnes->item(0)); + } + } + + $curTitle = trim($curTitle); + + if (count(explode(' ', $curTitle)) <= 4) { + $curTitle = $origTitle; + } + + $articleTitle = $this->dom->createElement('h1'); + $articleTitle->innerHTML = $curTitle; + + return $articleTitle; + } + + /** + * Prepare the HTML document for readability to scrape it. + * This includes things like stripping javascript, CSS, and handling terrible markup. + * + * @return void + **/ + protected function prepDocument() { + /** + * In some cases a body element can't be found (if the HTML is totally hosed for example) + * so we create a new body node and append it to the document. + */ + if ($this->body == null) + { + $this->body = $this->dom->createElement('body'); + $this->dom->documentElement->appendChild($this->body); + } + $this->body->setAttribute('id', 'readabilityBody'); + + /* Remove all style tags in head */ + $styleTags = $this->dom->getElementsByTagName('style'); + for ($i = $styleTags->length-1; $i >= 0; $i--) + { + $styleTags->item($i)->parentNode->removeChild($styleTags->item($i)); + } + + /* Turn all double br's into p's */ + /* Note, this is pretty costly as far as processing goes. Maybe optimize later. */ + //document.body.innerHTML = document.body.innerHTML.replace(readability.regexps.replaceBrs, '

').replace(readability.regexps.replaceFonts, '<$1span>'); + // We do this in the constructor for PHP as that's when we have raw HTML - before parsing it into a DOM tree. + // Manipulating innerHTML as it's done in JS is not possible in PHP. + } + + /** + * For easier reading, convert this document to have footnotes at the bottom rather than inline links. + * @see http://www.roughtype.com/archives/2010/05/experiments_in.php + * + * @return void + **/ + public function addFootnotes($articleContent) { + $footnotesWrapper = $this->dom->createElement('div'); + $footnotesWrapper->setAttribute('id', 'readability-footnotes'); + $footnotesWrapper->innerHTML = '

References

'; + + $articleFootnotes = $this->dom->createElement('ol'); + $articleFootnotes->setAttribute('id', 'readability-footnotes-list'); + $footnotesWrapper->appendChild($articleFootnotes); + + $articleLinks = $articleContent->getElementsByTagName('a'); + + $linkCount = 0; + for ($i = 0; $i < $articleLinks->length; $i++) + { + $articleLink = $articleLinks->item($i); + $footnoteLink = $articleLink->cloneNode(true); + $refLink = $this->dom->createElement('a'); + $footnote = $this->dom->createElement('li'); + $linkDomain = @parse_url($footnoteLink->getAttribute('href'), PHP_URL_HOST); + if (!$linkDomain && isset($this->url)) $linkDomain = @parse_url($this->url, PHP_URL_HOST); + //linkDomain = footnoteLink.host ? footnoteLink.host : document.location.host, + $linkText = $this->getInnerText($articleLink); + + if ((strpos($articleLink->getAttribute('class'), 'readability-DoNotFootnote') !== false) || preg_match($this->regexps['skipFootnoteLink'], $linkText)) { + continue; + } + + $linkCount++; + + /** Add a superscript reference after the article link */ + $refLink->setAttribute('href', '#readabilityFootnoteLink-' . $linkCount); + $refLink->innerHTML = '^{[' . $linkCount . ']}'; + $refLink->setAttribute('class', 'readability-DoNotFootnote'); + $refLink->setAttribute('style', 'color: inherit;'); + + //TODO: does this work or should we use DOMNode.isSameNode()? + if ($articleLink->parentNode->lastChild == $articleLink) { + $articleLink->parentNode->appendChild($refLink); + } else { + $articleLink->parentNode->insertBefore($refLink, $articleLink->nextSibling); + } + + $articleLink->setAttribute('style', 'color: inherit; text-decoration: none;'); + $articleLink->setAttribute('name', 'readabilityLink-' . $linkCount); + + $footnote->innerHTML = '^{^} '; + + $footnoteLink->innerHTML = ($footnoteLink->getAttribute('title') != '' ? $footnoteLink->getAttribute('title') : $linkText); + $footnoteLink->setAttribute('name', 'readabilityFootnoteLink-' . $linkCount); + + $footnote->appendChild($footnoteLink); + if ($linkDomain) $footnote->innerHTML = $footnote->innerHTML . ' (' . $linkDomain . ')'; + + $articleFootnotes->appendChild($footnote); + } + + if ($linkCount > 0) { + $articleContent->appendChild($footnotesWrapper); + } + } + + /** + * Reverts P elements with class 'readability-styled' + * to text nodes - which is what they were before. + * + * @param DOMElement + * @return void + */ + function revertReadabilityStyledElements($articleContent) { + $xpath = new DOMXPath($articleContent->ownerDocument); + $elems = $xpath->query('.//p[@class="readability-styled"]', $articleContent); + //$elems = $articleContent->getElementsByTagName('p'); + for ($i = $elems->length-1; $i >= 0; $i--) { + $e = $elems->item($i); + $e->parentNode->replaceChild($articleContent->ownerDocument->createTextNode($e->textContent), $e); + //if ($e->hasAttribute('class') && $e->getAttribute('class') == 'readability-styled') { + // $e->parentNode->replaceChild($this->dom->createTextNode($e->textContent), $e); + //} + } + } + + /** + * Prepare the article node for display. Clean out any inline styles, + * iframes, forms, strip extraneous

tags, etc. + * + * @param DOMElement + * @return void + */ + function prepArticle($articleContent) { + $this->cleanStyles($articleContent); + $this->killBreaks($articleContent); + if ($this->revertForcedParagraphElements) { + $this->revertReadabilityStyledElements($articleContent); + } + + /* Clean out junk from the article content */ + $this->cleanConditionally($articleContent, 'form'); + $this->clean($articleContent, 'object'); + $this->clean($articleContent, 'h1'); + + /** + * If there is only one h2, they are probably using it + * as a header and not a subheader, so remove it since we already have a header. + ***/ + if (!$this->lightClean && ($articleContent->getElementsByTagName('h2')->length == 1)) { + $this->clean($articleContent, 'h2'); + } + $this->clean($articleContent, 'iframe'); + + $this->cleanHeaders($articleContent); + + /* Do these last as the previous stuff may have removed junk that will affect these */ + $this->cleanConditionally($articleContent, 'table'); + $this->cleanConditionally($articleContent, 'ul'); + $this->cleanConditionally($articleContent, 'div'); + + /* Remove extra paragraphs */ + $articleParagraphs = $articleContent->getElementsByTagName('p'); + for ($i = $articleParagraphs->length-1; $i >= 0; $i--) + { + $imgCount = $articleParagraphs->item($i)->getElementsByTagName('img')->length; + $embedCount = $articleParagraphs->item($i)->getElementsByTagName('embed')->length; + $objectCount = $articleParagraphs->item($i)->getElementsByTagName('object')->length; + $iframeCount = $articleParagraphs->item($i)->getElementsByTagName('iframe')->length; + + if ($imgCount === 0 && $embedCount === 0 && $objectCount === 0 && $iframeCount === 0 && $this->getInnerText($articleParagraphs->item($i), false) == '') + { + $articleParagraphs->item($i)->parentNode->removeChild($articleParagraphs->item($i)); + } + } + + try { + $articleContent->innerHTML = preg_replace('/]*>\s*

innerHTML); + //articleContent.innerHTML = articleContent.innerHTML.replace(/]*>\s*

dbg("Cleaning innerHTML of breaks failed. This is an IE strict-block-elements bug. Ignoring.: " . $e); + } + } + + /** + * Initialize a node with the readability object. Also checks the + * className/id for special names to add to its score. + * + * @param Element + * @return void + **/ + protected function initializeNode($node) { + $readability = $this->dom->createAttribute('readability'); + $readability->value = 0; // this is our contentScore + $node->setAttributeNode($readability); + + switch (strtoupper($node->tagName)) { // unsure if strtoupper is needed, but using it just in case + case 'DIV': + $readability->value += 5; + break; + + case 'PRE': + case 'TD': + case 'BLOCKQUOTE': + $readability->value += 3; + break; + + case 'ADDRESS': + case 'OL': + case 'UL': + case 'DL': + case 'DD': + case 'DT': + case 'LI': + case 'FORM': + $readability->value -= 3; + break; + + case 'H1': + case 'H2': + case 'H3': + case 'H4': + case 'H5': + case 'H6': + case 'TH': + $readability->value -= 5; + break; + } + $readability->value += $this->getClassWeight($node); + } + + /*** + * grabArticle - Using a variety of metrics (content score, classname, element types), find the content that is + * most likely to be the stuff a user wants to read. Then return it wrapped up in a div. + * + * @return DOMElement + **/ + protected function grabArticle($page=null) { + $stripUnlikelyCandidates = $this->flagIsActive(self::FLAG_STRIP_UNLIKELYS); + if (!$page) $page = $this->dom; + $allElements = $page->getElementsByTagName('*'); + /** + * First, node prepping. Trash nodes that look cruddy (like ones with the class name "comment", etc), and turn divs + * into P tags where they have been used inappropriately (as in, where they contain no other block level elements.) + * + * Note: Assignment from index for performance. See http://www.peachpit.com/articles/article.aspx?p=31567&seqNum=5 + * TODO: Shouldn't this be a reverse traversal? + **/ + $node = null; + $nodesToScore = array(); + for ($nodeIndex = 0; ($node = $allElements->item($nodeIndex)); $nodeIndex++) { + //for ($nodeIndex=$targetList->length-1; $nodeIndex >= 0; $nodeIndex--) { + //$node = $targetList->item($nodeIndex); + $tagName = strtoupper($node->tagName); + /* Remove unlikely candidates */ + if ($stripUnlikelyCandidates) { + $unlikelyMatchString = $node->getAttribute('class') . $node->getAttribute('id'); + if ( + preg_match($this->regexps['unlikelyCandidates'], $unlikelyMatchString) && + !preg_match($this->regexps['okMaybeItsACandidate'], $unlikelyMatchString) && + $tagName != 'BODY' + ) + { + $this->dbg('Removing unlikely candidate - ' . $unlikelyMatchString); + //$nodesToRemove[] = $node; + $node->parentNode->removeChild($node); + $nodeIndex--; + continue; + } + } + + if ($tagName == 'P' || $tagName == 'TD' || $tagName == 'PRE') { + $nodesToScore[] = $node; + } + + /* Turn all divs that don't have children block level elements into p's */ + if ($tagName == 'DIV') { + if (!preg_match($this->regexps['divToPElements'], $node->innerHTML)) { + //$this->dbg('Altering div to p'); + $newNode = $this->dom->createElement('p'); + try { + $newNode->innerHTML = $node->innerHTML; + //$nodesToReplace[] = array('new'=>$newNode, 'old'=>$node); + $node->parentNode->replaceChild($newNode, $node); + $nodeIndex--; + $nodesToScore[] = $node; // or $newNode? + } + catch(Exception $e) { + $this->dbg('Could not alter div to p, reverting back to div.: ' . $e); + } + } + else + { + /* EXPERIMENTAL */ + // TODO: change these p elements back to text nodes after processing + for ($i = 0, $il = $node->childNodes->length; $i < $il; $i++) { + $childNode = $node->childNodes->item($i); + if ($childNode->nodeType == 3) { // XML_TEXT_NODE + //$this->dbg('replacing text node with a p tag with the same content.'); + $p = $this->dom->createElement('p'); + $p->innerHTML = $childNode->nodeValue; + $p->setAttribute('style', 'display: inline;'); + $p->setAttribute('class', 'readability-styled'); + $childNode->parentNode->replaceChild($p, $childNode); + } + } + } + } + } + + /** + * Loop through all paragraphs, and assign a score to them based on how content-y they look. + * Then add their score to their parent node. + * + * A score is determined by things like number of commas, class names, etc. Maybe eventually link density. + **/ + $candidates = array(); + for ($pt=0; $pt < count($nodesToScore); $pt++) { + $parentNode = $nodesToScore[$pt]->parentNode; + // $grandParentNode = $parentNode ? $parentNode->parentNode : null; + $grandParentNode = !$parentNode ? null : (($parentNode->parentNode instanceof DOMElement) ? $parentNode->parentNode : null); + $innerText = $this->getInnerText($nodesToScore[$pt]); + + if (!$parentNode || !isset($parentNode->tagName)) { + continue; + } + + /* If this paragraph is less than 25 characters, don't even count it. */ + if(strlen($innerText) < 25) { + continue; + } + + /* Initialize readability data for the parent. */ + if (!$parentNode->hasAttribute('readability')) + { + $this->initializeNode($parentNode); + $candidates[] = $parentNode; + } + + /* Initialize readability data for the grandparent. */ + if ($grandParentNode && !$grandParentNode->hasAttribute('readability') && isset($grandParentNode->tagName)) + { + $this->initializeNode($grandParentNode); + $candidates[] = $grandParentNode; + } + + $contentScore = 0; + + /* Add a point for the paragraph itself as a base. */ + $contentScore++; + + /* Add points for any commas within this paragraph */ + $contentScore += count(explode(',', $innerText)); + + /* For every 100 characters in this paragraph, add another point. Up to 3 points. */ + $contentScore += min(floor(strlen($innerText) / 100), 3); + + /* Add the score to the parent. The grandparent gets half. */ + $parentNode->getAttributeNode('readability')->value += $contentScore; + + if ($grandParentNode) { + $grandParentNode->getAttributeNode('readability')->value += $contentScore/2; + } + } + + /** + * After we've calculated scores, loop through all of the possible candidate nodes we found + * and find the one with the highest score. + **/ + $topCandidate = null; + for ($c=0, $cl=count($candidates); $c < $cl; $c++) + { + /** + * Scale the final candidates score based on link density. Good content should have a + * relatively small link density (5% or less) and be mostly unaffected by this operation. + **/ + $readability = $candidates[$c]->getAttributeNode('readability'); + $readability->value = $readability->value * (1-$this->getLinkDensity($candidates[$c])); + + $this->dbg('Candidate: ' . $candidates[$c]->tagName . ' (' . $candidates[$c]->getAttribute('class') . ':' . $candidates[$c]->getAttribute('id') . ') with score ' . $readability->value); + + if (!$topCandidate || $readability->value > (int)$topCandidate->getAttribute('readability')) { + $topCandidate = $candidates[$c]; + } + } + + /** + * If we still have no top candidate, just use the body as a last resort. + * We also have to copy the body node so it is something we can modify. + **/ + if ($topCandidate === null || strtoupper($topCandidate->tagName) == 'BODY') + { + $topCandidate = $this->dom->createElement('div'); + if ($page instanceof DOMDocument) { + if (!isset($page->documentElement)) { + // we don't have a body either? what a mess! :) + } else { + $topCandidate->innerHTML = $page->documentElement->innerHTML; + $page->documentElement->innerHTML = ''; + $page->documentElement->appendChild($topCandidate); + } + } else { + $topCandidate->innerHTML = $page->innerHTML; + $page->innerHTML = ''; + $page->appendChild($topCandidate); + } + $this->initializeNode($topCandidate); + } + + /** + * Now that we have the top candidate, look through its siblings for content that might also be related. + * Things like preambles, content split by ads that we removed, etc. + **/ + $articleContent = $this->dom->createElement('div'); + $articleContent->setAttribute('id', 'readability-content'); + $siblingScoreThreshold = max(10, ((int)$topCandidate->getAttribute('readability')) * 0.2); + $siblingNodes = $topCandidate->parentNode->childNodes; + if (!isset($siblingNodes)) { + $siblingNodes = new stdClass; + $siblingNodes->length = 0; + } + + for ($s=0, $sl=$siblingNodes->length; $s < $sl; $s++) + { + $siblingNode = $siblingNodes->item($s); + $append = false; + + $this->dbg('Looking at sibling node: ' . $siblingNode->nodeName . (($siblingNode->nodeType === XML_ELEMENT_NODE && $siblingNode->hasAttribute('readability')) ? (' with score ' . $siblingNode->getAttribute('readability')) : '')); + + //dbg('Sibling has score ' . ($siblingNode->readability ? siblingNode.readability.contentScore : 'Unknown')); + + if ($siblingNode === $topCandidate) + // or if ($siblingNode->isSameNode($topCandidate)) + { + $append = true; + } + + $contentBonus = 0; + /* Give a bonus if sibling nodes and top candidates have the example same classname */ + if ($siblingNode->nodeType === XML_ELEMENT_NODE && $siblingNode->getAttribute('class') == $topCandidate->getAttribute('class') && $topCandidate->getAttribute('class') != '') { + $contentBonus += ((int)$topCandidate->getAttribute('readability')) * 0.2; + } + + if ($siblingNode->nodeType === XML_ELEMENT_NODE && $siblingNode->hasAttribute('readability') && (((int)$siblingNode->getAttribute('readability')) + $contentBonus) >= $siblingScoreThreshold) + { + $append = true; + } + + if (strtoupper($siblingNode->nodeName) == 'P') { + $linkDensity = $this->getLinkDensity($siblingNode); + $nodeContent = $this->getInnerText($siblingNode); + $nodeLength = strlen($nodeContent); + + if ($nodeLength > 80 && $linkDensity < 0.25) + { + $append = true; + } + else if ($nodeLength < 80 && $linkDensity === 0 && preg_match('/\.( |$)/', $nodeContent)) + { + $append = true; + } + } + + if ($append) + { + $this->dbg('Appending node: ' . $siblingNode->nodeName); + + $nodeToAppend = null; + $sibNodeName = strtoupper($siblingNode->nodeName); + if ($sibNodeName != 'DIV' && $sibNodeName != 'P') { + /* We have a node that isn't a common block level element, like a form or td tag. Turn it into a div so it doesn't get filtered out later by accident. */ + + $this->dbg('Altering siblingNode of ' . $sibNodeName . ' to div.'); + $nodeToAppend = $this->dom->createElement('div'); + try { + $nodeToAppend->setAttribute('id', $siblingNode->getAttribute('id')); + $nodeToAppend->innerHTML = $siblingNode->innerHTML; + } + catch(Exception $e) + { + $this->dbg('Could not alter siblingNode to div, reverting back to original.'); + $nodeToAppend = $siblingNode; + $s--; + $sl--; + } + } else { + $nodeToAppend = $siblingNode; + $s--; + $sl--; + } + + /* To ensure a node does not interfere with readability styles, remove its classnames */ + $nodeToAppend->removeAttribute('class'); + + /* Append sibling and subtract from our list because it removes the node when you append to another node */ + $articleContent->appendChild($nodeToAppend); + } + } + + /** + * So we have all of the content that we need. Now we clean it up for presentation. + **/ + $this->prepArticle($articleContent); + + /** + * Now that we've gone through the full algorithm, check to see if we got any meaningful content. + * If we didn't, we may need to re-run grabArticle with different flags set. This gives us a higher + * likelihood of finding the content, and the sieve approach gives us a higher likelihood of + * finding the -right- content. + **/ + if (strlen($this->getInnerText($articleContent, false)) < 250) + { + // TODO: find out why element disappears sometimes, e.g. for this URL http://www.businessinsider.com/6-hedge-fund-etfs-for-average-investors-2011-7 + // in the meantime, we check and create an empty element if it's not there. + if (!isset($this->body->childNodes)) $this->body = $this->dom->createElement('body'); + $this->body->innerHTML = $this->bodyCache; + + if ($this->flagIsActive(self::FLAG_STRIP_UNLIKELYS)) { + $this->removeFlag(self::FLAG_STRIP_UNLIKELYS); + return $this->grabArticle($this->body); + } + else if ($this->flagIsActive(self::FLAG_WEIGHT_CLASSES)) { + $this->removeFlag(self::FLAG_WEIGHT_CLASSES); + return $this->grabArticle($this->body); + } + else if ($this->flagIsActive(self::FLAG_CLEAN_CONDITIONALLY)) { + $this->removeFlag(self::FLAG_CLEAN_CONDITIONALLY); + return $this->grabArticle($this->body); + } + else { + return false; + } + } + return $articleContent; + } + + /** + * Remove script tags from document + * + * @param DOMElement + * @return void + */ + public function removeScripts($doc) { + $scripts = $doc->getElementsByTagName('script'); + for($i = $scripts->length-1; $i >= 0; $i--) + { + $scripts->item($i)->parentNode->removeChild($scripts->item($i)); + } + } + + /** + * Get the inner text of a node. + * This also strips out any excess whitespace to be found. + * + * @param DOMElement $ + * @param boolean $normalizeSpaces (default: true) + * @return string + **/ + public function getInnerText($e, $normalizeSpaces=true) { + $textContent = ''; + + if (!isset($e->textContent) || $e->textContent == '') { + return ''; + } + + $textContent = trim($e->textContent); + + if ($normalizeSpaces) { + return preg_replace($this->regexps['normalize'], ' ', $textContent); + } else { + return $textContent; + } + } + + /** + * Get the number of times a string $s appears in the node $e. + * + * @param DOMElement $e + * @param string - what to count. Default is "," + * @return number (integer) + **/ + public function getCharCount($e, $s=',') { + return substr_count($this->getInnerText($e), $s); + } + + /** + * Remove the style attribute on every $e and under. + * + * @param DOMElement $e + * @return void + */ + public function cleanStyles($e) { + if (!is_object($e)) return; + $elems = $e->getElementsByTagName('*'); + foreach ($elems as $elem) { + $elem->removeAttribute('style'); + } + } + + /** + * Get the density of links as a percentage of the content + * This is the amount of text that is inside a link divided by the total text in the node. + * + * @param DOMElement $e + * @return number (float) + */ + public function getLinkDensity($e) { + $links = $e->getElementsByTagName('a'); + $textLength = strlen($this->getInnerText($e)); + $linkLength = 0; + for ($i=0, $il=$links->length; $i < $il; $i++) + { + $linkLength += strlen($this->getInnerText($links->item($i))); + } + if ($textLength > 0) { + return $linkLength / $textLength; + } else { + return 0; + } + } + + /** + * Get an elements class/id weight. Uses regular expressions to tell if this + * element looks good or bad. + * + * @param DOMElement $e + * @return number (Integer) + */ + public function getClassWeight($e) { + if(!$this->flagIsActive(self::FLAG_WEIGHT_CLASSES)) { + return 0; + } + + $weight = 0; + + /* Look for a special classname */ + if ($e->hasAttribute('class') && $e->getAttribute('class') != '') + { + if (preg_match($this->regexps['negative'], $e->getAttribute('class'))) { + $weight -= 25; + } + if (preg_match($this->regexps['positive'], $e->getAttribute('class'))) { + $weight += 25; + } + } + + /* Look for a special ID */ + if ($e->hasAttribute('id') && $e->getAttribute('id') != '') + { + if (preg_match($this->regexps['negative'], $e->getAttribute('id'))) { + $weight -= 25; + } + if (preg_match($this->regexps['positive'], $e->getAttribute('id'))) { + $weight += 25; + } + } + return $weight; + } + + /** + * Remove extraneous break tags from a node. + * + * @param DOMElement $node + * @return void + */ + public function killBreaks($node) { + $html = $node->innerHTML; + $html = preg_replace($this->regexps['killBreaks'], '
', $html); + $node->innerHTML = $html; + } + + /** + * Clean a node of all elements of type "tag". + * (Unless it's a youtube/vimeo video. People love movies.) + * + * Updated 2012-09-18 to preserve youtube/vimeo iframes + * + * @param DOMElement $e + * @param string $tag + * @return void + */ + public function clean($e, $tag) { + $targetList = $e->getElementsByTagName($tag); + $isEmbed = ($tag == 'iframe' || $tag == 'object' || $tag == 'embed'); + + for ($y=$targetList->length-1; $y >= 0; $y--) { + /* Allow youtube and vimeo videos through as people usually want to see those. */ + if ($isEmbed) { + $attributeValues = ''; + for ($i=0, $il=$targetList->item($y)->attributes->length; $i < $il; $i++) { + $attributeValues .= $targetList->item($y)->attributes->item($i)->value . '|'; // DOMAttr? (TODO: test) + } + + /* First, check the elements attributes to see if any of them contain youtube or vimeo */ + if (preg_match($this->regexps['video'], $attributeValues)) { + continue; + } + + /* Then check the elements inside this element for the same. */ + if (preg_match($this->regexps['video'], $targetList->item($y)->innerHTML)) { + continue; + } + } + $targetList->item($y)->parentNode->removeChild($targetList->item($y)); + } + } + + /** + * Clean an element of all tags of type "tag" if they look fishy. + * "Fishy" is an algorithm based on content length, classnames, + * link density, number of images & embeds, etc. + * + * @param DOMElement $e + * @param string $tag + * @return void + */ + public function cleanConditionally($e, $tag) { + if (!$this->flagIsActive(self::FLAG_CLEAN_CONDITIONALLY)) { + return; + } + + $tagsList = $e->getElementsByTagName($tag); + $curTagsLength = $tagsList->length; + + /** + * Gather counts for other typical elements embedded within. + * Traverse backwards so we can remove nodes at the same time without effecting the traversal. + * + * TODO: Consider taking into account original contentScore here. + */ + for ($i=$curTagsLength-1; $i >= 0; $i--) { + $weight = $this->getClassWeight($tagsList->item($i)); + $contentScore = ($tagsList->item($i)->hasAttribute('readability')) ? (int)$tagsList->item($i)->getAttribute('readability') : 0; + + $this->dbg('Cleaning Conditionally ' . $tagsList->item($i)->tagName . ' (' . $tagsList->item($i)->getAttribute('class') . ':' . $tagsList->item($i)->getAttribute('id') . ')' . (($tagsList->item($i)->hasAttribute('readability')) ? (' with score ' . $tagsList->item($i)->getAttribute('readability')) : '')); + + if ($weight + $contentScore < 0) { + $tagsList->item($i)->parentNode->removeChild($tagsList->item($i)); + } + else if ( $this->getCharCount($tagsList->item($i), ',') < 10) { + /** + * If there are not very many commas, and the number of + * non-paragraph elements is more than paragraphs or other ominous signs, remove the element. + **/ + $p = $tagsList->item($i)->getElementsByTagName('p')->length; + $img = $tagsList->item($i)->getElementsByTagName('img')->length; + $li = $tagsList->item($i)->getElementsByTagName('li')->length-100; + $input = $tagsList->item($i)->getElementsByTagName('input')->length; + $a = $tagsList->item($i)->getElementsByTagName('a')->length; + + $embedCount = 0; + $embeds = $tagsList->item($i)->getElementsByTagName('embed'); + for ($ei=0, $il=$embeds->length; $ei < $il; $ei++) { + if (preg_match($this->regexps['video'], $embeds->item($ei)->getAttribute('src'))) { + $embedCount++; + } + } + $embeds = $tagsList->item($i)->getElementsByTagName('iframe'); + for ($ei=0, $il=$embeds->length; $ei < $il; $ei++) { + if (preg_match($this->regexps['video'], $embeds->item($ei)->getAttribute('src'))) { + $embedCount++; + } + } + + $linkDensity = $this->getLinkDensity($tagsList->item($i)); + $contentLength = strlen($this->getInnerText($tagsList->item($i))); + $toRemove = false; + + if ($this->lightClean) { + $this->dbg('Light clean...'); + if ( ($img > $p) && ($img > 4) ) { + $this->dbg(' more than 4 images and more image elements than paragraph elements'); + $toRemove = true; + } else if ($li > $p && $tag != 'ul' && $tag != 'ol') { + $this->dbg(' too many

elements, and parent is not

elements, and parent is not