Changeset 647244

Timestamp:

01/02/2013 10:09:27 PM (13 years ago)

Author:

jankarres

Message:

tagging version 1.2

Location:

wp-pocket

Files:

• tags/1.2 (copied) (copied from wp-pocket/trunk)
• tags/1.2/css/main.css (modified) (2 diffs)
• tags/1.2/readme.txt (modified) (3 diffs)
• tags/1.2/wp-pocket.php (modified) (61 diffs)
• trunk/css/main.css (modified) (2 diffs)
• trunk/readme.txt (modified) (3 diffs)
• trunk/wp-pocket.php (modified) (61 diffs)

wp-pocket/tags/1.2/css/main.css

@@ -10 +10 @@
 .wppocket p.description {
     margin: 2px 10px 5px 0;
+}
+
+.wppocket p.description textarea {
+    resize: vertical;
 }
 
@@ -62 +66 @@
 }
 
+.wppocket .description-thin.description-two-thirds {
+    width: 400px;
+}
+
+.wppocket .description-thin.description-one-thirds {
+    width: 180px;
+}
+
 .wppocket .menu-item-settings {
     width: 600px;

wp-pocket/tags/1.2/readme.txt

@@ -4 +4 @@
 Tags: wp pocket, wordpress, pocket, post, automaticly, wp, links, linklist
 Requires at least: 3.4
-Tested up to: 3.4
-Stable tag: 1.1.1
+Tested up to: 3.5
+Stable tag: 1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -52 +52 @@
 == Changelog ==
 
+= 1.2 =
+Rewrite to Pocket API v3 with oAuth
+Check required PHP version
+Added names of months in English, German or French language
+Improved quality of link title and description
+Implemented function to publish only links, that are marked as favorites in pocket
+Implemented function to show the author of the article in the linklist
+More variables possible in entry building, introduction text and statement text
+Sends, if user allowed it, anonymous statistics to WP-Pocket.com
+Solved coding problems of titles and descriptions
+Solved the problem of marking more than 100 links as read
+Improved performance
+Improved commenting of the code
+Other minor bugfixes
+Removed Flattr button
+
 = 1.1.1 =
 Fix link to options in installed plugins overview
@@ -80 +96 @@
 == ToDo ==
 
-Nothing. If you have requests, please tell me via the contact form on http://wp-pocket.com
+Solve all links option in <i>Links to use</i> (possible, if Pocket save the bug in the API)
+
+If you have requests, please tell me via the contact form on http://wp-pocket.com

wp-pocket/tags/1.2/wp-pocket.php

@@ -6 +6 @@
     Author: Jan Karres
     Author URI: http://www.jankarres.de/
-    Version: 1.1.1
+    Version: 1.2
 */
-
 if(!class_exists('wppocketer')) {
     class wppocketer {
@@ -14 +13 @@
         private $version;
         
-        // Pocket default API-Key by developer
-        private $global_pocket_api_key;
+        // Pocket default Consumer-Key by developer
+        private $global_pocket_consumer_key;
     
         function __construct() {
@@ -24 +23 @@
             
             // Set plugin version
-            $this->version = '1.1.1';
+            $this->version = '1.2';
         
             // Check WP version
-            add_action('init', array(&$this, 'requires_wordpress_version'));
+            add_action('init', array(&$this, 'requires_versions'));
         
             // Change plugin status hooks
@@ -42 +41 @@
             wp_register_script('wppocket_main', plugins_url('js/main.js', __FILE__), array('jquery', 'jquery-ui-core', 'jquery-ui-draggable', 'jquery-ui-droppable'));
             
-            // Pocket default API-Key by developer
-            $this->global_pocket_api_key = '074A0c78dTi1bI26f2pU4b0X9dTbe798';
-        }
-        
-        function requires_wordpress_version() {
+            // Pocket default Consumer-Key by developer
+            $this->global_pocket_consumer_key = '10481-1069ebc911a9483c145d3d92';
+        }
+        
+        // Check if requied versions are supported
+        function requires_versions() {
             global $wp_version;
             
@@ -58 +58 @@
                     wp_die('<i>WP Pocket</i> requires WordPress 3.4 or higher. The plugin has been deactivated! Please update WordPress and try again.<br /><br />Back to <a href="' . admin_url() . '">WordPress Dashboard</a>.');
                 }
+            }
+            
+            // Check PHP Version
+            if (!version_compare(PHP_VERSION, '5.2', '>=')) {
+                deactivate_plugins($plugin);
+                wp_die('<i>WP Pocket</i> requires PHP 5.2 or higher. The plugin has been deactivated! Please update your PHP and try again.<br /><br />Back to <a href="' . admin_url() . '">WordPress Dashboard</a>.');
             }
             
@@ -90 +96 @@
                 ("wppocket_version", "' . $this->version . '", "yes"),
                 ("wppocket_links_to_use", "0", "yes"),
+                ("wppocket_faved", "0", "yes"),
                 ("wppocket_order", "0", "yes"),
                 ("wppocket_mark_as_readed", "0", "yes"),
@@ -100 +107 @@
                 ("wppocket_post_category", "1", "yes"),
                 ("wppocket_pocket_username", "", "yes"),
-                ("wppocket_pocket_password", "", "yes"),
+                ("wppocket_pocket_access_key", "", "yes"),
                 ("wppocket_title", "WP Pocket link collection: %%month%% with %%count%% links", "yes"),
                 ("wppocket_introduction_text", "", "yes"),
                 ("wppocket_statements_text", "", "yes"),
-                ("wppocket_entry_building", "<strong>%%title%%</strong>[[: %%description%%]][[ - Tags: %%tags%%]] - %%url%%", "yes"),
+                ("wppocket_entry_building", "<strong>%%title%%</strong>[[: %%description%%]][[ - by %%author%%]][[ - Tags: %%tags%%]] - %%url%%", "yes"),
+                ("wppocket_language", "en", "yes"),
+                ("wppocket_statistics", "1", "yes"),
                 ("wppocket_key_a", "' . $this->keygen(128) . '", "yes"),
                 ("wppocket_key_b", "' . $this->keygen(128) . '", "yes")
             ';
             $this->wpdb->query($sql);
-
+            
             // Check if version under 1.0.2, if true, replace Pocket username, password and api-key
-            $version = explode('.', get_option('wppocket_version'));
-            if (
-                ($version[0] == 1 && $version[1] == 0 && $version[2] < 2) ||
-                ($version[0] == '' && $version[1] == '' && $version[2] == '')
-            ) {
+            if (!version_compare(get_option('wppocket_version'), '1.0.2', '>=')) {
                 // Update Pocket username, password and api-key
                 update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
@@ -122 +127 @@
             }
             
-            // Save API Key
+            // Check if version under 1.2, if true, remove api-key for consumer-key, remove password, api custom key and reset username
+            if (!version_compare(get_option('wppocket_version'), '1.2', '>=')) {
+                // Remove api key
+                $sql = 'DELETE FROM `wp_options` WHERE `option_name`="wppocket_pocket_api_key" OR `option_name`="wppocket_pocket_password" OR `option_name`="wppocket_pocket_api_key_custom"';
+                $this->wpdb->query($sql);
+                
+                // Reset username
+                $sql = 'UPDATE `wp_options` SET `option_value` = "" WHERE `option_name`="wppocket_pocket_username";';
+                $this->wpdb->query($sql);
+            }
+            
+            // Create Customer Key in database
             $sql = '
             INSERT IGNORE INTO `' . $this->wpdb->prefix . 'options` (
@@ -129 +145 @@
                 `autoload`
             ) VALUES
-                ("wppocket_pocket_api_key_custom", "0", "yes"),
-                ("wppocket_pocket_api_key", "' . $this->xcrypt(0, $this->global_pocket_api_key) . '", "yes")
+                ("wppocket_pocket_consumer_key_custom", "0", "yes"),
+                ("wppocket_pocket_consumer_key", "' . $this->xcrypt(0, $this->global_pocket_consumer_key) . '", "yes")
             ';
             $this->wpdb->query($sql);
@@ -136 +152 @@
             // Check if plugin version number up to date
             if (get_option('wppocket_version') != $this->version) {
+                // Send statistics, if allowed
+                if (get_option('wppocket_statistics') == 1) {
+                    $this->statisticsUpdateVersion();
+                }
+                
                 // Update version number
                 update_option('wppocket_version', $this->version);
@@ -142 +163 @@
 
         function deactivate() {
-            // nothing to do, because user cam reactivate
+            // nothing to do, because user can reactivate the plugin
         }
         
@@ -197 +218 @@
         }
         
-        private function cURL($url, $timeout = 5) {
+        // Easy cURL function
+        private function cURL($url, $post, $timeout = 5) {
             // Init cURL
             $cURL = curl_init();
+            
+            // Define HTTP-Header
+            $httpheader = array();
+            $httpheader[] = 'Content-type: application/x-www-form-urlencoded;charset=UTF-8'; 
             
             // Settings
             curl_setopt($cURL, CURLOPT_URL, $url);
             curl_setopt($cURL, CURLOPT_HEADER, 0);
+            curl_setopt($cURL, CURLOPT_HTTPHEADER, $httpheader);
             curl_setopt($cURL, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($cURL, CURLOPT_TIMEOUT, $timeout);
+            
+            // Save POST parameter in one string
+            if (count($post) != 0) {
+                $i = 0;
+                foreach ($post as $key => $value) {
+                    if ($i != 0) {
+                        $postAsString .= '&';
+                    }
+                
+                    $postAsString .= $key . '=' . $value;
+                    
+                    $i++;
+                }
+            }
+            
+            // Set POST parameters
+            curl_setopt($cURL, CURLOPT_POST, count($post));
+            curl_setopt($cURL, CURLOPT_POSTFIELDS, $postAsString);
             
             // Download
@@ -232 +277 @@
         }
         
+        // Function to get Pocket user auth after OAuth 2.0
+        function authPocketAccountGetRequest() {
+            // Define current URL as return URL with GET parameter auth
+            $returnUrl = (isset($_SERVER['HTTPS'])?'https':'http') . '://' . $_SERVER['HTTP_HOST'] . str_replace('auth-get', 'auth', $_SERVER['REQUEST_URI']);
+            
+            // Request authe
+            $oAuthRequest = $this->cURL(
+                'https://getpocket.com/v3/oauth/request',
+                array(
+                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                    'redirect_uri' => $returnUrl
+                )
+            );
+            
+            // Split return, to have [1] the needed request token
+            $oAuthRequestToken = explode('=', $oAuthRequest);
+            
+            // Redirect user to Pocket auth form (via meta, because wp hadalready sent header)
+            echo '<meta http-equiv="refresh" content="0;url=' . 'https://getpocket.com/auth/authorize?request_token=' . urlencode($oAuthRequestToken[1]) . '&redirect_uri=' . urlencode($returnUrl . '&token=' . $oAuthRequestToken[1]) . '" />';
+            exit;
+        }
+        
+        // Function to save access token of a user
+        function authPocketAccountSaveAccessToken() {
+            // Define access token by GET
+            $oAuthRequestToken = $_GET['token'];
+            
+            // Request authe
+            $oAuthAccess = $this->cURL(
+                'https://getpocket.com/v3/oauth/authorize',
+                array(
+                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                    'code' => $oAuthRequestToken
+                )
+            );
+            
+            // Split return to have access token and username seperated ([0][1] = access_key; [1][1] = username)
+            $oAuthAccess = explode('&', $oAuthAccess);
+            $oAuthAccess[0] = explode('=', $oAuthAccess[0]);
+            $oAuthAccess[1] = explode('=', $oAuthAccess[1]);
+            
+            // Check if access key and username are set
+            if ($oAuthAccess[0][1] != '' && $oAuthAccess[1][1] != '') {
+                // Save auth key and username
+                update_option('wppocket_pocket_access_key', $this->xcrypt(0, $oAuthAccess[0][1]));
+                update_option('wppocket_pocket_username', $this->xcrypt(0, $oAuthAccess[1][1]));
+                
+                // Redirect user to success page. Print not here, because if the user refresh, the auth would fail.
+                echo '<meta http-equiv="refresh" content="0;url=' . 'options-general.php?page=settings_pocket_poster&auth-success" />';
+                exit;
+            }else {
+                // Print, the auth faild
+                echo '<div id="message" class="error">';
+                    echo '<p><strong>The authentication of your Pocket account failed. Please try again!</strong></p>';
+                echo '</div>';
+            }
+        }
+        
+        // Function to clean links of unneeded shares
         function cleanUpURL($url) {
             // Filter $_GET[p], falls vorhanden, aus link
@@ -249 +353 @@
         }
         
-        function replaceEntryBuilding($title, $description, $url, $tags, $replace = true) {
+        // Function to replace variables in the entry building
+        function replaceEntryBuilding($title, $description, $url, $tags, $author, $countwords, $replace = true) {
             $wppocket_entry_building = get_option('wppocket_entry_building');
             
@@ -258 +363 @@
                 $wppocket_entry_building = str_replace('%%url%%', $url, $wppocket_entry_building);
                 $wppocket_entry_building = str_replace('%%tags%%', $tags, $wppocket_entry_building);
+                $wppocket_entry_building = str_replace('%%author%%', $author, $wppocket_entry_building);
+                $wppocket_entry_building = str_replace('%%countwords%%', $countwords, $wppocket_entry_building);
             }
             
@@ -267 +374 @@
         }
         
+        // Function to replace variables in the title of the post
         function getReplacedTitle($countLinks, $replace = true) {
             $wppocket_title = get_option('wppocket_title');
@@ -272 +380 @@
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_title = str_replace('%%day%%', date('l'), $wppocket_title);
-                $wppocket_title = str_replace('%%month%%', date('F'), $wppocket_title);
+                $wppocket_title = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_title);
+                $wppocket_title = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_title);
                 $wppocket_title = str_replace('%%year%%', date('Y'), $wppocket_title);
                 $wppocket_title = str_replace('%%count%%', $countLinks, $wppocket_title);
@@ -281 +389 @@
         }
         
-        function getReplacedIntroductionText($replace = true) {
+        // Function to replace variables in the introduction text
+        function getReplacedIntroductionText($countLinks, $replace = true) {
             $wppocket_introduction_text = get_option('wppocket_introduction_text');
             
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_introduction_text = str_replace('%%day%%', date('l'), $wppocket_introduction_text);
-                $wppocket_introduction_text = str_replace('%%month%%', date('F'), $wppocket_introduction_text);
+                $wppocket_introduction_text = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_introduction_text);
+                $wppocket_introduction_text = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_introduction_text);
                 $wppocket_introduction_text = str_replace('%%year%%', date('Y'), $wppocket_introduction_text);          
+                $wppocket_introduction_text = str_replace('%%count%%', $countLinks, $wppocket_introduction_text);
             }
             
@@ -294 +404 @@
         }
         
-        function getReplacedStatementsText($replace = true) {
+        // Function to replace variables in the statements text
+        function getReplacedStatementsText($countLinks, $replace = true) {
             $wppocket_statements_text = get_option('wppocket_statements_text');
             
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_statements_text = str_replace('%%day%%', date('l'), $wppocket_statements_text);
-                $wppocket_statements_text = str_replace('%%month%%', date('F'), $wppocket_statements_text);
-                $wppocket_statements_text = str_replace('%%year%%', date('Y'), $wppocket_statements_text);          
+                $wppocket_statements_text = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%year%%', date('Y'), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%count%%', $countLinks, $wppocket_statements_text);
             }
             
@@ -307 +419 @@
         }
         
