Changeset 172726

Timestamp:

11/12/2009 07:42:44 PM (16 years ago)

Author:

fsimo

Message:

0.9.1

Location:

wp2flickr/trunk

Files:

• functions.php (modified) (1 diff)
• getToken.php (modified) (1 diff)
• phpFlickr/phpFlickr.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• wp2flickr.php (modified) (5 diffs)

wp2flickr/trunk/functions.php

@@ -17 +17 @@
 
     function w2f_setToken(){
-        delete_option('w2f_token');
-        delete_option('w2f_user');
-        add_option('w2f_token',$_GET['token']); 
-        add_option('w2f_user',$_GET['user']);
-        echo 'Token updated<br /><br />';
+        if (!empty($_GET['token'])) {
+            delete_option('w2f_token');
+            delete_option('w2f_user');
+            add_option('w2f_token',$_GET['token']); 
+            add_option('w2f_user',$_GET['user']);
+            echo 'Token updated<br /><br />';
+        } else {
+            echo 'Error updating token';
+        }
     }
     
     function w2f_testUpload(){
-        $flickr= new phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
+        $flickr= new w2f_phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
         $flickr->setToken(get_option('w2f_token'));
         $flickr_id=$flickr->sync_upload(dirname(__FILE__)."/DSC_1518.jpg", "test", "Hello, goodbye", "tags", 0,0,0 ); 

wp2flickr/trunk/getToken.php

@@ -4 +4 @@
     require_once("config.php");
 
-    $f=new phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
+    $f=new w2f_phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
     $callbak2wp=$_SESSION['setTokenLink'];
     $f->auth("write",$callbak2wp);

wp2flickr/trunk/phpFlickr/phpFlickr.php

@@ -42 +42 @@
 // ini_set('include_path', dirname(__FILE__) . '/PEAR' . $path_delimiter . ini_get('include_path'));
 
-class phpFlickr {
+class w2f_phpFlickr {
     var $api_key;
     var $secret;
@@ -74 +74 @@
     var $max_cache_rows = 1000;
 
-    function phpFlickr ($api_key, $secret = NULL, $die_on_error = false)
+    function w2f_phpFlickr ($api_key, $secret = NULL, $die_on_error = false)
     {
         //The API Key must be set before any calls can be made.  You can

wp2flickr/trunk/readme.txt

@@ -3 +3 @@
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ZCCHQ2ZHUGHDG&lc=US&item_name=wp2flickr%20plugin%20donation&item_number=wp2flickr&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted
 Tags: yapb,  photoblog, photo blog, photo blogging, images, yet another photoblog, flickr, flickr upload
-Requires at least: 2.5
+Requires at least: 2.8.4
 Tested up to: 2.8.5
-Stable tag: 0.9
+Stable tag: 0.9.1
 
 Uploads photos from WordPress posts to Flickr.
@@ -20 +20 @@
 == Installation ==
 Download and activate.
-Go to Settings->wp2flickr menu and follow the steps 
+Go to Settings->wp2flickr menu and follow the steps.
 
 == Frequently Asked Questions ==
@@ -31 +31 @@
 == Changelog ==
 
+= 0.9.1 =
+* Add manual token option for problems with callback to flickr
+* Rename phpFlickr class to avoid collitions with other plugins
+* if token is not set exit publish hook
+
 = 0.9 =
 * Initial public released version

wp2flickr/trunk/wp2flickr.php

@@ -3 +3 @@
     Plugin Name: wp2flickr
     Plugin URI: http://wp2flickr.com/
-    Description: upload YAPB photos to flickr
-    Version: 0.9
+    Description: upload photos from posts to flickr (standard media or YAPB)
+    Version: 0.9.1
     Author: Fran Simó
     Author URI: http://fransimo.info/
@@ -34 +34 @@
 function w2f_publish($post_id){
     if(w2f_check_record($post_id)) { return $post_id; } //publish hook is called whereever is a new public or a save of alredey published
-    
+    if(''==get_option('w2f_token')) { return $post_id; }  //if token is not set exit
 
     $post=get_post($post_id);
@@ -86 +86 @@
         
         if (!$imageFilePath=='') {
-            $flickr= new phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
+            $flickr= new w2f_phpFlickr(w2f_flickrAPI,w2f_flickrAPI_secret,false);
             $flickr->setToken(get_option('w2f_token'));
             if (get_option('w2f_flickr_URL')) { 
@@ -229 +229 @@
         echo "<form action=".wp_specialchars( $_SERVER['REQUEST_URI'] )." method=\"post\">";
         echo '<table>';
-        echo '<tr><td>';
-        
+        echo '<tr valign="top"><td>';
+        
+        echo "Token";
+        echo '</td><td>';
+        $v=get_option('w2f_token');
+        echo '<input type="text" name="form_w2f_token" size=50 value="'.$v.'"/><br />';
+        echo 'This value should be set automatically in step 1 (flickr authorization) ';
+        echo '</td></tr><tr valign="top"><td>';
+                
         echo "Is public? ";
         echo '</td><td>';
@@ -287 +294 @@
 
 function w2f_updateOptions() {
+    update_option( 'w2f_token', stripslashes( $_REQUEST['form_w2f_token']  ) );
     $v=($_REQUEST['form_w2f_flickr_is_public']=='on') ? 1 : 0;
     update_option( 'w2f_flickr_is_public', $v );