10 files changed, 53 insertions, 12 deletions

diff --git a/inc/3rdparty/config.php b/inc/3rdparty/config.php
index 61fc0d0e..e618117b 100644..100755
--- a/inc/3rdparty/config.php
+++ b/inc/3rdparty/config.php
@@ -11,6 +11,8 @@
 // options you'd like to override in custom_config.php.

 // .....................................................

 

+global $options;

+

 // Create config object

 if (!isset($options)) $options = new stdClass();

 

diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php
index 7104bc73..2852c4c2 100644..100755
--- a/inc/3rdparty/makefulltextfeed.php
+++ b/inc/3rdparty/makefulltextfeed.php
@@ -424,6 +424,7 @@ $http->rewriteUrls = $options->rewrite_url;
 //////////////////////////////////

 // Set up Content Extractor

 //////////////////////////////////

+global $extractor;

 $extractor = new ContentExtractor(dirname(__FILE__).'/site_config/custom', dirname(__FILE__).'/site_config/standard');

 $extractor->debug = $debug_mode;

 SiteConfig::$debug = $debug_mode;

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 3332b5a3..a366e866 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -345,7 +345,7 @@ class Database {
     }
 
     public function retrieveAllTags($user_id) {
-        $sql = "SELECT tags.* FROM tags
+        $sql = "SELECT DISTINCT tags.* FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
           WHERE entries.user_id=?";
@@ -357,7 +357,7 @@ class Database {
 
     public function retrieveTag($id, $user_id) {
         $tag  = NULL;
-        $sql    = "SELECT tags.* FROM tags
+        $sql    = "SELECT DISTINCT tags.* FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
           WHERE tags.id=? AND entries.user_id=?";
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index b6b3b73f..d92fbf08 100644..100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -348,17 +348,55 @@ class Poche
 
     protected function getPageContent(Url $url)
     {
-        $options = array('http' => array('user_agent' => 'poche'));
-        if (isset($_SERVER['AUTH_TYPE']) && "basic" === strtolower($_SERVER['AUTH_TYPE'])) {
-            $options['http']['header'] = sprintf(
-                "Authorization: Basic %s", 
-                base64_encode(
-                    sprintf('%s:%s', $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])
-                )
+        // Saving and clearing context
+        $REAL = array();
+        foreach( $GLOBALS as $key => $value ) {
+            if( $key != "GLOBALS" && $key != "_SESSION" ) {
+                $GLOBALS[$key] = array();
+                $REAL[$key] = $value;
+            }
+        }
+        // Saving and clearing session
+        $REAL_SESSION = array();
+        foreach( $_SESSION as $key => $value ) {
+            $REAL_SESSION[$key] = $value;
+            unset($_SESSION[$key]);
+        }
+
+        // Running code in different context
+        $scope = function() {
+            extract( func_get_arg(1) );
+            $_GET = $_REQUEST = array(
+                        "url" => $url->getUrl(),
+                        "max" => 5,
+                        "links" => "preserve",
+                        "exc" => "",
+                        "format" => "json",
+                        "submit" => "Create Feed"
             );
+            ob_start();
+            require func_get_arg(0);
+            $json = ob_get_flush();
+            return $json;
+        };
+        $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) );
+
+        // Clearing and restoring context
+        foreach( $GLOBALS as $key => $value ) {
+            if( $key != "GLOBALS" && $key != "_SESSION" ) {
+                unset($GLOBALS[$key]);
+            }
+        }
+        foreach( $REAL as $key => $value ) {
+            $GLOBALS[$key] = $value;
+        }
+        // Clearing and restoring session
+        foreach( $_SESSION as $key => $value ) {
+            unset($_SESSION[$key]);
+        }
+        foreach( $REAL_SESSION as $key => $value ) {
+            $_SESSION[$key] = $value;
         }
-        $context = stream_context_create($options);
-        $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed', false, $context);
         return json_decode($json, true);
     }
 
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index ec662158..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -2,5 +2,5 @@
   font-family: 'PT Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
 }
diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..02f53b36 100755
--- a/themes/baggy/font/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..d9c35b98 100755
--- a/themes/baggy/font/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..3860dd04 100755
--- a/themes/baggy/font/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..c3a91ed7 100755
--- a/themes/baggy/font/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/fonts/ptsans.woff
index cf7c62e1..cf7c62e1 100644
--- a/themes/baggy/font/ptsans.woff
+++ b/themes/baggy/fonts/ptsans.woff