+        // Function to replace language-dependent strings
+        function getReplaceLanguageDependentStrings($string) {
+            // Check with language is selected
+            if (get_option('wppocket_language') == 'de') { // German
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'Januar';
+                        break;
+                    case ('February'):
+                        return 'Februar';
+                        break;
+                    case ('March'):
+                        return 'März';
+                        break;
+                    case ('April'):
+                        return 'April';
+                        break;
+                    case ('May'):
+                        return 'Mai';
+                        break;
+                    case ('June'):
+                        return 'Juni';
+                        break;
+                    case ('July'):
+                        return 'July';
+                        break;
+                    case ('August'):
+                        return 'August';
+                        break;
+                    case ('September'):
+                        return 'Steptember';
+                        break;
+                    case ('October'):
+                        return 'Oktober';
+                        break;
+                    case ('November'):
+                        return 'November';
+                        break;
+                    case ('December'):
+                        return 'Dezember';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'Montag';
+                        break;
+                    case ('Tuesday'):
+                        return 'Dienstag';
+                        break;
+                    case ('Wednesday'):
+                        return 'Mittwoch';
+                        break;
+                    case ('Thursday'):
+                        return 'Donnerstag';
+                        break;
+                    case ('Friday'):
+                        return 'Freitag';
+                        break;
+                    case ('Saturday'):
+                        return 'Samstag';
+                        break;
+                    case ('Sunday'):
+                        return 'Sonntag';
+                        break;
+                }
+            }else if (get_option('wppocket_language') == 'fr') { // French
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'janvier';
+                        break;
+                    case ('February'):
+                        return 'février';
+                        break;
+                    case ('March'):
+                        return 'mars';
+                        break;
+                    case ('April'):
+                        return 'avril';
+                        break;
+                    case ('May'):
+                        return 'mai';
+                        break;
+                    case ('June'):
+                        return 'juin';
+                        break;
+                    case ('July'):
+                        return 'juillet';
+                        break;
+                    case ('August'):
+                        return 'août';
+                        break;
+                    case ('September'):
+                        return 'septembre';
+                        break;
+                    case ('October'):
+                        return 'octobre';
+                        break;
+                    case ('November'):
+                        return 'novembre';
+                        break;
+                    case ('December'):
+                        return 'décembre';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'lundi';
+                        break;
+                    case ('Tuesday'):
+                        return 'mardi';
+                        break;
+                    case ('Wednesday'):
+                        return 'mercredi';
+                        break;
+                    case ('Thursday'):
+                        return 'jeudi';
+                        break;
+                    case ('Friday'):
+                        return 'vendredi';
+                        break;
+                    case ('Saturday'):
+                        return 'samedi';
+                        break;
+                    case ('Sunday'):
+                        return 'dimanche';
+                        break;
+                }
+            }else { // English by default
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'January';
+                        break;
+                    case ('February'):
+                        return 'February';
+                        break;
+                    case ('March'):
+                        return 'March';
+                        break;
+                    case ('April'):
+                        return 'April';
+                        break;
+                    case ('May'):
+                        return 'May';
+                        break;
+                    case ('June'):
+                        return 'June';
+                        break;
+                    case ('July'):
+                        return 'July';
+                        break;
+                    case ('August'):
+                        return 'August';
+                        break;
+                    case ('September'):
+                        return 'September';
+                        break;
+                    case ('October'):
+                        return 'October';
+                        break;
+                    case ('November'):
+                        return 'November';
+                        break;
+                    case ('December'):
+                        return 'December';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'Monday';
+                        break;
+                    case ('Tuesday'):
+                        return 'Tuesday';
+                        break;
+                    case ('Wednesday'):
+                        return 'Wednesday';
+                        break;
+                    case ('Thursday'):
+                        return 'Thursday';
+                        break;
+                    case ('Friday'):
+                        return 'Friday';
+                        break;
+                    case ('Saturday'):
+                        return 'Saturday';
+                        break;
+                    case ('Sunday'):
+                        return 'Sunday';
+                        break;
+                }
+            }
+        }
+        
+        // Function to check if the plugin have access to a Pocket account
         function checkPocketAccess() {
-            // Check if username, password and api-key is set, if not, print error
-            if (get_option('wppocket_pocket_username') == '' || get_option('wppocket_pocket_password') == '' || get_option('wppocket_pocket_api_key') == '') {
+            // Check if username, password and  consumer-key is set, if not, print error
+            if (get_option('wppocket_pocket_username') == '' || get_option('wppocket_pocket_access_key') == '' || get_option('wppocket_pocket_consumer_key') == '') {
                 ?>
                 <div id="message" class="error">
-                    <p><strong>WP Pocket can NOT work. Please save your Pocket username, password and API-Key (optional)!</strong></p>
+                    <p><strong>WP Pocket can NOT work. Please authenticate your Pocket account in the WP Pocket options!</strong></p>
                 </div>
                 <?php
@@ -318 +623 @@
             }else { // Test the settings
                 // Init cURL
-                $getAuth = $this->cURL('https://readitlaterlist.com/v2/auth?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')));
-                
-                // Check if, user data ad api key correct
+                $getAuth = $this->cURL(
+                    'https://getpocket.com/v3/send',
+                    array(
+                        'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                        'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                        'actions' => '[{}]'
+                    )
+                );
+                
+                // Check if, user data and consumer-key correct
                 if ($getAuth == '400 Bad Request') {
                     ?>
                     <div id="message" class="error">
-                        <p><strong>Your API-Key it not valid. Please correct it, else WP Pocket can NOT work.</strong></p>
+                        <p><strong>Your Consumer-Key it not valid. Please correct it, else WP Pocket can NOT work.</strong></p>
                     </div>
                     <?php
@@ -331 +643 @@
                     ?>
                     <div id="message" class="error">
-                        <p><strong>Your Pocket username and/or password it not valid. Please correct that, else WP Pocket can NOT work.</strong></p>
+                        <p><strong>The authentication of you Pocket account is expired. Please reauthenticate it, else WP Pocket can NOT work.</strong></p>
                     </div>
                     <?php
@@ -341 +653 @@
         }
         
+        // Support box on the right side of each WP Pocket page
         function support_div($display = true) {
             ?>
@@ -346 +659 @@
                 <h3>support me</h3>
                 
-                <p>If you use the plugin and like it, you can say thanks and support me.</p>
+                <p>If you use the plugin and like it, you can say thanks and support me. How?</p>
                 
                 <h3>follow me on twitter</h3>
                 
                 <p>
-                    <a href="https://twitter.com/jankarres" class="twitter-follow-button" data-show-count="false" data-lang="en" data-size="large">Follow @jankarres</a>
+                    <a href="https://twitter.com/jankarres" class="twitter-follow-button" data-show-count="false" data-size="large" data-dnt="true">Follow @jankarres</a>
                     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="https://plugins.trac.wordpress.org//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
                 </p>
                 
-                <h3>donate on flattr</h3>
-                
-                <a href="http://flattr.com/thing/881252/WP-Pocket" target="_blank">
-                    <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" />
-                </a>
+                <h3>report bugs</h3>
+                
+                <p>
+                    You found a bug? You have an idea for a feature? Then let me know and send a request on <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a>!
+                </p>
             </div>
             <?php
         }
         
+        // Function to set options page
         function options_link() {
             // Start the view of the options page
@@ -372 +686 @@
         }
         
+        // Options page view
         function options_page_view() {
             // Add option page style
@@ -388 +703 @@
                 <?php $this->support_div(); ?>
                 
-                <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
                     <h3>Pocket Login</h3>
                     <table class="form-table">
                         <tr>
-                            <th>Pocket Username</th>
+                            <th>Pocket Auth</th>
                             <td>
-                                <input type="text" size="57" name="wppocket_pocket_username" value="<?php if (get_option('wppocket_pocket_username') != '') { echo $this->xcrypt(1, get_option('wppocket_pocket_username')); } ?>" />
+                                <?php if (get_option('wppocket_pocket_username') != '') { echo $this->xcrypt(1, get_option('wppocket_pocket_username')) . ' authenticated.'; } ?> 
+                                <?php if (get_option('wppocket_pocket_username') == '') { echo '<a href="?page=settings_pocket_poster&auth-get"><input type="button" class="button-primary" value="Authenticate account" /></a>'; }else  { echo '<a href="?page=settings_pocket_poster&auth-get"><input type="button" class="button-primary" value="Authenticate other account" /></a>'; } ?>
+                            </td>
+                        </tr>
+                        
+                        <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
+                        
+                        <tr>
+                            <th>Pocket Consumer-Key</th>
+                            <td>
+                                <input type="text" size="57" name="wppocket_pocket_consumer_key" value="<?php if(get_option('wppocket_pocket_consumer_key_custom') == 1) { echo $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')); } ?>" />
+                                
+                                <?php if(get_option('wppocket_pocket_consumer_key_custom') == 1) { ?>
+                                    <label><input name="wppocket_pocket_consumer_key_custom_remove" type="checkbox" value="1" /> Use the default Consumer-Key</label>
+                                <?php } ?>
+                                
+                                <p class="description">If you wish to use a private Consumer-Key, please enter one. <strong>It is not necessary!</strong><br />
+                                You can get one on <a href="http://getpocket.com/developer/apps/new" target="_blank">http://getpocket.com/developer/apps/new</a>.</p>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <h3>WP Pocket Settings</h3>
+                    <table class="form-table">
+                        <tr>
+                            <th>Language</th>
+                            <td>
+                                <select name="wppocket_language">
+                                    <option value="en" <?php selected('en', get_option('wppocket_language')); ?>>English</option>
+                                    <option value="de" <?php selected('de', get_option('wppocket_language')); ?>>German</option>
+                                    <option value="fr" <?php selected('fr', get_option('wppocket_language')); ?>>French</option>
+                                </select>
+                                <p class="description">A few variables you can set are language-dependent. Which language should WP Pocket use? <strong>This setting does not change the language of complete WP Pocket (currently only English supported)!</strong></p>
                             </td>
                         </tr>
                         <tr>
-                            <th>Pocket Password</th>
+                            <th>Statistics</th>
                             <td>
-                                <input type="password" size="57" name="wppocket_pocket_password" value="" />
-                                <p class="description">If you do not wish to edit something, leave it blank.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>Pocket API-Key</th>
-                            <td>
-                                <input type="text" size="57" name="wppocket_pocket_api_key" value="<?php if(get_option('wppocket_pocket_api_key_custom') == 1) { echo $this->xcrypt(1, get_option('wppocket_pocket_api_key')); } ?>" />
-                                
-                                <?php if(get_option('wppocket_pocket_api_key_custom') == 1) { ?>
-                                    <label><input name="wppocket_pocket_api_key_custom_remove" type="checkbox" value="1" /> Use the default API-Key</label>
-                                <?php } ?>
-                                
-                                <p class="description">If you wish to use a private API-Key, please enter one. <strong>It is not necessary!</strong><br />
-                                You can get one on <a href="http://getpocket.com/api/signup/" target="_blank">http://getpocket.com/api/signup/</a>.</p>
+                                <select name="wppocket_statistics">
+                                    <option value="1" <?php selected('1', get_option('wppocket_statistics')); ?>>Yes</option>
+                                    <option value="0" <?php selected('0', get_option('wppocket_statistics')); ?>>No</option>
+                                </select>
+                                <p class="description">Do you allow WP Pocket to collect anonymous statistics about published links and updates and send them to WP-Pocket.com? These statistics will only be used to improve WP Pocket.</p>
                             </td>
                         </tr>
@@ -426 +762 @@
                                 <select name="wppocket_links_to_use">
                                     <option value="0" <?php selected('0', get_option('wppocket_links_to_use')); ?>>Only unread links, which are unposted</option>
-                                    <option value="1" <?php selected('1', get_option('wppocket_links_to_use')); ?>>Only read links, which are unposted</option>
-                                    <option value="2" <?php selected('2', get_option('wppocket_links_to_use')); ?>>All links, which are unposted</option>
+                                    <option value="1" <?php selected('1', get_option('wppocket_links_to_use')); ?>>Only read/archived links, which are unposted</option>
+                                    <option value="2" <?php selected('2', get_option('wppocket_links_to_use')); ?> disabled><s>All links, which are unposted</s> (Currently impossible due to a bug in Pocket API)</option>
                                     <option value="3" <?php selected('3', get_option('wppocket_links_to_use')); ?>>All unread links, also already posted ones</option>
-                                    <option value="4" <?php selected('4', get_option('wppocket_links_to_use')); ?>>All read links, also already posted ones</option>
-                                    <option value="5" <?php selected('5', get_option('wppocket_links_to_use')); ?>>All links, also already posted ones</option>
+                                    <option value="4" <?php selected('4', get_option('wppocket_links_to_use')); ?>>All read/archived links, also already posted ones</option>
+                                    <option value="5" <?php selected('5', get_option('wppocket_links_to_use')); ?> disabled><s>All links, also already posted ones</s> (Currently impossible due to a bug in Pocket API)</option>
                                 </select>
                                 <p class="description">Which links should be used for the new post?</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Favorites</th>
+                            <td>
+                                <select name="wppocket_faved">
+                                    <option value="0" <?php selected('0', get_option('wppocket_faved')); ?>>All links</option>
+                                    <option value="1" <?php selected('1', get_option('wppocket_faved')); ?>>Only faved links</option>
+                                    <option value="2" <?php selected('2', get_option('wppocket_faved')); ?>>Only unfaved links</option>
+                                </select>
+                                <p class="description">Should only faved or unfaved links be used in a new post?</p>
                             </td>
                         </tr>
@@ -446 +793 @@
                         </tr>
                         <tr>
-                            <th>Mark as readed</th>
+                            <th>Mark as readed/archived</th>
                             <td>
                                 <select name="wppocket_mark_as_readed">
@@ -565 +912 @@
                                     write the text and the variable in double square brackets. For example: %%title%%[[ - Tags: %%tags%%]]<br />
                                     <strong>Use <i>%%title%%</i> for title of the link in pocket; <i>%%description%%</i> for the meta description of the link; 
-                                    <i>%%url%%</i> for the link itself; <i>%%tags%%</i> for added tags in pocket.</strong>
+                                    <i>%%url%%</i> for the link itself; <i>%%tags%%</i> for added tags in pocket/metatags; <i>%%author%%</i> for the name 
+                                    of the author who wrote the article; <i>%%countwords%%</i> for the number of words, which the article has</strong>
                                 </p>
                             </td>
@@ -581 +929 @@
                                 <p class="description">
                                     At the beginning of the post, before the links, this text will be shown.<br />
-                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year.</strong>
+                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year; %%count%% to get the number of posted links.</strong>
                                 </p>
                             </td>
@@ -597 +945 @@
                                 <p class="description">
                                     At the end of the post, after the links, this text will be shown.<br />
-                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year.</strong>
+                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year; %%count%% to get the number of posted links.</strong>
                                 </p>
                             </td>
@@ -613 +961 @@
         }
         
+        // Options page controller
         function options_page_controller() {
+            // Check if should start Pocket auth process
+            if (isset($_GET['auth-get'])) {
+                // Start Pocket auth process
+                $this->authPocketAccountGetRequest();
+            }
+            
+            // Check if should save Pocket access token
+            if (isset($_GET['auth'])) {
+                // Save Pocket access token
+                $this->authPocketAccountSaveAccessToken();
+            }
+            
+            // Check if Pocket account auth saved successfull
+            if (isset($_GET['auth-success'])) {
+                // Print, the auth succeed
+                echo '<div id="message" class="updated">';
+                    echo '<p><strong>You have successfully authenticated your Pocket Account!</strong></p>';
+                echo '</div>';
+            }
+            
             // Check if setting sended
             if ($_POST['wppocket_edit']) {
@@ -621 +990 @@
                 // Error Text Array
                 $errorLang = array(
-                    '0' => 'Please enter your Pocket username.',
-                    '1' => 'Please enter your Pocket password.',
-                    '2' => 'Please enter your Pocket API-Key or reset it to use the default key.',
-                    '3' => 'Please enter a title for the posts.',
-                    '4' => 'Please enter a building for each link which will be posted.'
+                    '1' => 'Please enter your Pocket Consumer-Key or reset it to use the default key (recommend).',
+                    '2' => 'Please enter a title for the posts.',
+                    '3' => 'Please enter a building for each link which will be posted.'
                 );
             
                 // Update "Pocket Login"
                 
-                // Check if Pocket username is isset
-                if ($_POST['wppocket_pocket_username'] == '') {
-                    $error[] = 0;
-                }else {
-                    update_option('wppocket_pocket_username', $this->xcrypt(0, $_POST['wppocket_pocket_username']));
-                }
-                
-                // Check if Pocket one password is isset
-                if (get_option('wppocket_pocket_password') == '' && $_POST['wppocket_pocket_password'] == '') {
+                if ($_POST['wppocket_pocket_consumer_key_custom_remove'] == 1) {
+                    // Set default key
+                    update_option('wppocket_pocket_consumer_key_custom', 0);
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $this->global_pocket_consumer_key));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
+                }elseif(get_option('wppocket_pocket_consumer_key_custom') == 1 && $_POST['wppocket_pocket_consumer_key'] == '') {
                     $error[] = 1;
-                }elseif ($_POST['wppocket_pocket_password'] != '') {
-                    update_option('wppocket_pocket_password', $this->xcrypt(0, $_POST['wppocket_pocket_password']));
-                }
-                
-                if ($_POST['wppocket_pocket_api_key_custom_remove'] == 1) {
-                    // Set default key
-                    update_option('wppocket_pocket_api_key_custom', 0);
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->global_pocket_api_key));
-                }elseif(get_option('wppocket_pocket_api_key_custom') == 1 && $_POST['wppocket_pocket_api_key'] == '') {
-                    $error[] = 2;
-                }elseif(get_option('wppocket_pocket_api_key_custom') == 1 && $_POST['wppocket_pocket_api_key'] != '') {
+                }elseif(get_option('wppocket_pocket_consumer_key_custom') == 1 && $_POST['wppocket_pocket_consumer_key'] != '') {
                     // Set new key
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $_POST['wppocket_pocket_api_key']));
-                }elseif (get_option('wppocket_pocket_api_key_custom') == 0 && $_POST['wppocket_pocket_api_key'] != '') {
-                    // Set custom API-Key first time
-                    update_option('wppocket_pocket_api_key_custom', 1);
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $_POST['wppocket_pocket_api_key']));
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $_POST['wppocket_pocket_consumer_key']));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
+                }elseif (get_option('wppocket_pocket_consumer_key_custom') == 0 && $_POST['wppocket_pocket_consumer_key'] != '') {
+                    // Set custom Consumer-Key first time
+                    update_option('wppocket_pocket_consumer_key_custom', 1);
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $_POST['wppocket_pocket_consumer_key']));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
                 }
                 
