Changeset 608978

Timestamp:

10/06/2012 10:35:17 PM (13 years ago)

Author:

jankarres

Message:

tagging version 1.0.3

Location:

wp-pocket

Files:

• tags/1.0.3 (copied) (copied from wp-pocket/trunk)
• tags/1.0.3/readme.txt (copied) (copied from wp-pocket/trunk/readme.txt) (2 diffs)
• tags/1.0.3/screenshot-1.png (copied) (copied from wp-pocket/trunk/screenshot-1.png)
• tags/1.0.3/wp-pocket.php (copied) (copied from wp-pocket/trunk/wp-pocket.php) (5 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/wp-pocket.php (modified) (5 diffs)

wp-pocket/tags/1.0.3/readme.txt

@@ -5 +5 @@
 Requires at least: 3.4
 Tested up to: 3.4
-Stable tag: 1.0.2
+Stable tag: 1.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -52 +52 @@
 == Changelog ==
 
+= 1.0.3 =
+Fix API-Key bug on install
+
 = 1.0.2 =
 Fix encryption bug of the Pocket username, password and api key

wp-pocket/tags/1.0.3/wp-pocket.php

@@ -6 +6 @@
     Author: Jan Karres
     Author URI: http://www.jankarres.de/
-    Version: 1.0.2
+    Version: 1.0.3
 */
 
@@ -24 +24 @@
             
             // Set plugin version
-            $this->version = '1.0.2';
+            $this->version = '1.0.3';
         
             // Check WP version
@@ -70 +70 @@
 
         function activate() {
-            // 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] == '')
-            ) {
-                // Update Pocket username, password and api-key
-                update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
-                update_option('wppocket_pocket_password', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_password'), true)));
-                update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_api_key'), true)));
-            }
-            
             // Create database table for links
             $sql = '
@@ -121 +109 @@
             ';
             $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] == '')
+            ) {
+                // Update Pocket username, password and api-key
+                update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
+                update_option('wppocket_pocket_password', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_password'), true)));
+                update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_api_key'), true)));
+            }
+            
+            // Save API Key
             $sql = '
             INSERT IGNORE INTO `' . $this->wpdb->prefix . 'options` (
@@ -809 +810 @@
                             $getLinks = $tmp;
                         }
-                        
+                        echo '<pre>';
+                        print_r($getLinks);
+                        echo '</pre>';
                         if (count((array)$getLinks->list) == 0) { // No elements
                             ?>

wp-pocket/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.4
 Tested up to: 3.4
-Stable tag: 1.0.2
+Stable tag: 1.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -52 +52 @@
 == Changelog ==
 
+= 1.0.3 =
+Fix API-Key bug on install
+
 = 1.0.2 =
 Fix encryption bug of the Pocket username, password and api key

wp-pocket/trunk/wp-pocket.php

@@ -6 +6 @@
     Author: Jan Karres
     Author URI: http://www.jankarres.de/
-    Version: 1.0.2
+    Version: 1.0.3
 */
 
@@ -24 +24 @@
             
             // Set plugin version
-            $this->version = '1.0.2';
+            $this->version = '1.0.3';
         
             // Check WP version
@@ -70 +70 @@
 
         function activate() {
-            // 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] == '')
-            ) {
-                // Update Pocket username, password and api-key
-                update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
-                update_option('wppocket_pocket_password', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_password'), true)));
-                update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_api_key'), true)));
-            }
-            
             // Create database table for links
             $sql = '
@@ -121 +109 @@
             ';
             $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] == '')
+            ) {
+                // Update Pocket username, password and api-key
+                update_option('wppocket_pocket_username', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_username'), true)));
+                update_option('wppocket_pocket_password', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_password'), true)));
+                update_option('wppocket_pocket_api_key', $this->xcrypt(0, $this->xcrypt(1, get_option('wppocket_pocket_api_key'), true)));
+            }
+            
+            // Save API Key
             $sql = '
             INSERT IGNORE INTO `' . $this->wpdb->prefix . 'options` (
@@ -809 +810 @@
                             $getLinks = $tmp;
                         }
-                        
+                        echo '<pre>';
+                        print_r($getLinks);
+                        echo '</pre>';
                         if (count((array)$getLinks->list) == 0) { // No elements
                             ?>