@@ -665 +1033 @@
                 
                 update_option('wppocket_links_to_use', $_POST['wppocket_links_to_use']);
+                update_option('wppocket_faved', $_POST['wppocket_faved']);
                 update_option('wppocket_order', $_POST['wppocket_order']);
                 update_option('wppocket_mark_as_readed', $_POST['wppocket_mark_as_readed']);
@@ -715 +1084 @@
                 // Check if title is not set
                 if ($_POST['wppocket_title'] == '') {
-                    $error[] = 3;
+                    $error[] = 2;
                 }else {
                     update_option('wppocket_title', $_POST['wppocket_title']);
@@ -722 +1091 @@
                 // Chech if entry building is not set
                 if ($_POST['wppocket_entry_building'] == '') {
-                    $error[] = 4;
+                    $error[] = 3;
                 }else {
                     update_option('wppocket_entry_building', $_POST['wppocket_entry_building']);
@@ -730 +1099 @@
                 update_option('wppocket_introduction_text', $_POST['wppocket_introduction_text']);
                 update_option('wppocket_statements_text', $_POST['wppocket_statements_text']);
+                
+                // WP Pocket settings
+                update_option('wppocket_language', $_POST['wppocket_language']);
+                update_option('wppocket_statistics', $_POST['wppocket_statistics']);
                 
                 // Output all errors
@@ -750 +1123 @@
                     <?php
                 }
+                
+                // Check if Consumer-Key was changed. If yes, azth was reseted.
+                if ($changeConsumerKey) {
+                    ?>
+                    <div id="message" class="updated">
+                        <p><strong>You changed the Consumer-Key. Because of, the authentication of your WP Pocket account was removed. Please reauthenticate!</strong></p>
+                    </div>
+                    <?php
+                }
             }
             
@@ -756 +1138 @@
         }
         
+        // Function to set the main page
         function main_link() {      
             // Start the view of the main page
@@ -761 +1144 @@
         }
         
+        // Main page view
         function main_page_view() {
             // Add option page style
@@ -781 +1165 @@
                     <div class="nav-tabs-arrow nav-tabs-arrow-left" style="display: none; "><a>«</a></div>
                     <div class="nav-tabs-wrapper">
-                        <div class="nav-tabs" style="padding: 0px; margin-right: -110px; margin-left: 0px; ">
+                        <div class="nav-tabs">
                             <span class="nav-tab nav-tab-active"></span><a href="#" class="nav-tab menu-add-new"></a>   
                         </div>
@@ -804 +1188 @@
                     if ($checkPocketAccess) {               
                         // Get links from the user
-                        
-                        // Should get Readed, onreaded or all links?
+                        $getLinksPost = array();
+                        
+                        $getLinksPost['consumer_key'] = $this->xcrypt(1, get_option('wppocket_pocket_consumer_key'));
+                        $getLinksPost['access_token'] = $this->xcrypt(1, get_option('wppocket_pocket_access_key'));
+                        $getLinksPost['detailType'] = 'complete';
+                        
+                        // Should get Readed, unreaded or all links?
                         if (get_option('wppocket_links_to_use') == 0 || get_option('wppocket_links_to_use') == 3) { // Unreaded
-                            $state = '&state=unread';
-                        }elseif (get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 4) { // Readed
-                            $state = '&state=read';
+                            $getLinksPost['state'] = 'unread';
+                        }elseif (get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 4) { // Readed / Archived
+                            $getLinksPost['state'] = 'archive';
                         } // All
                         
-                        $getLinks = $this->cURL('https://readitlaterlist.com/v2/get?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')) . $state . '&tags=1', 30);
+                        // Check if only faved or unfaved links should use
+                        if (get_option('wppocket_faved') == 1) { // only faved
+                            $getLinksPost['favorite'] = '1';
+                        }else if (get_option('wppocket_faved') == 2) { // only unfaved
+                            $getLinksPost['favorite'] = '0';
+                        } // All
+                        
+                        // Check if order should be oldest to newest or newest to oldest
+                        if (get_option('wppocket_order')) { // oldest to newest
+                            $getLinksPost['sort'] = 'oldest';
+                        }else { // newest to oldest
+                            $getLinksPost['sort'] = 'newest';
+                        }
+                        
+                        $getLinks = $this->cURL(
+                            'https://getpocket.com/v3/get',
+                            $getLinksPost
+                        );
                         
                         // Decode JSON to Object
@@ -822 +1228 @@
                             foreach ($getLinks->list as $key => $value) {
                                 // Check if aleady posted. If true, remove it
-                                $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $value->url . '"';
+                                $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $value->given_url . '"';
                                 $row = $this->wpdb->get_results($sql);
                                 
@@ -829 +1235 @@
                                 }
                             }
-                        }
-                        
-                        // Check if order should be oldest to newest
-                        if (get_option('wppocket_order')) {
-                            // Turn around the json object
-                            $tmp = json_encode($getLinks, true);
-                            $tmp = json_decode($tmp, true);
-                            $tmp['list'] = array_reverse($tmp['list']);
-                            $tmp = json_encode($tmp, true);
-                            $tmp = json_decode($tmp);
-                            $getLinks = $tmp;
                         }
                         
@@ -864 +1259 @@
                                     <?php
                                     // Gennerate output of each link
-                                    foreach ($getLinks->list as $key => $value) {                               
-                                        // Get description
-                                        $urlHtml = $this->cURL($value->url);
-                                        
-                                        $doc = new DOMDocument();
-                                        @$doc->loadHTML($urlHtml);
-                                        
-                                        if ($value->title == '') {
-                                            $nodes = $doc->getElementsByTagName('title');
-                                            $value->title = utf8_decode($nodes->item(0)->nodeValue);
+                                    foreach ($getLinks->list as $key => $value) {
+                                        // Rewirte Tags Array as Tags string
+                                        if (count($value->tags) != 0) {
+                                            $tagsAsString = '';
+                                            $i2 = 0;
+                                            foreach ($value->tags as $tag) {
+                                                if ($i2 != 0) {
+                                                    $tagsAsString .= ', ';
+                                                }
+                                                
+                                                $tagsAsString .= $tag->tag;
+                                                
+                                                $i2++;
+                                            }
                                             
-                                            if (!$this->is_utf8($value->title)) {
-                                                $value->title = utf8_encode($value->title);
-                                            }
+                                            $value->tags = $tagsAsString;
+                                            unset($tagsAsString);
+                                        }else { // Not tags yet
+                                            $value->tags = '';
                                         }
                                         
-                                        $metas = $doc->getElementsByTagName('meta');
-                                        
-                                        for ($i = 0; $i < $metas->length; $i++) {
-                                            $meta = $metas->item($i);
+                                        // Get data from the meta tags, if necessary
+                                        if ($value->resolved_title == '' || $value->excerpt == '' || (get_option('wppocket_meta_keyword_as_tags') == 1 && $value->tags == '')) {
+                                            $urlHtml = $this->cURL($value->given_url, array());
                                             
-                                            if($meta->getAttribute('name') == 'description') {
-                                                $value->description = utf8_decode($meta->getAttribute('content'));
-                                                if (!$this->is_utf8($value->description)) {
-                                                    $value->description = utf8_encode($value->description);
+                                            $doc = new DOMDocument();
+                                            @$doc->loadHTML($urlHtml);
+                                            
+                                            if ($value->resolved_title == '') {
+                                                $nodes = $doc->getElementsByTagName('title');
+                                                $value->title = utf8_decode($nodes->item(0)->nodeValue);
+                                                
+                                                if (!$this->is_utf8($value->title)) {
+                                                    $value->title = utf8_encode($value->title);
                                                 }
                                             }
                                             
-                                            if (get_option('wppocket_meta_keyword_as_tags') == 1) {
-                                                if ($meta->getAttribute('name') == 'keywords') {
-                                                    $value->tags = utf8_decode($meta->getAttribute('content'));
-                                                    if (!$this->is_utf8($value->tags)) {
-                                                        $value->tags = utf8_encode($value->tags);
+                                            $metas = $doc->getElementsByTagName('meta');
+                                            
+                                            for ($i = 0; $i < $metas->length; $i++) {
+                                                $meta = $metas->item($i);
+                                                
+                                                if ($value->excerpt == '') {
+                                                    if($meta->getAttribute('name') == 'description') {
+                                                        $value->excerpt = utf8_decode($meta->getAttribute('content'));
+                                                        if (!$this->is_utf8($value->excerpt)) {
+                                                            $value->excerpt = utf8_encode($value->excerpt);
+                                                        }
+                                                    }
+                                                }
+                                                
+                                                if (get_option('wppocket_meta_keyword_as_tags') == 1 && $value->tags == '') {
+                                                    if ($meta->getAttribute('name') == 'keywords') {
+                                                        $value->tags = utf8_decode($meta->getAttribute('content'));
+                                                        if (!$this->is_utf8($value->tags)) {
+                                                            $value->tags = utf8_encode($value->tags);
+                                                        }
                                                     }
                                                 }
@@ -906 +1325 @@
                                                 <dt class="menu-item-handle">
                                                     <div class="left">
-                                                        <?php echo $value->title; ?>
+                                                        <?php echo $value->resolved_title; ?>
                                                     </div>
                                                     <div class="right">
@@ -916 +1335 @@
 
                                             <div class="menu-item-settings" id="item-<?php echo $key; ?>">
-                                                <p class="description description-thin">
+                                                <p class="description description-thin description-two-thirds">
                                                     <label for="item-<?php echo $key; ?>-input-title">
                                                         Title<br />
-                                                        <input type="text" id="item-<?php echo $key; ?>-input-title" class="widefat input-title" name="element[][title]" value="<?php echo $value->title; ?>" />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-title" class="widefat input-title" name="element[][title]" value="<?php echo $value->resolved_title; ?>" />
                                                     </label>
                                                 </p>
-                                                <p class="description description-thin">
+                                                <p class="description description-thin description-one-thirds">
+                                                    <label for="item-<?php echo $key; ?>-input-author">
+                                                        Author<br />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-author" class="widefat input-title" name="element[][author]" value="<?php
+                                                            if (count($value->authors) != 0) {
+                                                                $i2 = 0;
+                                                                foreach($value->authors as $author) {
+                                                                    if ($i2 != 0) {
+                                                                        echo ', ';
+                                                                    }
+                                                                    
+                                                                    echo $author->name;
+                                                                    
+                                                                    $i2++;
+                                                                }
+                                                            }
+                                                        ?>" />
+                                                    </label>
+                                                </p>
+                                                <p class="description description-thin description-two-thirds">
+                                                    <label for="item-<?php echo $key; ?>-input-url">
+                                                        URL<br />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url]" value="<?php if (get_option('wppocket_clean_url') == 1) { echo $this->cleanUpURL($value->resolved_url); }else { echo $value->given_url; } ?>" />
+                                                        <input type="hidden" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url_uncleaned]" value="<?php echo $value->given_url; ?>" />
+                                                    </label>
+                                                </p>
+                                                <p class="description description-thin description-one-thirds">
                                                     <label for="item-<?php echo $key; ?>-input-tags">
-                                                        Tags (optional)<br />
+                                                        Tags<br />
                                                         <input type="text" id="item-<?php echo $key; ?>-input-tags" class="widefat" name="element[][tags]" value="<?php echo $value->tags; ?>" />
                                                     </label>
@@ -931 +1376 @@
                                                     <label for="item-<?php echo $key; ?>-input-description">
                                                         Description (optional)<br />
-                                                        <textarea name="element[][description]" rows="4" id="item-<?php echo $key; ?>-input-description" class="widefat" type="textarea"><?php echo $value->description; ?></textarea>
-                                                    </label>
-                                                </p>
-                                                <p class="description">
-                                                    <label for="item-<?php echo $key; ?>-input-url">
-                                                        URL<br />
-                                                        <input type="text" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url]" value="<?php if (get_option('wppocket_clean_url') == 1) { echo $this->cleanUpURL($value->url); }else { echo $value->url; } ?>" />
-                                                        <input type="hidden" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url_uncleaned]" value="<?php echo $value->url; ?>" />
+                                                        <textarea name="element[][description]" rows="4" id="item-<?php echo $key; ?>-input-description" class="widefat" type="textarea"><?php echo $value->excerpt; ?></textarea>
                                                     </label>
                                                 </p>
                                                 
-                                                <input type="hidden" name="element[][id]" value="<?php echo $key; ?>" />
+                                                
+                                                <input type="hidden" name="element[][id]" value="<?php echo $value->item_id; ?>" />
+                                                <input type="hidden" name="element[][countwords]" value="<?php echo $value->word_count; ?>" />
                                                 <input type="hidden" name="element[][associate]" class="associate" value="0" />
                                             </div>
@@ -959 +1399 @@
                     }
                 }elseif ($_POST['mode'] == 'save') { // Save post
-                    // Check if elements was posted
+                    // Check if elements was lposted
                     if ($_POST['count_elements'] == 0) { // No elements
                         ?>
@@ -999 +1439 @@
         }
         
+        // Options page controller
         function main_page_controller() {
             global $current_user;
@@ -1009 +1450 @@
                 
                 // Set en empty example for entry building with replace
-                $replaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false);
+                $replaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false, false);
                 
                 // Set en empty example for entry building without replace
-                $noReplaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false);
+                $noReplaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false, false, false);
                 
                 // Check, which Array elements are dynamic. Set empy replace and flag in new array
@@ -1037 +1478 @@
                 unset($noReplaceEntryBuilding);
                 
+                #####################################
+                ## COMBINE URL, URL CLEANED AND ID ##
+                #####################################
+                
+                $i = 0;
+                while ($i < (count($_POST['element']) / 9)) {
+                    $url = $_POST['element'][(($i * 9) + 2)]['url'];
+                    $urlUncleaned = $_POST['element'][(($i * 9) + 3)]['url_uncleaned'];
+                    $id = $_POST['element'][(($i * 9) + 6)]['id'];
+                    
+                    $_POST['element'][(($i * 9) + 2)] = array(
+                        array(
+                            $url,
+                            $urlUncleaned,
+                            $id
+                        )
+                    );
+                    
+                    
+                    $i++;
+                }
+                
                 #########################
                 ## SET ASSOCIATE LINKS ##
                 #########################
                 $i = 0;
-                while ($i < (count($_POST['element']) / 7)) {
+                while ($i < (count($_POST['element']) / 9)) {
                     // Check if this it not a associate link
-                    if (!$_POST['element'][($i * 7) + 5]['associate']) {
+                    if (!$_POST['element'][($i * 9) + 6]['associate']) {
                         // Search for associate links in the following
                         $associateLinks = array();
@@ -1049 +1512 @@
                         while(true) {
                             // If this is an associate links, add this to the array, else break the while-loop
-                            if ($_POST['element'][($i * 7) + 6 + ($i2 * 7)]['associate']) {
-                                $_POST['element'][($i * 7) + 3][] = $_POST['element'][(($i * 7) + 3 + ($i2 * 7))]['url'];
-                                $_POST['element'][($i * 7) + 4][] = $_POST['element'][(($i * 7) + 4 + ($i2 * 7))]['url_uncleaned'];
+                            if ($_POST['element'][($i * 9) + 8 + ($i2 * 9)]['associate']) {
+                                $_POST['element'][($i * 9) + 2][] = $_POST['element'][(($i * 9) + 2 + ($i2 * 9))][0];
                             }else {
                                 break;
@@ -1068 +1530 @@
                 
                 // Set posted elements in $_POST for view
-                $_POST['count_elements'] = round((count($_POST['element']) / 7));
+                $_POST['count_elements'] = round((count($_POST['element']) / 9));
                 
                 // Array for all posted links
@@ -1075 +1537 @@
                 $post_content = '';
                 
-                // Set introduction text if not empty
-                if (trim(get_option('wppocket_introduction_text')) != '') {
-                    $post_content .= $this->getReplacedIntroductionText();
-                }
-                
-                // Gennerate all links intro text
+                // Gennerate all links in text
                 $i = 0;
-                while ($i < (count($_POST['element']) / 7)) {
+                while ($i < (count($_POST['element']) / 9)) {
                     // Check if only not posted links should post
                     if (get_option('wppocket_links_to_use') == 0 || get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 2) {
                         // Check if aleady posted. If true, confine to the next loop
-                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $_POST['element'][($i * 7) + 3]['url'] . '"';
+                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $_POST['element'][($i * 9) + 2]['url'] . '"';
                         $row = $this->wpdb->get_results($sql);
                         
                         if ($row[0]->id != '') {
-                            $_POST['count_elements'] -= count($_POST['element'][($i * 7) + 3]); // - this and associated elements
+                            $_POST['count_elements'] -= count($_POST['element'][($i * 9) + 2]); // - this and associated elements
                             $i++;
                             continue;
@@ -1097 +1554 @@
                     
                     // Check if this it not a associate link
-                    if (!$_POST['element'][($i * 7) + 6]['associate']) {                    
+                    if (!$_POST['element'][($i * 9) + 8]['associate']) {
                         // Gennerate url array in url string
                         $url = '';
                         
                         $i2 = 0;
-                        foreach ($_POST['element'][($i * 7) + 3] as $value) {
+                        foreach ($_POST['element'][($i * 9) + 2] as $value) {
                             if ($i2 != 0) {
                                 $url .= '; ';
                             }
                             
-                            $url .= '<a href="' . $value . '" target="_blank">' . $value . '</a>';
+                            $url .= '<a href="' . $value[0] . '" target="_blank">' . $value[0] . '</a>';
+                            
+                            // Fill array for all posted links
+                            $allPostedLinks[] = $value;
                             
                             $i2++;
                         }
                         
-                        // Fill array for all posted links
-                        foreach ($_POST['element'][($i * 7) + 4] as $value) {
-                            $allPostedLinks[] = $value;
-                        }
-                        
                         // Set element in entry building
-                        $element = $this->replaceEntryBuilding($_POST['element'][($i * 7)]['title'], $_POST['element'][($i * 7) + 2]['description'], $url, $_POST['element'][($i * 7) + 1]['tags']);
+                        $element = $this->replaceEntryBuilding(
+                            $_POST['element'][($i * 9)]['title'],
+                            $_POST['element'][($i * 9) + 5]['description'],
+                            $url,
+                            $_POST['element'][($i * 9) + 4]['tags'],
+                            $_POST['element'][($i * 9) + 1]['author'],
+                            $_POST['element'][($i * 9) + 7]['countwords']
+                        );
                         
                         // Check if a dynamic element is not in use an delete it
@@ -1143 +1605 @@
                 }
                 
+                $post_content_final = '';
+                
+                // Set introduction text if not empty
+                if (trim(get_option('wppocket_introduction_text')) != '') {
+                    $post_content_final .= $this->getReplacedIntroductionText($_POST['count_elements']);
+                }
+                
+                // Set links content
+                $post_content_final .= $post_content;
+                
                 // Set statements text if not empty
                 if (trim(get_option('wppocket_statements_text')) != '') {
-                    $post_content .= $this->getReplacedStatementsText();
+                    $post_content_final .= $this->getReplacedStatementsText($_POST['count_elements']);
                 }
                 
                 // Chech if reference to WP Pocket shot print
                 if (get_option('wppocket_reference_wppocket')) {
-                    $post_content .= '<p><i>This post was automatically created by WP Pocket. If you look for this WordPress plugin, check out <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a> now!</i></p>';
+                    $post_content_final .= '<p><i>This post was automatically created by WP Pocket. If you look for this WordPress plugin, check out <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a> now!</i></p>';
                 }
                 
@@ -1165 +1637 @@
                         'post_author' => $current_user->ID,
                         'post_category' => array(get_option('wppocket_post_category')),
-                        'post_content' => $post_content,
+                        'post_content' => $post_content_final,
                         'post_date' => date('Y-m-d H:i:s'),
                         'post_date_gmt' => gmdate('Y-m-d H:i:s'),
@@ -1188 +1660 @@
                     $i = 0;
                     while ($i < count($allPostedLinks)) {
-                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $allPostedLinks[$i] . '"';
+                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $allPostedLinks[$i][1] . '"';
                         $row = $this->wpdb->get_results($sql);
                         
@@ -1206 +1678 @@
                                 $this->wpdb->prepare(
                                     $sql,
-                                    $allPostedLinks[$i],
+                                    $allPostedLinks[$i][1],
                                     $time
                                 )
@@ -1222 +1694 @@
                 // Check if link should marke as readed
                 if (get_option('wppocket_mark_as_readed')) {
-                    // JSON Start
-                    $markAsReaded = '{';
-                    
-                    // Fill JSON
+                    $markAsReaded = array();
+                    
+                    // Fill JSON as Array
                     $i = 0;
                     while ($i < count($allPostedLinks)) {
-                        if ($i != 0) {
-                            $markAsReaded .= ',';
+                        $markAsReaded[] = array(
+                            'action' => 'archive',
+                            'item_id' => $allPostedLinks[$i][2]
+                        );
+                        
+                        $i++;
+                        
+                        // Chech if limit of links reached. If yes, send request and start new sends array
+                        if (($i / 100) == round($i / 100)) {
+                            // Send request
+                            $this->cURL(
+                                'https://getpocket.com/v3/send',
+                                array(
+                                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                                    'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                                    'actions' => json_encode($markAsReaded)
+                                )
+                            );
+                            
+                            // Clean up array
+                            $markAsReaded = array();
                         }
-                        
-                        $markAsReaded .= '"' . $i . '":{"url":"' . $allPostedLinks[$i] . '"}';
+                    }
+                    
+                    // Send request
+                    $this->cURL(
+                        'https://getpocket.com/v3/send',
+                        array(
+                            'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                            'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                            'actions' => json_encode($markAsReaded)
+                        )
+                    );
+                }
+                
+                // Send statistics, if allowed
+                if (get_option('wppocket_statistics') == 1) {
+                    $allLinksForStatisics = array();
+                    $i = 0;
+                    while ($i < count($allPostedLinks)) {
+                        $allLinksForStatisics[] = $allPostedLinks[$i][0];
                         
                         $i++;
                     }
                     
-                    // JSON End
-                    $markAsReaded .= '}';
-                    
-                    // Send request
-                    $responses = $this->cURL('https://readitlaterlist.com/v2/send?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')) . '&read=' . urlencode($markAsReaded), 10);
-                }
-            }
+                    $this->statisticsPublishPost($allLinksForStatisics);
+                }
+            }
+        }
+        
+        // Statisics send to WP-Pocket.com: Update version
+        private function statisticsUpdateVersion() {
+            // Get Data
+            $url = explode('?', ((empty($_SERVER['HTTPS'])) ? 'http' : 'https') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+            $url = $url[0];
+            $type = 'update';
+            $versions = array('from' => get_option('wppocket_version'), 'to' => $this->version);
+            
+            // Gennerate JSON Array
+            $data = array(
+                'url' => $url,
+                'type' => $type,
+                'update' => $versions
+            );
+            
+            @$this->cURL(
+                'http://pluginstats.wp-pocket.com/index.php',
+                array(
+                    'data' => json_encode($data)
+                )
+            );
+        }
+        
+        // Statisics send to WP-Pocket.com: Publish post
+        private function statisticsPublishPost($links) {
+            echo 'HERO!';
+            
+            // Get Data
+            $url = explode('?', ((empty($_SERVER['HTTPS'])) ? 'http' : 'https') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+            $url = $url[0];
+            $type = 'publish';
+            
+            // Gennerate JSON Array
+            $data = array(
+                'url' => $url,
+                'type' => $type,
+                'links' => $links
+            );
+            
+            echo $this->cURL(
+                'http://pluginstats.wp-pocket.com/index.php',
+                array(
+                    'data' => json_encode($data)
+                )
+            );
         }
     }

wp-pocket/trunk/css/main.css

@@ -10 +10 @@
 .wppocket p.description {
     margin: 2px 10px 5px 0;
+}
+
+.wppocket p.description textarea {
+    resize: vertical;
 }
 
@@ -62 +66 @@
 }
 
+.wppocket .description-thin.description-two-thirds {
+    width: 400px;
+}
+
+.wppocket .description-thin.description-one-thirds {
+    width: 180px;
+}
+
 .wppocket .menu-item-settings {
     width: 600px;

wp-pocket/trunk/readme.txt

@@ -4 +4 @@
 Tags: wp pocket, wordpress, pocket, post, automaticly, wp, links, linklist
 Requires at least: 3.4
-Tested up to: 3.4
-Stable tag: 1.1.1
+Tested up to: 3.5
+Stable tag: 1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -52 +52 @@
 == Changelog ==
 
+= 1.2 =
+Rewrite to Pocket API v3 with oAuth
+Check required PHP version
+Added names of months in English, German or French language
+Improved quality of link title and description
+Implemented function to publish only links, that are marked as favorites in pocket
+Implemented function to show the author of the article in the linklist
+More variables possible in entry building, introduction text and statement text
+Sends, if user allowed it, anonymous statistics to WP-Pocket.com
+Solved coding problems of titles and descriptions
+Solved the problem of marking more than 100 links as read
+Improved performance
+Improved commenting of the code
+Other minor bugfixes
+Removed Flattr button
+
 = 1.1.1 =
 Fix link to options in installed plugins overview
@@ -80 +96 @@
 == ToDo ==
 
-Nothing. If you have requests, please tell me via the contact form on http://wp-pocket.com
+Solve all links option in <i>Links to use</i> (possible, if Pocket save the bug in the API)
+
+If you have requests, please tell me via the contact form on http://wp-pocket.com

wp-pocket/trunk/wp-pocket.php

@@ -6 +6 @@
     Author: Jan Karres
     Author URI: http://www.jankarres.de/
-    Version: 1.1.1
+    Version: 1.2
 */
-
 if(!class_exists('wppocketer')) {
     class wppocketer {
@@ -14 +13 @@
         private $version;
         
-        // Pocket default API-Key by developer
-        private $global_pocket_api_key;
+        // Pocket default Consumer-Key by developer
+        private $global_pocket_consumer_key;
     
         function __construct() {
@@ -24 +23 @@
             
             // Set plugin version
-            $this->version = '1.1.1';
+            $this->version = '1.2';
         
             // Check WP version
-            add_action('init', array(&$this, 'requires_wordpress_version'));
+            add_action('init', array(&$this, 'requires_versions'));
         
             // Change plugin status hooks
@@ -42 +41 @@
             wp_register_script('wppocket_main', plugins_url('js/main.js', __FILE__), array('jquery', 'jquery-ui-core', 'jquery-ui-draggable', 'jquery-ui-droppable'));
             
-            // Pocket default API-Key by developer
-            $this->global_pocket_api_key = '074A0c78dTi1bI26f2pU4b0X9dTbe798';
-        }
-        
-        function requires_wordpress_version() {
+            // Pocket default Consumer-Key by developer
+            $this->global_pocket_consumer_key = '10481-1069ebc911a9483c145d3d92';
+        }
+        
+        // Check if requied versions are supported
+        function requires_versions() {
             global $wp_version;
             
@@ -58 +58 @@
                     wp_die('<i>WP Pocket</i> requires WordPress 3.4 or higher. The plugin has been deactivated! Please update WordPress and try again.<br /><br />Back to <a href="' . admin_url() . '">WordPress Dashboard</a>.');
                 }
+            }
+            
+            // Check PHP Version
+            if (!version_compare(PHP_VERSION, '5.2', '>=')) {
+                deactivate_plugins($plugin);
+                wp_die('<i>WP Pocket</i> requires PHP 5.2 or higher. The plugin has been deactivated! Please update your PHP and try again.<br /><br />Back to <a href="' . admin_url() . '">WordPress Dashboard</a>.');
             }
             
@@ -90 +96 @@
                 ("wppocket_version", "' . $this->version . '", "yes"),
                 ("wppocket_links_to_use", "0", "yes"),
+                ("wppocket_faved", "0", "yes"),
                 ("wppocket_order", "0", "yes"),
                 ("wppocket_mark_as_readed", "0", "yes"),
@@ -100 +107 @@
                 ("wppocket_post_category", "1", "yes"),
                 ("wppocket_pocket_username", "", "yes"),
-                ("wppocket_pocket_password", "", "yes"),
+                ("wppocket_pocket_access_key", "", "yes"),
                 ("wppocket_title", "WP Pocket link collection: %%month%% with %%count%% links", "yes"),
                 ("wppocket_introduction_text", "", "yes"),
                 ("wppocket_statements_text", "", "yes"),
-                ("wppocket_entry_building", "<strong>%%title%%</strong>[[: %%description%%]][[ - Tags: %%tags%%]] - %%url%%", "yes"),
+                ("wppocket_entry_building", "<strong>%%title%%</strong>[[: %%description%%]][[ - by %%author%%]][[ - Tags: %%tags%%]] - %%url%%", "yes"),
+                ("wppocket_language", "en", "yes"),
+                ("wppocket_statistics", "1", "yes"),
                 ("wppocket_key_a", "' . $this->keygen(128) . '", "yes"),
                 ("wppocket_key_b", "' . $this->keygen(128) . '", "yes")
             ';
             $this->wpdb->query($sql);
-
+            
             // Check if version under 1.0.2, if true, replace Pocket username, password and api-key
-            $version = explode('.', get_option('wppocket_version'));
-            if (
-                ($version[0] == 1 && $version[1] == 0 && $version[2] < 2) ||
-                ($version[0] == '' && $version[1] == '' && $version[2] == '')
-            ) {
+            if (!version_compare(get_option('wppocket_version'), '1.0.2', '>=')) {
                 // Update Pocket username, password and api-key
                 update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
@@ -122 +127 @@
             }
             
-            // Save API Key
+            // Check if version under 1.2, if true, remove api-key for consumer-key, remove password, api custom key and reset username
+            if (!version_compare(get_option('wppocket_version'), '1.2', '>=')) {
+                // Remove api key
+                $sql = 'DELETE FROM `wp_options` WHERE `option_name`="wppocket_pocket_api_key" OR `option_name`="wppocket_pocket_password" OR `option_name`="wppocket_pocket_api_key_custom"';
+                $this->wpdb->query($sql);
+                
+                // Reset username
+                $sql = 'UPDATE `wp_options` SET `option_value` = "" WHERE `option_name`="wppocket_pocket_username";';
+                $this->wpdb->query($sql);
+            }
+            
+            // Create Customer Key in database
             $sql = '
             INSERT IGNORE INTO `' . $this->wpdb->prefix . 'options` (
@@ -129 +145 @@
                 `autoload`
             ) VALUES
-                ("wppocket_pocket_api_key_custom", "0", "yes"),
-                ("wppocket_pocket_api_key", "' . $this->xcrypt(0, $this->global_pocket_api_key) . '", "yes")
+                ("wppocket_pocket_consumer_key_custom", "0", "yes"),
+                ("wppocket_pocket_consumer_key", "' . $this->xcrypt(0, $this->global_pocket_consumer_key) . '", "yes")
             ';
             $this->wpdb->query($sql);
@@ -136 +152 @@
             // Check if plugin version number up to date
             if (get_option('wppocket_version') != $this->version) {
+                // Send statistics, if allowed
+                if (get_option('wppocket_statistics') == 1) {
+                    $this->statisticsUpdateVersion();
+                }
+                
                 // Update version number
                 update_option('wppocket_version', $this->version);
@@ -142 +163 @@
 
         function deactivate() {
-            // nothing to do, because user cam reactivate
+            // nothing to do, because user can reactivate the plugin
         }
         
@@ -197 +218 @@
         }
         
-        private function cURL($url, $timeout = 5) {
+        // Easy cURL function
+        private function cURL($url, $post, $timeout = 5) {
             // Init cURL
             $cURL = curl_init();
+            
+            // Define HTTP-Header
+            $httpheader = array();
+            $httpheader[] = 'Content-type: application/x-www-form-urlencoded;charset=UTF-8'; 
             
             // Settings
             curl_setopt($cURL, CURLOPT_URL, $url);
             curl_setopt($cURL, CURLOPT_HEADER, 0);
+            curl_setopt($cURL, CURLOPT_HTTPHEADER, $httpheader);
             curl_setopt($cURL, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($cURL, CURLOPT_TIMEOUT, $timeout);
+            
+            // Save POST parameter in one string
+            if (count($post) != 0) {
+                $i = 0;
+                foreach ($post as $key => $value) {
+                    if ($i != 0) {
+                        $postAsString .= '&';
+                    }
+                
+                    $postAsString .= $key . '=' . $value;
+                    
+                    $i++;
+                }
+            }
+            
+            // Set POST parameters
+            curl_setopt($cURL, CURLOPT_POST, count($post));
+            curl_setopt($cURL, CURLOPT_POSTFIELDS, $postAsString);
             
             // Download
@@ -232 +277 @@
         }
         
+        // Function to get Pocket user auth after OAuth 2.0
+        function authPocketAccountGetRequest() {
+            // Define current URL as return URL with GET parameter auth
+            $returnUrl = (isset($_SERVER['HTTPS'])?'https':'http') . '://' . $_SERVER['HTTP_HOST'] . str_replace('auth-get', 'auth', $_SERVER['REQUEST_URI']);
+            
+            // Request authe
+            $oAuthRequest = $this->cURL(
+                'https://getpocket.com/v3/oauth/request',
+                array(
+                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                    'redirect_uri' => $returnUrl
+                )
+            );
+            
+            // Split return, to have [1] the needed request token
+            $oAuthRequestToken = explode('=', $oAuthRequest);
+            
+            // Redirect user to Pocket auth form (via meta, because wp hadalready sent header)
+            echo '<meta http-equiv="refresh" content="0;url=' . 'https://getpocket.com/auth/authorize?request_token=' . urlencode($oAuthRequestToken[1]) . '&redirect_uri=' . urlencode($returnUrl . '&token=' . $oAuthRequestToken[1]) . '" />';
+            exit;
+        }
+        
+        // Function to save access token of a user
+        function authPocketAccountSaveAccessToken() {
+            // Define access token by GET
+            $oAuthRequestToken = $_GET['token'];
+            
+            // Request authe
+            $oAuthAccess = $this->cURL(
+                'https://getpocket.com/v3/oauth/authorize',
+                array(
+                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                    'code' => $oAuthRequestToken
+                )
+            );
+            
+            // Split return to have access token and username seperated ([0][1] = access_key; [1][1] = username)
+            $oAuthAccess = explode('&', $oAuthAccess);
+            $oAuthAccess[0] = explode('=', $oAuthAccess[0]);
+            $oAuthAccess[1] = explode('=', $oAuthAccess[1]);
+            
+            // Check if access key and username are set
+            if ($oAuthAccess[0][1] != '' && $oAuthAccess[1][1] != '') {
+                // Save auth key and username
+                update_option('wppocket_pocket_access_key', $this->xcrypt(0, $oAuthAccess[0][1]));
+                update_option('wppocket_pocket_username', $this->xcrypt(0, $oAuthAccess[1][1]));
+                
+                // Redirect user to success page. Print not here, because if the user refresh, the auth would fail.
+                echo '<meta http-equiv="refresh" content="0;url=' . 'options-general.php?page=settings_pocket_poster&auth-success" />';
+                exit;
+            }else {
+                // Print, the auth faild
+                echo '<div id="message" class="error">';
+                    echo '<p><strong>The authentication of your Pocket account failed. Please try again!</strong></p>';
+                echo '</div>';
+            }
+        }
+        
+        // Function to clean links of unneeded shares
         function cleanUpURL($url) {
             // Filter $_GET[p], falls vorhanden, aus link
@@ -249 +353 @@
         }
         
-        function replaceEntryBuilding($title, $description, $url, $tags, $replace = true) {
+        // Function to replace variables in the entry building
+        function replaceEntryBuilding($title, $description, $url, $tags, $author, $countwords, $replace = true) {
             $wppocket_entry_building = get_option('wppocket_entry_building');
             
@@ -258 +363 @@
                 $wppocket_entry_building = str_replace('%%url%%', $url, $wppocket_entry_building);
                 $wppocket_entry_building = str_replace('%%tags%%', $tags, $wppocket_entry_building);
+                $wppocket_entry_building = str_replace('%%author%%', $author, $wppocket_entry_building);
+                $wppocket_entry_building = str_replace('%%countwords%%', $countwords, $wppocket_entry_building);
             }
             
@@ -267 +374 @@
         }
         
+        // Function to replace variables in the title of the post
         function getReplacedTitle($countLinks, $replace = true) {
             $wppocket_title = get_option('wppocket_title');
@@ -272 +380 @@
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_title = str_replace('%%day%%', date('l'), $wppocket_title);
-                $wppocket_title = str_replace('%%month%%', date('F'), $wppocket_title);
+                $wppocket_title = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_title);
+                $wppocket_title = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_title);
                 $wppocket_title = str_replace('%%year%%', date('Y'), $wppocket_title);
                 $wppocket_title = str_replace('%%count%%', $countLinks, $wppocket_title);
@@ -281 +389 @@
         }
         
-        function getReplacedIntroductionText($replace = true) {
+        // Function to replace variables in the introduction text
+        function getReplacedIntroductionText($countLinks, $replace = true) {
             $wppocket_introduction_text = get_option('wppocket_introduction_text');
             
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_introduction_text = str_replace('%%day%%', date('l'), $wppocket_introduction_text);
-                $wppocket_introduction_text = str_replace('%%month%%', date('F'), $wppocket_introduction_text);
+                $wppocket_introduction_text = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_introduction_text);
+                $wppocket_introduction_text = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_introduction_text);
                 $wppocket_introduction_text = str_replace('%%year%%', date('Y'), $wppocket_introduction_text);          
+                $wppocket_introduction_text = str_replace('%%count%%', $countLinks, $wppocket_introduction_text);
             }
             
@@ -294 +404 @@
         }
         
-        function getReplacedStatementsText($replace = true) {
+        // Function to replace variables in the statements text
+        function getReplacedStatementsText($countLinks, $replace = true) {
             $wppocket_statements_text = get_option('wppocket_statements_text');
             
             // Set the variables, if should do this
             if ($replace) {
-                $wppocket_statements_text = str_replace('%%day%%', date('l'), $wppocket_statements_text);
-                $wppocket_statements_text = str_replace('%%month%%', date('F'), $wppocket_statements_text);
-                $wppocket_statements_text = str_replace('%%year%%', date('Y'), $wppocket_statements_text);          
+                $wppocket_statements_text = str_replace('%%day%%', $this->getReplaceLanguageDependentStrings(date('l')), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%month%%', $this->getReplaceLanguageDependentStrings(date('F')), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%year%%', date('Y'), $wppocket_statements_text);
+                $wppocket_statements_text = str_replace('%%count%%', $countLinks, $wppocket_statements_text);
             }
             
@@ -307 +419 @@
         }
         
+        // Function to replace language-dependent strings
+        function getReplaceLanguageDependentStrings($string) {
+            // Check with language is selected
+            if (get_option('wppocket_language') == 'de') { // German
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'Januar';
+                        break;
+                    case ('February'):
+                        return 'Februar';
+                        break;
+                    case ('March'):
+                        return 'März';
+                        break;
+                    case ('April'):
+                        return 'April';
+                        break;
+                    case ('May'):
+                        return 'Mai';
+                        break;
+                    case ('June'):
+                        return 'Juni';
+                        break;
+                    case ('July'):
+                        return 'July';
+                        break;
+                    case ('August'):
+                        return 'August';
+                        break;
+                    case ('September'):
+                        return 'Steptember';
+                        break;
+                    case ('October'):
+                        return 'Oktober';
+                        break;
+                    case ('November'):
+                        return 'November';
+                        break;
+                    case ('December'):
+                        return 'Dezember';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'Montag';
+                        break;
+                    case ('Tuesday'):
+                        return 'Dienstag';
+                        break;
+                    case ('Wednesday'):
+                        return 'Mittwoch';
+                        break;
+                    case ('Thursday'):
+                        return 'Donnerstag';
+                        break;
+                    case ('Friday'):
+                        return 'Freitag';
+                        break;
+                    case ('Saturday'):
+                        return 'Samstag';
+                        break;
+                    case ('Sunday'):
+                        return 'Sonntag';
+                        break;
+                }
+            }else if (get_option('wppocket_language') == 'fr') { // French
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'janvier';
+                        break;
+                    case ('February'):
+                        return 'février';
+                        break;
+                    case ('March'):
+                        return 'mars';
+                        break;
+                    case ('April'):
+                        return 'avril';
+                        break;
+                    case ('May'):
+                        return 'mai';
+                        break;
+                    case ('June'):
+                        return 'juin';
+                        break;
+                    case ('July'):
+                        return 'juillet';
+                        break;
+                    case ('August'):
+                        return 'août';
+                        break;
+                    case ('September'):
+                        return 'septembre';
+                        break;
+                    case ('October'):
+                        return 'octobre';
+                        break;
+                    case ('November'):
+                        return 'novembre';
+                        break;
+                    case ('December'):
+                        return 'décembre';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'lundi';
+                        break;
+                    case ('Tuesday'):
+                        return 'mardi';
+                        break;
+                    case ('Wednesday'):
+                        return 'mercredi';
+                        break;
+                    case ('Thursday'):
+                        return 'jeudi';
+                        break;
+                    case ('Friday'):
+                        return 'vendredi';
+                        break;
+                    case ('Saturday'):
+                        return 'samedi';
+                        break;
+                    case ('Sunday'):
+                        return 'dimanche';
+                        break;
+                }
+            }else { // English by default
+                // Return replaced strings
+                switch($string) {
+                    case ('January'):
+                        return 'January';
+                        break;
+                    case ('February'):
+                        return 'February';
+                        break;
+                    case ('March'):
+                        return 'March';
+                        break;
+                    case ('April'):
+                        return 'April';
+                        break;
+                    case ('May'):
+                        return 'May';
+                        break;
+                    case ('June'):
+                        return 'June';
+                        break;
+                    case ('July'):
+                        return 'July';
+                        break;
+                    case ('August'):
+                        return 'August';
+                        break;
+                    case ('September'):
+                        return 'September';
+                        break;
+                    case ('October'):
+                        return 'October';
+                        break;
+                    case ('November'):
+                        return 'November';
+                        break;
+                    case ('December'):
+                        return 'December';
+                        break;
+                    
+                    case ('Monday'):
+                        return 'Monday';
+                        break;
+                    case ('Tuesday'):
+                        return 'Tuesday';
+                        break;
+                    case ('Wednesday'):
+                        return 'Wednesday';
+                        break;
+                    case ('Thursday'):
+                        return 'Thursday';
+                        break;
+                    case ('Friday'):
+                        return 'Friday';
+                        break;
+                    case ('Saturday'):
+                        return 'Saturday';
+                        break;
+                    case ('Sunday'):
+                        return 'Sunday';
+                        break;
+                }
+            }
+        }
+        
+        // Function to check if the plugin have access to a Pocket account
         function checkPocketAccess() {
-            // Check if username, password and api-key is set, if not, print error
-            if (get_option('wppocket_pocket_username') == '' || get_option('wppocket_pocket_password') == '' || get_option('wppocket_pocket_api_key') == '') {
+            // Check if username, password and  consumer-key is set, if not, print error
+            if (get_option('wppocket_pocket_username') == '' || get_option('wppocket_pocket_access_key') == '' || get_option('wppocket_pocket_consumer_key') == '') {
                 ?>
                 <div id="message" class="error">
-                    <p><strong>WP Pocket can NOT work. Please save your Pocket username, password and API-Key (optional)!</strong></p>
+                    <p><strong>WP Pocket can NOT work. Please authenticate your Pocket account in the WP Pocket options!</strong></p>
                 </div>
                 <?php
@@ -318 +623 @@
             }else { // Test the settings
                 // Init cURL
-                $getAuth = $this->cURL('https://readitlaterlist.com/v2/auth?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')));
-                
-                // Check if, user data ad api key correct
+                $getAuth = $this->cURL(
+                    'https://getpocket.com/v3/send',
+                    array(
+                        'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                        'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                        'actions' => '[{}]'
+                    )
+                );
+                
+                // Check if, user data and consumer-key correct
                 if ($getAuth == '400 Bad Request') {
                     ?>
                     <div id="message" class="error">
-                        <p><strong>Your API-Key it not valid. Please correct it, else WP Pocket can NOT work.</strong></p>
+                        <p><strong>Your Consumer-Key it not valid. Please correct it, else WP Pocket can NOT work.</strong></p>
                     </div>
                     <?php
@@ -331 +643 @@
                     ?>
                     <div id="message" class="error">
-                        <p><strong>Your Pocket username and/or password it not valid. Please correct that, else WP Pocket can NOT work.</strong></p>
+                        <p><strong>The authentication of you Pocket account is expired. Please reauthenticate it, else WP Pocket can NOT work.</strong></p>
                     </div>
                     <?php
@@ -341 +653 @@
         }
         
+        // Support box on the right side of each WP Pocket page
         function support_div($display = true) {
             ?>
@@ -346 +659 @@
                 <h3>support me</h3>
                 
-                <p>If you use the plugin and like it, you can say thanks and support me.</p>
+                <p>If you use the plugin and like it, you can say thanks and support me. How?</p>
                 
                 <h3>follow me on twitter</h3>
                 
                 <p>
-                    <a href="https://twitter.com/jankarres" class="twitter-follow-button" data-show-count="false" data-lang="en" data-size="large">Follow @jankarres</a>
+                    <a href="https://twitter.com/jankarres" class="twitter-follow-button" data-show-count="false" data-size="large" data-dnt="true">Follow @jankarres</a>
                     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="https://plugins.trac.wordpress.org//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
                 </p>
                 
-                <h3>donate on flattr</h3>
-                
-                <a href="http://flattr.com/thing/881252/WP-Pocket" target="_blank">
-                    <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" />
-                </a>
+                <h3>report bugs</h3>
+                
+                <p>
+                    You found a bug? You have an idea for a feature? Then let me know and send a request on <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a>!
+                </p>
             </div>
             <?php
         }
         
+        // Function to set options page
         function options_link() {
             // Start the view of the options page
@@ -372 +686 @@
         }
         
+        // Options page view
         function options_page_view() {
             // Add option page style
@@ -388 +703 @@
                 <?php $this->support_div(); ?>
                 
-                <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
                     <h3>Pocket Login</h3>
                     <table class="form-table">
                         <tr>
-                            <th>Pocket Username</th>
+                            <th>Pocket Auth</th>
                             <td>
-                                <input type="text" size="57" name="wppocket_pocket_username" value="<?php if (get_option('wppocket_pocket_username') != '') { echo $this->xcrypt(1, get_option('wppocket_pocket_username')); } ?>" />
+                                <?php if (get_option('wppocket_pocket_username') != '') { echo $this->xcrypt(1, get_option('wppocket_pocket_username')) . ' authenticated.'; } ?> 
+                                <?php if (get_option('wppocket_pocket_username') == '') { echo '<a href="?page=settings_pocket_poster&auth-get"><input type="button" class="button-primary" value="Authenticate account" /></a>'; }else  { echo '<a href="?page=settings_pocket_poster&auth-get"><input type="button" class="button-primary" value="Authenticate other account" /></a>'; } ?>
+                            </td>
+                        </tr>
+                        
+                        <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
+                        
+                        <tr>
+                            <th>Pocket Consumer-Key</th>
+                            <td>
+                                <input type="text" size="57" name="wppocket_pocket_consumer_key" value="<?php if(get_option('wppocket_pocket_consumer_key_custom') == 1) { echo $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')); } ?>" />
+                                
+                                <?php if(get_option('wppocket_pocket_consumer_key_custom') == 1) { ?>
+                                    <label><input name="wppocket_pocket_consumer_key_custom_remove" type="checkbox" value="1" /> Use the default Consumer-Key</label>
+                                <?php } ?>
+                                
+                                <p class="description">If you wish to use a private Consumer-Key, please enter one. <strong>It is not necessary!</strong><br />
+                                You can get one on <a href="http://getpocket.com/developer/apps/new" target="_blank">http://getpocket.com/developer/apps/new</a>.</p>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <h3>WP Pocket Settings</h3>
+                    <table class="form-table">
+                        <tr>
+                            <th>Language</th>
+                            <td>
+                                <select name="wppocket_language">
+                                    <option value="en" <?php selected('en', get_option('wppocket_language')); ?>>English</option>
+                                    <option value="de" <?php selected('de', get_option('wppocket_language')); ?>>German</option>
+                                    <option value="fr" <?php selected('fr', get_option('wppocket_language')); ?>>French</option>
+                                </select>
+                                <p class="description">A few variables you can set are language-dependent. Which language should WP Pocket use? <strong>This setting does not change the language of complete WP Pocket (currently only English supported)!</strong></p>
                             </td>
                         </tr>
                         <tr>
-                            <th>Pocket Password</th>
+                            <th>Statistics</th>
                             <td>
-                                <input type="password" size="57" name="wppocket_pocket_password" value="" />
-                                <p class="description">If you do not wish to edit something, leave it blank.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>Pocket API-Key</th>
-                            <td>
-                                <input type="text" size="57" name="wppocket_pocket_api_key" value="<?php if(get_option('wppocket_pocket_api_key_custom') == 1) { echo $this->xcrypt(1, get_option('wppocket_pocket_api_key')); } ?>" />
-                                
-                                <?php if(get_option('wppocket_pocket_api_key_custom') == 1) { ?>
-                                    <label><input name="wppocket_pocket_api_key_custom_remove" type="checkbox" value="1" /> Use the default API-Key</label>
-                                <?php } ?>
-                                
-                                <p class="description">If you wish to use a private API-Key, please enter one. <strong>It is not necessary!</strong><br />
-                                You can get one on <a href="http://getpocket.com/api/signup/" target="_blank">http://getpocket.com/api/signup/</a>.</p>
+                                <select name="wppocket_statistics">
+                                    <option value="1" <?php selected('1', get_option('wppocket_statistics')); ?>>Yes</option>
+                                    <option value="0" <?php selected('0', get_option('wppocket_statistics')); ?>>No</option>
+                                </select>
+                                <p class="description">Do you allow WP Pocket to collect anonymous statistics about published links and updates and send them to WP-Pocket.com? These statistics will only be used to improve WP Pocket.</p>
                             </td>
                         </tr>
@@ -426 +762 @@
                                 <select name="wppocket_links_to_use">
                                     <option value="0" <?php selected('0', get_option('wppocket_links_to_use')); ?>>Only unread links, which are unposted</option>
-                                    <option value="1" <?php selected('1', get_option('wppocket_links_to_use')); ?>>Only read links, which are unposted</option>
-                                    <option value="2" <?php selected('2', get_option('wppocket_links_to_use')); ?>>All links, which are unposted</option>
+                                    <option value="1" <?php selected('1', get_option('wppocket_links_to_use')); ?>>Only read/archived links, which are unposted</option>
+                                    <option value="2" <?php selected('2', get_option('wppocket_links_to_use')); ?> disabled><s>All links, which are unposted</s> (Currently impossible due to a bug in Pocket API)</option>
                                     <option value="3" <?php selected('3', get_option('wppocket_links_to_use')); ?>>All unread links, also already posted ones</option>
-                                    <option value="4" <?php selected('4', get_option('wppocket_links_to_use')); ?>>All read links, also already posted ones</option>
-                                    <option value="5" <?php selected('5', get_option('wppocket_links_to_use')); ?>>All links, also already posted ones</option>
+                                    <option value="4" <?php selected('4', get_option('wppocket_links_to_use')); ?>>All read/archived links, also already posted ones</option>
+                                    <option value="5" <?php selected('5', get_option('wppocket_links_to_use')); ?> disabled><s>All links, also already posted ones</s> (Currently impossible due to a bug in Pocket API)</option>
                                 </select>
                                 <p class="description">Which links should be used for the new post?</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Favorites</th>
+                            <td>
+                                <select name="wppocket_faved">
+                                    <option value="0" <?php selected('0', get_option('wppocket_faved')); ?>>All links</option>
+                                    <option value="1" <?php selected('1', get_option('wppocket_faved')); ?>>Only faved links</option>
+                                    <option value="2" <?php selected('2', get_option('wppocket_faved')); ?>>Only unfaved links</option>
+                                </select>
+                                <p class="description">Should only faved or unfaved links be used in a new post?</p>
                             </td>
                         </tr>
@@ -446 +793 @@
                         </tr>
                         <tr>
-                            <th>Mark as readed</th>
+                            <th>Mark as readed/archived</th>
                             <td>
                                 <select name="wppocket_mark_as_readed">
@@ -565 +912 @@
                                     write the text and the variable in double square brackets. For example: %%title%%[[ - Tags: %%tags%%]]<br />
                                     <strong>Use <i>%%title%%</i> for title of the link in pocket; <i>%%description%%</i> for the meta description of the link; 
-                                    <i>%%url%%</i> for the link itself; <i>%%tags%%</i> for added tags in pocket.</strong>
+                                    <i>%%url%%</i> for the link itself; <i>%%tags%%</i> for added tags in pocket/metatags; <i>%%author%%</i> for the name 
+                                    of the author who wrote the article; <i>%%countwords%%</i> for the number of words, which the article has</strong>
                                 </p>
                             </td>
@@ -581 +929 @@
                                 <p class="description">
                                     At the beginning of the post, before the links, this text will be shown.<br />
-                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year.</strong>
+                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year; %%count%% to get the number of posted links.</strong>
                                 </p>
                             </td>
@@ -597 +945 @@
                                 <p class="description">
                                     At the end of the post, after the links, this text will be shown.<br />
-                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year.</strong>
+                                    <strong>Use <i>%%day%%</i> for day, on which the post is being generated; <i>%%month%%</i> for the month; <i>%%year%%</i> for the year; %%count%% to get the number of posted links.</strong>
                                 </p>
                             </td>
@@ -613 +961 @@
         }
         
+        // Options page controller
         function options_page_controller() {
+            // Check if should start Pocket auth process
+            if (isset($_GET['auth-get'])) {
+                // Start Pocket auth process
+                $this->authPocketAccountGetRequest();
+            }
+            
+            // Check if should save Pocket access token
+            if (isset($_GET['auth'])) {
+                // Save Pocket access token
+                $this->authPocketAccountSaveAccessToken();
+            }
+            
+            // Check if Pocket account auth saved successfull
+            if (isset($_GET['auth-success'])) {
+                // Print, the auth succeed
+                echo '<div id="message" class="updated">';
+                    echo '<p><strong>You have successfully authenticated your Pocket Account!</strong></p>';
+                echo '</div>';
+            }
+            
             // Check if setting sended
             if ($_POST['wppocket_edit']) {
@@ -621 +990 @@
                 // Error Text Array
                 $errorLang = array(
-                    '0' => 'Please enter your Pocket username.',
-                    '1' => 'Please enter your Pocket password.',
-                    '2' => 'Please enter your Pocket API-Key or reset it to use the default key.',
-                    '3' => 'Please enter a title for the posts.',
-                    '4' => 'Please enter a building for each link which will be posted.'
+                    '1' => 'Please enter your Pocket Consumer-Key or reset it to use the default key (recommend).',
+                    '2' => 'Please enter a title for the posts.',
+                    '3' => 'Please enter a building for each link which will be posted.'
                 );
             
                 // Update "Pocket Login"
                 
-                // Check if Pocket username is isset
-                if ($_POST['wppocket_pocket_username'] == '') {
-                    $error[] = 0;
-                }else {
-                    update_option('wppocket_pocket_username', $this->xcrypt(0, $_POST['wppocket_pocket_username']));
-                }
-                
-                // Check if Pocket one password is isset
-                if (get_option('wppocket_pocket_password') == '' && $_POST['wppocket_pocket_password'] == '') {
+                if ($_POST['wppocket_pocket_consumer_key_custom_remove'] == 1) {
+                    // Set default key
+                    update_option('wppocket_pocket_consumer_key_custom', 0);
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $this->global_pocket_consumer_key));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
+                }elseif(get_option('wppocket_pocket_consumer_key_custom') == 1 && $_POST['wppocket_pocket_consumer_key'] == '') {
                     $error[] = 1;
-                }elseif ($_POST['wppocket_pocket_password'] != '') {
-                    update_option('wppocket_pocket_password', $this->xcrypt(0, $_POST['wppocket_pocket_password']));
-                }
-                
-                if ($_POST['wppocket_pocket_api_key_custom_remove'] == 1) {
-                    // Set default key
-                    update_option('wppocket_pocket_api_key_custom', 0);
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->global_pocket_api_key));
-                }elseif(get_option('wppocket_pocket_api_key_custom') == 1 && $_POST['wppocket_pocket_api_key'] == '') {
-                    $error[] = 2;
-                }elseif(get_option('wppocket_pocket_api_key_custom') == 1 && $_POST['wppocket_pocket_api_key'] != '') {
+                }elseif(get_option('wppocket_pocket_consumer_key_custom') == 1 && $_POST['wppocket_pocket_consumer_key'] != '') {
                     // Set new key
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $_POST['wppocket_pocket_api_key']));
-                }elseif (get_option('wppocket_pocket_api_key_custom') == 0 && $_POST['wppocket_pocket_api_key'] != '') {
-                    // Set custom API-Key first time
-                    update_option('wppocket_pocket_api_key_custom', 1);
-                    update_option('wppocket_pocket_api_key', $this->xcrypt(0, $_POST['wppocket_pocket_api_key']));
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $_POST['wppocket_pocket_consumer_key']));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
+                }elseif (get_option('wppocket_pocket_consumer_key_custom') == 0 && $_POST['wppocket_pocket_consumer_key'] != '') {
+                    // Set custom Consumer-Key first time
+                    update_option('wppocket_pocket_consumer_key_custom', 1);
+                    update_option('wppocket_pocket_consumer_key', $this->xcrypt(0, $_POST['wppocket_pocket_consumer_key']));
+                    
+                    // Reset authed Pocket account
+                    update_option('wppocket_pocket_access_key', '');
+                    update_option('wppocket_pocket_username', '');
+                    $changeConsumerKey = true;
                 }
                 
@@ -665 +1033 @@
                 
                 update_option('wppocket_links_to_use', $_POST['wppocket_links_to_use']);
+                update_option('wppocket_faved', $_POST['wppocket_faved']);
                 update_option('wppocket_order', $_POST['wppocket_order']);
                 update_option('wppocket_mark_as_readed', $_POST['wppocket_mark_as_readed']);
@@ -715 +1084 @@
                 // Check if title is not set
                 if ($_POST['wppocket_title'] == '') {
-                    $error[] = 3;
+                    $error[] = 2;
                 }else {
                     update_option('wppocket_title', $_POST['wppocket_title']);
@@ -722 +1091 @@
                 // Chech if entry building is not set
                 if ($_POST['wppocket_entry_building'] == '') {
-                    $error[] = 4;
+                    $error[] = 3;
                 }else {
                     update_option('wppocket_entry_building', $_POST['wppocket_entry_building']);
@@ -730 +1099 @@
                 update_option('wppocket_introduction_text', $_POST['wppocket_introduction_text']);
                 update_option('wppocket_statements_text', $_POST['wppocket_statements_text']);
+                
+                // WP Pocket settings
+                update_option('wppocket_language', $_POST['wppocket_language']);
+                update_option('wppocket_statistics', $_POST['wppocket_statistics']);
                 
                 // Output all errors
@@ -750 +1123 @@
                     <?php
                 }
+                
+                // Check if Consumer-Key was changed. If yes, azth was reseted.
+                if ($changeConsumerKey) {
+                    ?>
+                    <div id="message" class="updated">
+                        <p><strong>You changed the Consumer-Key. Because of, the authentication of your WP Pocket account was removed. Please reauthenticate!</strong></p>
+                    </div>
+                    <?php
+                }
             }
             
@@ -756 +1138 @@
         }
         
+        // Function to set the main page
         function main_link() {      
             // Start the view of the main page
@@ -761 +1144 @@
         }
         
+        // Main page view
         function main_page_view() {
             // Add option page style
@@ -781 +1165 @@
                     <div class="nav-tabs-arrow nav-tabs-arrow-left" style="display: none; "><a>«</a></div>
                     <div class="nav-tabs-wrapper">
-                        <div class="nav-tabs" style="padding: 0px; margin-right: -110px; margin-left: 0px; ">
+                        <div class="nav-tabs">
                             <span class="nav-tab nav-tab-active"></span><a href="#" class="nav-tab menu-add-new"></a>   
                         </div>
@@ -804 +1188 @@
                     if ($checkPocketAccess) {               
                         // Get links from the user
-                        
-                        // Should get Readed, onreaded or all links?
+                        $getLinksPost = array();
+                        
+                        $getLinksPost['consumer_key'] = $this->xcrypt(1, get_option('wppocket_pocket_consumer_key'));
+                        $getLinksPost['access_token'] = $this->xcrypt(1, get_option('wppocket_pocket_access_key'));
+                        $getLinksPost['detailType'] = 'complete';
+                        
+                        // Should get Readed, unreaded or all links?
                         if (get_option('wppocket_links_to_use') == 0 || get_option('wppocket_links_to_use') == 3) { // Unreaded
-                            $state = '&state=unread';
-                        }elseif (get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 4) { // Readed
-                            $state = '&state=read';
+                            $getLinksPost['state'] = 'unread';
+                        }elseif (get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 4) { // Readed / Archived
+                            $getLinksPost['state'] = 'archive';
                         } // All
                         
-                        $getLinks = $this->cURL('https://readitlaterlist.com/v2/get?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')) . $state . '&tags=1', 30);
+                        // Check if only faved or unfaved links should use
+                        if (get_option('wppocket_faved') == 1) { // only faved
+                            $getLinksPost['favorite'] = '1';
+                        }else if (get_option('wppocket_faved') == 2) { // only unfaved
+                            $getLinksPost['favorite'] = '0';
+                        } // All
+                        
+                        // Check if order should be oldest to newest or newest to oldest
+                        if (get_option('wppocket_order')) { // oldest to newest
+                            $getLinksPost['sort'] = 'oldest';
+                        }else { // newest to oldest
+                            $getLinksPost['sort'] = 'newest';
+                        }
+                        
+                        $getLinks = $this->cURL(
+                            'https://getpocket.com/v3/get',
+                            $getLinksPost
+                        );
                         
                         // Decode JSON to Object
@@ -822 +1228 @@
                             foreach ($getLinks->list as $key => $value) {
                                 // Check if aleady posted. If true, remove it
-                                $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $value->url . '"';
+                                $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $value->given_url . '"';
                                 $row = $this->wpdb->get_results($sql);
                                 
@@ -829 +1235 @@
                                 }
                             }
-                        }
-                        
-                        // Check if order should be oldest to newest
-                        if (get_option('wppocket_order')) {
-                            // Turn around the json object
-                            $tmp = json_encode($getLinks, true);
-                            $tmp = json_decode($tmp, true);
-                            $tmp['list'] = array_reverse($tmp['list']);
-                            $tmp = json_encode($tmp, true);
-                            $tmp = json_decode($tmp);
-                            $getLinks = $tmp;
                         }
                         
@@ -864 +1259 @@
                                     <?php
                                     // Gennerate output of each link
-                                    foreach ($getLinks->list as $key => $value) {                               
-                                        // Get description
-                                        $urlHtml = $this->cURL($value->url);
-                                        
-                                        $doc = new DOMDocument();
-                                        @$doc->loadHTML($urlHtml);
-                                        
-                                        if ($value->title == '') {
-                                            $nodes = $doc->getElementsByTagName('title');
-                                            $value->title = utf8_decode($nodes->item(0)->nodeValue);
+                                    foreach ($getLinks->list as $key => $value) {
+                                        // Rewirte Tags Array as Tags string
+                                        if (count($value->tags) != 0) {
+                                            $tagsAsString = '';
+                                            $i2 = 0;
+                                            foreach ($value->tags as $tag) {
+                                                if ($i2 != 0) {
+                                                    $tagsAsString .= ', ';
+                                                }
+                                                
+                                                $tagsAsString .= $tag->tag;
+                                                
+                                                $i2++;
+                                            }
                                             
-                                            if (!$this->is_utf8($value->title)) {
-                                                $value->title = utf8_encode($value->title);
-                                            }
+                                            $value->tags = $tagsAsString;
+                                            unset($tagsAsString);
+                                        }else { // Not tags yet
+                                            $value->tags = '';
                                         }
                                         
-                                        $metas = $doc->getElementsByTagName('meta');
-                                        
-                                        for ($i = 0; $i < $metas->length; $i++) {
-                                            $meta = $metas->item($i);
+                                        // Get data from the meta tags, if necessary
+                                        if ($value->resolved_title == '' || $value->excerpt == '' || (get_option('wppocket_meta_keyword_as_tags') == 1 && $value->tags == '')) {
+                                            $urlHtml = $this->cURL($value->given_url, array());
                                             
-                                            if($meta->getAttribute('name') == 'description') {
-                                                $value->description = utf8_decode($meta->getAttribute('content'));
-                                                if (!$this->is_utf8($value->description)) {
-                                                    $value->description = utf8_encode($value->description);
+                                            $doc = new DOMDocument();
+                                            @$doc->loadHTML($urlHtml);
+                                            
+                                            if ($value->resolved_title == '') {
+                                                $nodes = $doc->getElementsByTagName('title');
+                                                $value->title = utf8_decode($nodes->item(0)->nodeValue);
+                                                
+                                                if (!$this->is_utf8($value->title)) {
+                                                    $value->title = utf8_encode($value->title);
                                                 }
                                             }
                                             
-                                            if (get_option('wppocket_meta_keyword_as_tags') == 1) {
-                                                if ($meta->getAttribute('name') == 'keywords') {
-                                                    $value->tags = utf8_decode($meta->getAttribute('content'));
-                                                    if (!$this->is_utf8($value->tags)) {
-                                                        $value->tags = utf8_encode($value->tags);
+                                            $metas = $doc->getElementsByTagName('meta');
+                                            
+                                            for ($i = 0; $i < $metas->length; $i++) {
+                                                $meta = $metas->item($i);
+                                                
+                                                if ($value->excerpt == '') {
+                                                    if($meta->getAttribute('name') == 'description') {
+                                                        $value->excerpt = utf8_decode($meta->getAttribute('content'));
+                                                        if (!$this->is_utf8($value->excerpt)) {
+                                                            $value->excerpt = utf8_encode($value->excerpt);
+                                                        }
+                                                    }
+                                                }
+                                                
+                                                if (get_option('wppocket_meta_keyword_as_tags') == 1 && $value->tags == '') {
+                                                    if ($meta->getAttribute('name') == 'keywords') {
+                                                        $value->tags = utf8_decode($meta->getAttribute('content'));
+                                                        if (!$this->is_utf8($value->tags)) {
+                                                            $value->tags = utf8_encode($value->tags);
+                                                        }
                                                     }
                                                 }
@@ -906 +1325 @@
                                                 <dt class="menu-item-handle">
                                                     <div class="left">
-                                                        <?php echo $value->title; ?>
+                                                        <?php echo $value->resolved_title; ?>
                                                     </div>
                                                     <div class="right">
@@ -916 +1335 @@
 
                                             <div class="menu-item-settings" id="item-<?php echo $key; ?>">
-                                                <p class="description description-thin">
+                                                <p class="description description-thin description-two-thirds">
                                                     <label for="item-<?php echo $key; ?>-input-title">
                                                         Title<br />
-                                                        <input type="text" id="item-<?php echo $key; ?>-input-title" class="widefat input-title" name="element[][title]" value="<?php echo $value->title; ?>" />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-title" class="widefat input-title" name="element[][title]" value="<?php echo $value->resolved_title; ?>" />
                                                     </label>
                                                 </p>
-                                                <p class="description description-thin">
+                                                <p class="description description-thin description-one-thirds">
+                                                    <label for="item-<?php echo $key; ?>-input-author">
+                                                        Author<br />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-author" class="widefat input-title" name="element[][author]" value="<?php
+                                                            if (count($value->authors) != 0) {
+                                                                $i2 = 0;
+                                                                foreach($value->authors as $author) {
+                                                                    if ($i2 != 0) {
+                                                                        echo ', ';
+                                                                    }
+                                                                    
+                                                                    echo $author->name;
+                                                                    
+                                                                    $i2++;
+                                                                }
+                                                            }
+                                                        ?>" />
+                                                    </label>
+                                                </p>
+                                                <p class="description description-thin description-two-thirds">
+                                                    <label for="item-<?php echo $key; ?>-input-url">
+                                                        URL<br />
+                                                        <input type="text" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url]" value="<?php if (get_option('wppocket_clean_url') == 1) { echo $this->cleanUpURL($value->resolved_url); }else { echo $value->given_url; } ?>" />
+                                                        <input type="hidden" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url_uncleaned]" value="<?php echo $value->given_url; ?>" />
+                                                    </label>
+                                                </p>
+                                                <p class="description description-thin description-one-thirds">
                                                     <label for="item-<?php echo $key; ?>-input-tags">
-                                                        Tags (optional)<br />
+                                                        Tags<br />
                                                         <input type="text" id="item-<?php echo $key; ?>-input-tags" class="widefat" name="element[][tags]" value="<?php echo $value->tags; ?>" />
                                                     </label>
@@ -931 +1376 @@
                                                     <label for="item-<?php echo $key; ?>-input-description">
                                                         Description (optional)<br />
-                                                        <textarea name="element[][description]" rows="4" id="item-<?php echo $key; ?>-input-description" class="widefat" type="textarea"><?php echo $value->description; ?></textarea>
-                                                    </label>
-                                                </p>
-                                                <p class="description">
-                                                    <label for="item-<?php echo $key; ?>-input-url">
-                                                        URL<br />
-                                                        <input type="text" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url]" value="<?php if (get_option('wppocket_clean_url') == 1) { echo $this->cleanUpURL($value->url); }else { echo $value->url; } ?>" />
-                                                        <input type="hidden" id="item-<?php echo $key; ?>-input-url" class="widefat" name="element[][url_uncleaned]" value="<?php echo $value->url; ?>" />
+                                                        <textarea name="element[][description]" rows="4" id="item-<?php echo $key; ?>-input-description" class="widefat" type="textarea"><?php echo $value->excerpt; ?></textarea>
                                                     </label>
                                                 </p>
                                                 
-                                                <input type="hidden" name="element[][id]" value="<?php echo $key; ?>" />
+                                                
+                                                <input type="hidden" name="element[][id]" value="<?php echo $value->item_id; ?>" />
+                                                <input type="hidden" name="element[][countwords]" value="<?php echo $value->word_count; ?>" />
                                                 <input type="hidden" name="element[][associate]" class="associate" value="0" />
                                             </div>
@@ -959 +1399 @@
                     }
                 }elseif ($_POST['mode'] == 'save') { // Save post
-                    // Check if elements was posted
+                    // Check if elements was lposted
                     if ($_POST['count_elements'] == 0) { // No elements
                         ?>
@@ -999 +1439 @@
         }
         
+        // Options page controller
         function main_page_controller() {
             global $current_user;
@@ -1009 +1450 @@
                 
                 // Set en empty example for entry building with replace
-                $replaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false);
+                $replaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false, false);
                 
                 // Set en empty example for entry building without replace
-                $noReplaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false);
+                $noReplaceEntryBuilding = $this->replaceEntryBuilding(false, false, false, false, false, false, false);
                 
                 // Check, which Array elements are dynamic. Set empy replace and flag in new array
@@ -1037 +1478 @@
                 unset($noReplaceEntryBuilding);
                 
+                #####################################
+                ## COMBINE URL, URL CLEANED AND ID ##
+                #####################################
+                
+                $i = 0;
+                while ($i < (count($_POST['element']) / 9)) {
+                    $url = $_POST['element'][(($i * 9) + 2)]['url'];
+                    $urlUncleaned = $_POST['element'][(($i * 9) + 3)]['url_uncleaned'];
+                    $id = $_POST['element'][(($i * 9) + 6)]['id'];
+                    
+                    $_POST['element'][(($i * 9) + 2)] = array(
+                        array(
+                            $url,
+                            $urlUncleaned,
+                            $id
+                        )
+                    );
+                    
+                    
+                    $i++;
+                }
+                
                 #########################
                 ## SET ASSOCIATE LINKS ##
                 #########################
                 $i = 0;
-                while ($i < (count($_POST['element']) / 7)) {
+                while ($i < (count($_POST['element']) / 9)) {
                     // Check if this it not a associate link
-                    if (!$_POST['element'][($i * 7) + 5]['associate']) {
+                    if (!$_POST['element'][($i * 9) + 6]['associate']) {
                         // Search for associate links in the following
                         $associateLinks = array();
@@ -1049 +1512 @@
                         while(true) {
                             // If this is an associate links, add this to the array, else break the while-loop
-                            if ($_POST['element'][($i * 7) + 6 + ($i2 * 7)]['associate']) {
-                                $_POST['element'][($i * 7) + 3][] = $_POST['element'][(($i * 7) + 3 + ($i2 * 7))]['url'];
-                                $_POST['element'][($i * 7) + 4][] = $_POST['element'][(($i * 7) + 4 + ($i2 * 7))]['url_uncleaned'];
+                            if ($_POST['element'][($i * 9) + 8 + ($i2 * 9)]['associate']) {
+                                $_POST['element'][($i * 9) + 2][] = $_POST['element'][(($i * 9) + 2 + ($i2 * 9))][0];
                             }else {
                                 break;
@@ -1068 +1530 @@
                 
                 // Set posted elements in $_POST for view
-                $_POST['count_elements'] = round((count($_POST['element']) / 7));
+                $_POST['count_elements'] = round((count($_POST['element']) / 9));
                 
                 // Array for all posted links
@@ -1075 +1537 @@
                 $post_content = '';
                 
-                // Set introduction text if not empty
-                if (trim(get_option('wppocket_introduction_text')) != '') {
-                    $post_content .= $this->getReplacedIntroductionText();
-                }
-                
-                // Gennerate all links intro text
+                // Gennerate all links in text
                 $i = 0;
-                while ($i < (count($_POST['element']) / 7)) {
+                while ($i < (count($_POST['element']) / 9)) {
                     // Check if only not posted links should post
                     if (get_option('wppocket_links_to_use') == 0 || get_option('wppocket_links_to_use') == 1 || get_option('wppocket_links_to_use') == 2) {
                         // Check if aleady posted. If true, confine to the next loop
-                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $_POST['element'][($i * 7) + 3]['url'] . '"';
+                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $_POST['element'][($i * 9) + 2]['url'] . '"';
                         $row = $this->wpdb->get_results($sql);
                         
                         if ($row[0]->id != '') {
-                            $_POST['count_elements'] -= count($_POST['element'][($i * 7) + 3]); // - this and associated elements
+                            $_POST['count_elements'] -= count($_POST['element'][($i * 9) + 2]); // - this and associated elements
                             $i++;
                             continue;
@@ -1097 +1554 @@
                     
                     // Check if this it not a associate link
-                    if (!$_POST['element'][($i * 7) + 6]['associate']) {                    
+                    if (!$_POST['element'][($i * 9) + 8]['associate']) {
                         // Gennerate url array in url string
                         $url = '';
                         
                         $i2 = 0;
-                        foreach ($_POST['element'][($i * 7) + 3] as $value) {
+                        foreach ($_POST['element'][($i * 9) + 2] as $value) {
                             if ($i2 != 0) {
                                 $url .= '; ';
                             }
                             
-                            $url .= '<a href="' . $value . '" target="_blank">' . $value . '</a>';
+                            $url .= '<a href="' . $value[0] . '" target="_blank">' . $value[0] . '</a>';
+                            
+                            // Fill array for all posted links
+                            $allPostedLinks[] = $value;
                             
                             $i2++;
                         }
                         
-                        // Fill array for all posted links
-                        foreach ($_POST['element'][($i * 7) + 4] as $value) {
-                            $allPostedLinks[] = $value;
-                        }
-                        
                         // Set element in entry building
-                        $element = $this->replaceEntryBuilding($_POST['element'][($i * 7)]['title'], $_POST['element'][($i * 7) + 2]['description'], $url, $_POST['element'][($i * 7) + 1]['tags']);
+                        $element = $this->replaceEntryBuilding(
+                            $_POST['element'][($i * 9)]['title'],
+                            $_POST['element'][($i * 9) + 5]['description'],
+                            $url,
+                            $_POST['element'][($i * 9) + 4]['tags'],
+                            $_POST['element'][($i * 9) + 1]['author'],
+                            $_POST['element'][($i * 9) + 7]['countwords']
+                        );
                         
                         // Check if a dynamic element is not in use an delete it
@@ -1143 +1605 @@
                 }
                 
+                $post_content_final = '';
+                
+                // Set introduction text if not empty
+                if (trim(get_option('wppocket_introduction_text')) != '') {
+                    $post_content_final .= $this->getReplacedIntroductionText($_POST['count_elements']);
+                }
+                
+                // Set links content
+                $post_content_final .= $post_content;
+                
                 // Set statements text if not empty
                 if (trim(get_option('wppocket_statements_text')) != '') {
-                    $post_content .= $this->getReplacedStatementsText();
+                    $post_content_final .= $this->getReplacedStatementsText($_POST['count_elements']);
                 }
                 
                 // Chech if reference to WP Pocket shot print
                 if (get_option('wppocket_reference_wppocket')) {
-                    $post_content .= '<p><i>This post was automatically created by WP Pocket. If you look for this WordPress plugin, check out <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a> now!</i></p>';
+                    $post_content_final .= '<p><i>This post was automatically created by WP Pocket. If you look for this WordPress plugin, check out <a href="http://wp-pocket.com/" target="_blank">WP-Pocket.com</a> now!</i></p>';
                 }
                 
@@ -1165 +1637 @@
                         'post_author' => $current_user->ID,
                         'post_category' => array(get_option('wppocket_post_category')),
-                        'post_content' => $post_content,
+                        'post_content' => $post_content_final,
                         'post_date' => date('Y-m-d H:i:s'),
                         'post_date_gmt' => gmdate('Y-m-d H:i:s'),
@@ -1188 +1660 @@
                     $i = 0;
                     while ($i < count($allPostedLinks)) {
-                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $allPostedLinks[$i] . '"';
+                        $sql = 'SELECT `id` FROM `' . $this->wpdb->prefix . 'wppocket_posted_links` WHERE `url`="' . $allPostedLinks[$i][1] . '"';
                         $row = $this->wpdb->get_results($sql);
                         
@@ -1206 +1678 @@
                                 $this->wpdb->prepare(
                                     $sql,
-                                    $allPostedLinks[$i],
+                                    $allPostedLinks[$i][1],
                                     $time
                                 )
@@ -1222 +1694 @@
                 // Check if link should marke as readed
                 if (get_option('wppocket_mark_as_readed')) {
-                    // JSON Start
-                    $markAsReaded = '{';
-                    
-                    // Fill JSON
+                    $markAsReaded = array();
+                    
+                    // Fill JSON as Array
                     $i = 0;
                     while ($i < count($allPostedLinks)) {
-                        if ($i != 0) {
-                            $markAsReaded .= ',';
+                        $markAsReaded[] = array(
+                            'action' => 'archive',
+                            'item_id' => $allPostedLinks[$i][2]
+                        );
+                        
+                        $i++;
+                        
+                        // Chech if limit of links reached. If yes, send request and start new sends array
+                        if (($i / 100) == round($i / 100)) {
+                            // Send request
+                            $this->cURL(
+                                'https://getpocket.com/v3/send',
+                                array(
+                                    'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                                    'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                                    'actions' => json_encode($markAsReaded)
+                                )
+                            );
+                            
+                            // Clean up array
+                            $markAsReaded = array();
                         }
-                        
-                        $markAsReaded .= '"' . $i . '":{"url":"' . $allPostedLinks[$i] . '"}';
+                    }
+                    
+                    // Send request
+                    $this->cURL(
+                        'https://getpocket.com/v3/send',
+                        array(
+                            'consumer_key' => $this->xcrypt(1, get_option('wppocket_pocket_consumer_key')),
+                            'access_token' => $this->xcrypt(1, get_option('wppocket_pocket_access_key')),
+                            'actions' => json_encode($markAsReaded)
+                        )
+                    );
+                }
+                
+                // Send statistics, if allowed
+                if (get_option('wppocket_statistics') == 1) {
+                    $allLinksForStatisics = array();
+                    $i = 0;
+                    while ($i < count($allPostedLinks)) {
+                        $allLinksForStatisics[] = $allPostedLinks[$i][0];
                         
                         $i++;
                     }
                     
-                    // JSON End
-                    $markAsReaded .= '}';
-                    
-                    // Send request
-                    $responses = $this->cURL('https://readitlaterlist.com/v2/send?username=' . $this->xcrypt(1, get_option('wppocket_pocket_username')) . '&password=' . $this->xcrypt(1, get_option('wppocket_pocket_password')) . '&apikey=' . $this->xcrypt(1, get_option('wppocket_pocket_api_key')) . '&read=' . urlencode($markAsReaded), 10);
-                }
-            }
+                    $this->statisticsPublishPost($allLinksForStatisics);
+                }
+            }
+        }
+        
+        // Statisics send to WP-Pocket.com: Update version
+        private function statisticsUpdateVersion() {
+            // Get Data
+            $url = explode('?', ((empty($_SERVER['HTTPS'])) ? 'http' : 'https') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+            $url = $url[0];
+            $type = 'update';
+            $versions = array('from' => get_option('wppocket_version'), 'to' => $this->version);
+            
+            // Gennerate JSON Array
+            $data = array(
+                'url' => $url,
+                'type' => $type,
+                'update' => $versions
+            );
+            
+            @$this->cURL(
+                'http://pluginstats.wp-pocket.com/index.php',
+                array(
+                    'data' => json_encode($data)
+                )
+            );
+        }
+        
+        // Statisics send to WP-Pocket.com: Publish post
+        private function statisticsPublishPost($links) {
+            echo 'HERO!';
+            
+            // Get Data
+            $url = explode('?', ((empty($_SERVER['HTTPS'])) ? 'http' : 'https') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+            $url = $url[0];
+            $type = 'publish';
+            
+            // Gennerate JSON Array
+            $data = array(
+                'url' => $url,
+                'type' => $type,
+                'links' => $links
+            );
+            
+            echo $this->cURL(
+                'http://pluginstats.wp-pocket.com/index.php',
+                array(
+                    'data' => json_encode($data)
+                )
+            );
         }
     }