Changeset 356609

Timestamp:

03/07/2011 12:11:36 PM (15 years ago)

Author:

ajferg

Message:

 

Location:

flickr-press/trunk

Files:

• admin.css (modified) (2 diffs)
• flickr-admin.php (modified) (10 diffs)
• flickr-public.php (modified) (8 diffs)
• flickr.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

flickr-press/trunk/admin.css

@@ -38 +38 @@
 form.flickr { }
 form.flickr p { clear:left; }
-form.flickr p label { width:8em; float:left; padding-top:0.3em; }
+form.flickr p label { width:11em; float:left; padding-top:0.3em; }
 form.flickr p input { width:22em; }
 form.flickr p input.save { width:auto; }
@@ -50 +50 @@
 #tabFlickrAlbums .album p { clear:none; }
 
-form#FlickrClearAuth { float:right; }
+form#FlickrClearAuth, form#ClearFlickrCache { float:right; }

flickr-press/trunk/flickr-admin.php

@@ -1 +1 @@
 <?php
 
-
-
-
-class FlickrPress_Admin extends FlickrPress_Options {
+/**
+ *  FlickrPress Admin Class
+ */
+class FlickrPress extends FlickrPress_Base {
     
     function __construct() {
         // Pre-load Options
         $this->load_options();
-        if (!$this->opts) { $this->load_default_options(); }
         // Admin Menu
         add_action('admin_menu', array(&$this,'admin_menu'));
         add_filter('plugin_action_links', array(&$this,'plugin_action_links'), 10, 2);
+        // Save Settings
+        add_action('admin_init', array(&$this,'settings_page_save'), 12);
         // Activation hook
         register_activation_hook( FLICKR_PLUGIN_DIR.'/flickr.php', array( &$this, 'activation_hook' ) );
+        // Only want to load our Flickr wrapper if we have the key set.
+        if (!empty($this->opts['api']['key']) && !empty($this->opts['api']['secret'])) {
+            add_action('admin_init', array(&$this,'load_flickr'));
+        }
+        // Warnings for admin area
+        add_action('admin_notices', array(&$this,'admin_warning_pretty_permalinks'));
+        add_action('admin_notices', array(&$this,'admin_warning_settings'));
+        
+    }
+    // PHP 4 Constructor
+    function FlickrPress() {
+        $this->construct();
+    }
+    
+    function admin_warning_pretty_permalinks() {
+        if ('' != get_option( 'permalink_structure'))   return;
+        echo '<div id="message" class="updated fade"><p><strong>Warning:</strong> FlickrPress will not work properly until you 
+                <a href="'.admin_url('options-permalink.php').'">set up your Permalinks</a>.</div>'."\n";
+    }
+    
+    function admin_warning_settings() {
+        if (empty($this->opts['api']['key']) || empty($this->opts['api']['secret'])) {
+            echo '<div id="message" class="updated fade"><p><strong>Warning:</strong> FlickrPress will not work until you 
+                    <a href="'.admin_url('options-general.php?page=flickr').'">enter your Flickr API Settings</a>.</div>'."\n";
+        } else 
+        if (empty($this->opts['user']['token'])) {
+            echo '<div id="message" class="updated fade"><p><strong>Warning:</strong> FlickrPress will not work until you 
+                    <a href="'.admin_url('options-general.php?page=flickr').'">authorize with your Flickr account</a>.</div>'."\n";
+        } else
+        if (empty($this->opts['flickr_page'])) {
+            echo '<div id="message" class="updated fade"><p><strong>Warning:</strong> FlickrPress will not work until you 
+                    <a href="'.admin_url('options-general.php?page=flickr').'">choose a page to show your albumns on</a>.</div>'."\n";
+        }
     }
     
@@ -26 +60 @@
         wp_enqueue_script('flickr', FLICKR_PLUGIN_URL.'/admin.js', array('jquery', 'jquery-ui-tabs') );
         wp_enqueue_style('flickr', FLICKR_PLUGIN_URL.'/admin.css');
-        // Only want to load our Flickr wrapper on the right pages.
-        if (!empty($this->opts['api']['key']) && !empty($this->opts['api']['key'])) {
-            $this->load_flickr();
-        }
     }
     
@@ -39 +69 @@
     
     
-    
-    
-    function settings_page() {
-        echo '<div class="wrap">'."\n";
-        echo '<h2>Flickr Settings</h2>'."\n";
-        
+    function settings_page_save() {
+        // Make sure we're supposed to run...
+        if (empty($_POST))                                          return;
+        if (!wp_verify_nonce($_POST['_wpnonce'], $this->nonce))     return;
+        // Clean & Secure all POST data
+        $_POST = $this->slash_array($_POST);
         // Clear API Details?
         if (isset($_POST['ClearAPI'])) {
-            if (!wp_verify_nonce($_POST['_wpnonce'], $this->nonce)) { echo '<p class="alert">Invalid Security</p></div>'."\n"; return;  }
             $this->opts['api'] = array();
             $this->opts['user'] = array();
             $this->flickr = false;
-            echo '<div id="message" class="updated fade"><p><strong>Your API settings have been cleared.  You may now re-enter your details.</strong></p></div>';
-            $this->save_options();
-        }
-        // Save the API Key to Options
+            $this->save_options();
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>Your API settings have been cleared.  You may now re-enter your details.</strong></p></div>';
+        }
+        // Save general options
+        if (isset($_POST['SaveGeneral'])) {
+            $this->opts['flickr_page']      = $_POST['sel_flickr_page'];
+            $this->opts['flickr_position']  = $_POST['flickrSelPosition'];
+            $this->opts['new_windows']      = $_POST['flickrOpenWindow'];
+            $this->opts['hide_private']     = $_POST['flickrHidePrivate'];
+            $this->save_options();
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>General settings saved.</strong></p></div>';
+        }
+        // Save API Key and Secret
         if (isset($_POST['SaveAPI'])) {
-            if (!wp_verify_nonce($_POST['_wpnonce'], $this->nonce)) { echo '<p class="alert">Invalid Security</p></div>'."\n"; return;  }
-            $this->opts = array_merge($this->opts, array(
-                'api' => array(
-                    'key'   => trim(stripslashes($_POST['apiKey'])),
-                    'secret'=> trim(stripslashes($_POST['apiSecret'])),
-                )
-            ));
-            $this->save_options();
-            echo '<div id="message" class="updated fade"><p><strong>Your new settings have been saved.</strong></p></div>';
+            $this->opts['api'] = array( 'key'=>$_POST['apiKey'], 'secret'=>$_POST['apiSecret']);
+            $this->save_options();
             $this->load_flickr();
-        }
-        // Save authorisation data to Options
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>Your Flickr API Key has been saved.</strong></p></div>';
+        }
+        // Save our Flickr FROB token (authenticate with Flickr)
         if (isset($_POST['SaveFlickrToken'])) {
-            if (!wp_verify_nonce($_POST['_wpnonce'], $this->nonce)) { echo '<p class="alert">Invalid Security</p></div>'."\n"; return;  }
-            $frob = trim(stripslashes($_POST['frob']));
-            $token = $this->flickr->auth_getToken($frob);
+            $token = $this->flickr->auth_getToken($_POST['frob']);
             $this->opts['user'] = array(
                 'ID'    => $token['user']['nsid'],
@@ -80 +110 @@
             );
             $this->save_options();
-            echo '<div id="message" class="updated fade"><p><strong>Flickr Authorised.</strong></p></div>';
-        }
-        // Save General Options
-        if (isset($_POST['SaveGeneral'])) {
-            $this->opts['flickr_page'] = trim(stripslashes($_POST['sel_flickr_page']));
-            $this->opts['new_windows'] = (trim($_POST['flickrOpenWindow']=='Yes')) ? true : false;
-            $this->opts['hide_private'] = (trim($_POST['flickrHidePrivate']=='Yes')) ? true : false;
-            $this->save_options();
-            echo '<div id="message" class="updated fade"><p><strong>General Settings Saved.</strong></p></div>';
-        }
-        // Save Albums tab
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>Flickr Authorised.</strong></p></div>';
+        }
+        // Save Album Settings
         if (isset($_POST['SaveAlbumSettings'])) {
-            if (!wp_verify_nonce($_POST['_wpnonce'], $this->nonce)) { echo '<p class="alert">Invalid Security</p></div>'."\n"; return;  }
             $this->opts['hide_albums'] = (is_array($_POST['hide_album'])) ? array_values($_POST['hide_album']) : array();
             $this->save_options();
-            echo '<div id="message" class="updated fade"><p><strong>Album Settings Saved.</strong></p></div>';
-        }
-        
-        // Warning message:  Must save API Key before plugin is active.
-        if (empty($this->opts['api']['key']))
-            echo '<div id="message" class="updated fade"><p>You need to provide an <strong>API Key.</strong></p></div>';
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>Album Settings Saved.</strong></p></div>';
+        }
+        // Force a refresh - clear cached data
+        if (isset($_POST['ClearFlickrCache'])) {
+            global $wpdb;
+            $sql = "DELETE FROM `{$this->flickr->cache_table}`;";
+            $wpdb->query($sql);
+            $this->update_message = '<div id="message" class="updated fade"><p><strong>Flickr cache has been cleared.</strong></p></div>';
+        }
+        
+    }
+    
+    function settings_page() {
+        echo '<div class="wrap">'."\n";
+        echo '<h2>Flickr Settings</h2>'."\n";
+        
+        //echo '<pre>'; print_r($_POST); echo '</pre>';
+        if ($this->update_message)  echo $this->update_message;
         
         // Tickbox
@@ -116 +149 @@
 </ul><!-- tcTabMenu -->
 <div id="tabSettings">
-  <form id="flickrAPI" class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>">
+  <form class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>">
     <?php wp_nonce_field($this->nonce); ?>
     <p><label for="sel_flickr_page">Flickr Page</label>
@@ -127 +160 @@
                  )); 
         ?></p>
+    <p><label for="flickrSelPosition">Auto-add Position:</label>
+            <select name="flickrSelPosition" id="flickrSelPosition">
+            <?php
+            $poss_positions = array(
+                'below' => 'After existing page content',
+                'above' => 'Before existing page content',
+            );
+            foreach ($poss_positions as $pos => $label) {
+                $sel = ($this->opts['flickr_position'] == $pos) ? ' selected="selected"' : '';
+                echo '<option value="'.$pos.'"'.$sel.'>'.$label.'</option>';
+            }
+            ?>
+            </select></p>
     <p class="tick"><label><input type="checkbox" name="flickrOpenWindow" id="flickrOpenWindow" value="Yes" <?php echo $sel_window; ?>/>
         Open links to Flickr in a new window?</label></p>
@@ -134 +180 @@
         <input type="submit" name="SaveGeneral" value="Save Changes" class="button-primary save" /></p>
   </form>
-</div><!-- tab -->
+</div>
 <div id="tabFlickrAPI">
-    <?php
-    if (!is_object($this->flickr)) {
-        // Ask for Flickr Key + Secret
-        ?>
-          <form id="flickrAPI" class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAPI">
-            <?php wp_nonce_field($this->nonce); ?>
-            <p><label for="apiKey">Flickr API Key</label>
-                <input type="text" name="apiKey" id="apiKey" value="<?php echo $this->opts['api']['key']; ?>" /></p>
-            <p><label for="apiSecret">Shared Secret</label>
-                <input type="text" name="apiSecret" id="apiSecret" value="<?php echo $this->opts['api']['secret']; ?>" /></p>
-            <p><label>&nbsp;</label>
-                <input type="submit" name="SaveAPI" value="Save Changes" class="button-primary save" /></p>
-          </form>
-          <p>Sign into Flickr and <a href="http://www.flickr.com/services/apps/" target="_blank">get your API key here</a>.</p>
         <?php
-    } else {
+        if (!is_object($this->flickr)) {
+            // Ask for Flickr Key + Secret
+            ?>
+            <form class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAPI">
+                <?php wp_nonce_field($this->nonce); ?>
+                <p><label for="apiKey">Flickr API Key</label>
+                    <input type="text" name="apiKey" id="apiKey" value="<?php echo $this->opts['api']['key']; ?>" /></p>
+                <p><label for="apiSecret">Shared Secret</label>
+                    <input type="text" name="apiSecret" id="apiSecret" value="<?php echo $this->opts['api']['secret']; ?>" /></p>
+                <p><label>&nbsp;</label>
+                    <input type="submit" name="SaveAPI" value="Save Changes" class="button-primary save" /></p>
+                <p>Sign into Flickr and <a href="http://www.flickr.com/services/apps/" target="_blank">get your API key here</a>.</p>
+            </form>
+            <?php
+        } else
         if ($this->flickr !== false && empty($this->opts['user']['token'])) {
             // We have the key, but not yet authorized
             $frob = $this->flickr->auth_getFrob();
             $api_sig = md5( $this->flickr->secret.'api_key'.$this->flickr->api_key.'frob'.$frob.'perms'.$this->perms);
-        ?>
-          <p><strong>Flickr API Key:</strong> <?php echo $this->opts['api']['key']; ?></p>
-          <p><strong>Shared Secret:</strong> <?php echo $this->opts['api']['secret']; ?></p>
-          
-          <p>You must now link your flickr account to this site.</p>
-          <form id="FlickrGetAuth" method="get" action="http://flickr.com/services/auth/" target="_blank">
-            <input type="hidden" name="api_key" value="<?php echo $this->flickr->api_key; ?>" />
-            <input type="hidden" name="frob" value="<?php echo $frob; ?>" />
-            <input type="hidden" name="perms" value="<?php echo $this->perms; ?>" />
-            <input type="hidden" name="api_sig" value="<?php echo $api_sig; ?>" />
-            <p>Step 1: <input type="submit" class="button-secondary" value="Authorize Flickr" /></p>
-          </form>
-          <form id="FlickrGetToken" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>">
-            <?php wp_nonce_field($this->nonce); ?>
-            <input type="hidden" name="frob" value="<?php echo $frob; ?>" />
-            <p>Step 2: <input type="submit" name="SaveFlickrToken" value="Save Changes" class="button-secondary" /></p>
-          </form>
-        <?php
+            ?>
+            <form id="FlickrClearAuth" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAPI">
+                <?php wp_nonce_field($this->nonce); ?>
+                <input type="submit" name="ClearAPI" value="Clear these details" class="button-secondary" />
+            </form>
+            <p><strong>Flickr API Key:</strong> <?php echo $this->opts['api']['key']; ?></p>
+            <p><strong>Shared Secret:</strong> <?php echo $this->opts['api']['secret']; ?></p>
+            <p>You must now link your flickr account to this site.</p>
+            <form id="FlickrGetAuth" method="get" action="http://flickr.com/services/auth/" target="_blank">
+                <input type="hidden" name="api_key" value="<?php echo $this->flickr->api_key; ?>" />
+                <input type="hidden" name="frob" value="<?php echo $frob; ?>" />
+                <input type="hidden" name="perms" value="<?php echo $this->perms; ?>" />
+                <input type="hidden" name="api_sig" value="<?php echo $api_sig; ?>" />
+                <p>Step 1: <input type="submit" class="button-secondary" value="Authorize Flickr" /></p>
+            </form>
+            <form id="FlickrGetToken" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>">
+                <?php wp_nonce_field($this->nonce); ?>
+                <input type="hidden" name="frob" value="<?php echo $frob; ?>" />
+                <p>Step 2: <input type="submit" name="SaveFlickrToken" value="Save Changes" class="button-secondary" /></p>
+            </form>
+            <?php
         } else {
-        ?>
+            ?>
           <form id="FlickrClearAuth" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAPI">
              <?php wp_nonce_field($this->nonce); ?>
@@ -183 +232 @@
           <p><strong>Shared Secret:</strong> <?php echo $this->opts['api']['secret']; ?></p>
           <p>Your are now linked to your Flickr account, and can display photos on your site.</p>
-        <?php
-        }
-    }
-    ?>
-</div><!-- tab -->
+            <?php
+        }
+        ?>
+</div>
 <?php   if (is_object($this->flickr) && !empty($this->opts['user']['token'])) { ?>
 <div id="tabFlickrAlbums">
-    <form id="flickrAlbums" class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAlbums">
-    <?php wp_nonce_field($this->nonce); ?>
+  <form id="ClearFlickrCache" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAlbums">
+     <?php wp_nonce_field($this->nonce); ?>
+     <input type="submit" name="ClearFlickrCache" value="Clear the Flickr Cache" class="button-secondary" />
+  </form>
+  <form class="flickr" method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>#tabFlickrAlbums">
+    <?php wp_nonce_field($this->nonce); ?>
     <?php
     $result = $this->flickr->photosets_getList($this->opts['user']['ID']);
@@ -217 +269 @@
     <p><label>&nbsp;</label>
         <input type="submit" name="SaveAlbumSettings" value="Save Changes" class="button-primary save" /></p>
-    </form>
+  </form>
 </div>
-<?php   } // flickr object                                                      ?>
+<?php   }   // if $flickr token set     ?>
 </div><!-- tabContainer -->
+
+
         <?php
-        
+//      echo '<pre>'; print_r($this->opts); echo '</pre>';
+//      echo '<pre>'; print_r($this->flickr); echo '</pre>';
         echo '</div>'."\n";
-        //echo '<pre>'; print_r($this->opts); echo '</pre>';
-    }
-    
+    }
     
 }
@@ -232 +285 @@
 
 
-
 ?>

flickr-press/trunk/flickr-public.php

@@ -1 +1 @@
 <?php
 
-
 /**
- *  Public display
+ *  FlickrPress Public Class
  */
-class FlickrPress_Public extends FlickrPress_Options {
-    
-    /**
-     *  Public display
+class FlickrPress extends FlickrPress_Base {
+    
+    /** 
+     *  Constructor
      */
     function __construct() {
         // Pre-load Options
         $this->load_options();
-        if (!$this->opts) { $this->load_default_options(); }
-        // Let's get started...
+        // Let's get started... This will hijack page requests for use of FlickrPress
         add_action('template_redirect', array(&$this,'hijack_page'));
+    }
+    // PHP 4 Constructor
+    function FlickrPress() {
+        $this->construct();
     }
     
@@ -57 +59 @@
         return $image;
     }
-
-    
-
+    
     /**
      *  Response Headers
@@ -74 +74 @@
     }
     
+    
     /**
      *  Hijack page content
@@ -83 +84 @@
         $request_uri = (($_SERVER['HTTPS'] != 'on') ? 'http://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
         if (substr($request_uri, 0, strlen($permalink)) !== $permalink) return;
-        // Load flickr object
+        // Load flickr object - only if we're on a FlickrPress page
         if (empty($this->opts['user']['token'])) return;
         $this->load_flickr();
@@ -89 +90 @@
         wp_enqueue_script('flickrpress', FLICKR_PLUGIN_URL.'/custom.js', array('jquery') );
         wp_enqueue_style('flickrpress', FLICKR_PLUGIN_URL.'/custom.css');
-        
         //echo '<h1>Marker: Running Flickr Hijack</h1>';
         
@@ -106 +106 @@
         }
     }
-    
-    
-    // Filter wp_title to get <title>  But some themes don't just use wp_title, keep that in mind.
     
     
@@ -206 +203 @@
         }
         echo '</div><!-- flickr_photosets -->'."\n";
-        $content .= ob_get_clean();
+        $output = ob_get_clean();
+        // Append or Prepend content?
+        if ($this->opts['flickr_position'] == 'below')  $content = $content.$output;
+        else                                            $content = $output.$content;
+        // Return content
         return $content;
     }
@@ -283 +284 @@
     }
     
-    
 }
 
-
-
 ?>

flickr-press/trunk/flickr.php

@@ -3 +3 @@
 Plugin Name:    Flickr Press
 Description:    Use this plugin to display your Flickr photosets on your WordPress site.
-Version:        1.2
+Version:        1.3
 Author:         Anthony Ferguson
 Author URI:     http://www.fergusweb.net/
@@ -9 +9 @@
 */
 
-/*
-Make this worth with Thesis & other themes too.
-
-Offer a tickbox for "Enable Lightbox"
-That way, clicking on a photo-page opens Lightbox for full-size ?
-
-Make sure caching works - do I need a "refresh" / purge cache function?
-
-Close comments on Album & Photo Views
-*/
 
 // Definitions
@@ -26 +16 @@
 // Include required files
 require_once(FLICKR_PLUGIN_DIR.'/phpflickr-3.0/phpFlickr.php');
-require_once(FLICKR_PLUGIN_DIR.'/flickr-includes.php');
-require_once(FLICKR_PLUGIN_DIR.'/flickr-admin.php');
-require_once(FLICKR_PLUGIN_DIR.'/flickr-public.php');
 
-// Launch Plugin
 if (is_admin()) {
-    $FlickrAdmin = new FlickrPress_Admin();
+    require_once(FLICKR_PLUGIN_DIR.'/flickr-admin.php');
 } else {
-    $FlickrPublic = new FlickrPress_Public();
+    require_once(FLICKR_PLUGIN_DIR.'/flickr-public.php');
+}
+
+// Launch whichever class we loaded (public | admin)
+new FlickrPress();
+
+
+
+/**
+ *  Extend the phpFlickr class to overwrite a few things.
+ */
+class phpFlickrPress extends phpFlickr {
+    var $hide_private = true;
+    var $max_cache_rows = 1000;
+    var $cache_expire   = false;        // Seconds, from $this->enableCache()
+    
+    function enableCache($table, $cache_expire=60) {
+        global $wpdb;
+        // Set up connection
+        $this->cache = 'db';
+        $this->cache_table = $wpdb->prefix.$table;
+        $this->cache_db = $wpdb->dbh;
+        $this->cache_expire = $cache_expire;
+        // Will remove any expired rows from database - runs on load.
+        $sql = "DELETE FROM `{$this->cache_table}` WHERE `expiration` <= '".$this->current_time()."'";
+        $wpdb->query($sql);
+//      echo $sql.'<br><br>';
+        
+        return; //??        Not using 'max_cache_rows' just yet.  Come back for this later.
+        
+        // If we have more than the max rows cached, purge all expired and start over
+        $result = mysql_fetch_row(mysql_query("SELECT COUNT(*) FROM {$this->cache_table}", $this->cache_db));
+        if ( $result[0] > $this->max_cache_rows ) {
+            mysql_query("DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL {$this->cache_expire} second)", $db);       // TODO:  Use WP time function instead of SQL. Consistent.
+            mysql_query('OPTIMIZE TABLE ' . $this->cache_table, $db);
+        }
+    }
+    
+    // Use this for a request to filter private photos.  Calls parent request() to avoid duplicating a very big function
+    function request($command, $args=array(), $nocache=false) {
+        if ($this->hide_private) {
+            $args['privacy_filter'] = 1;
+        }
+        parent::request($command, $args, $nocache);
+    }
+    
+    function hash_request($request) {
+        foreach ($request as $key=>$val) {
+            if (empty($val) || $key=='api_sig')     unset($request[$key]);
+            else                                    $request[$key] = (string) $val;
+        }
+        return md5(serialize($request));
+    }
+    function cache($request, $response) {
+        global $wpdb;
+        // Prep our 'request' key
+        $hash = $this->hash_request($request);
+        // Figure out if UPDATE or INSERT is appropriate
+        $result = $wpdb->get_var("SELECT COUNT(*) FROM `{$this->cache_table}` WHERE `request` = '{$hash}'");
+        if ($result) {
+            $sql = "UPDATE `{$this->cache_table}` SET `response` = '".$wpdb->escape($response)."', `expiration` = '".$this->expiry_time()."' WHERE `request` = '{$hash}';";
+        } else {
+            $sql = "INSERT INTO `{$this->cache_table}` (`request` , `response` , `expiration`) VALUES ( '{$hash}', '".$wpdb->escape($response)."', '".$this->expiry_time()."' );";
+        }
+        $wpdb->query($sql);
+    }
+    
+    function getCached($request) {
+        global $wpdb;
+        // Prep our 'request' key
+        $hash = $this->hash_request($request);
+        // Check database for cached result for this request.  Returns unparsed result, or FALSE
+        $row = $wpdb->get_row("SELECT `response` FROM `{$this->cache_table}` WHERE `request` = '{$hash}' AND `expiration` > '".$this->current_time()."'");
+        return (is_object($row)) ? $row->response : false;
+    }
+    
+    function current_time() {
+        return gmdate( 'Y-m-d H:i:s', (time() + (get_option('gmt_offset') * 3600)));
+    }
+    function expiry_time() {
+        return gmdate( 'Y-m-d H:i:s', (strtotime("+{$this->cache_expire} seconds", time() + (get_option('gmt_offset') * 3600))));
+    }
+    
 }
 
 
 
+/**
+ *  Base Class
+ *      Contains our common functions & variables
+ *      Other classes will extend this
+ */
+class FlickrPress_Base {
+    protected $option_key   = 'flickr-options';
+    protected $nonce        = 'flickrpress';
+    protected $perms        = 'read';               // The permissions we require from Flickr
+    protected $opts         = false;
+    protected $flickr       = false;                // Will store our flickr wrapper when relevant.
+    protected $cache_table  = 'flickr_cache';       // Use this for the Flickr Cache.  Prefix added later.
+
+    // Default Options
+    function load_default_options() {
+        $this->opts = array(
+            'api'               => array( 'key'=>'', 'secret'=>''),
+            'user'              => array('ID'=>'', 'login'=>'', 'name'=>'', 'token'=>'', 'frob'=>''),
+            'flickr_page'       => false,
+            'flickr_position'   => 'below', // insert before/after existing content (initial list of albums)
+            'new_windows'       => true,
+            'hide_private'      => true,
+            'hide_albums'       => array(), // array of album IDs to NOT display on blog.
+        );
+    }
+    // Option Helpers
+    function load_options() {
+        $this->opts = get_option($this->option_key);
+        if (!$this->opts || !is_array($this->opts))     $this->load_default_options();
+    }
+    function save_options($options = false) {
+        if (!$options) { $options = $this->opts; }
+        update_option($this->option_key, $options);
+        $this->load_options();
+    }
+    
+    // $_POST cleaner : recursive
+    function slash_array($array=false) {
+        if (!is_array($array)) { return trim(stripslashes($array)); }
+        foreach($array as $key=>$value) {
+                $array[$key] = (!is_array($value)) ? trim(stripslashes($value)) : $this->slash_array($value);
+        }
+        return $array;
+    }
+
+    // Load the Flickr wrapper
+    function load_flickr() {
+        // Ensure options are loaded
+        if (!$this->opts) return false;
+        // Setup Object
+        $this->flickr = new phpFlickrPress($this->opts['api']['key'], $this->opts['api']['secret']);
+        $this->flickr->hide_private = $this->opts['hide_private'];
+        $this->flickr->enableCache($this->cache_table);
+    }
+    
+    // Create table on activation
+    // Packaged class attempts creation on every call, this is a more efficient method
+    function activation_hook() {
+        global $wpdb;
+        $this->cache_table = $wpdb->prefix.$this->cache_table;
+        if ($wpdb->get_var("show tables like '{$this->cache_table}'") == $this->cache_table) return;
+        $sql = "CREATE TABLE ".$this->cache_table." (
+                    request CHAR(35) NOT NULL,
+                    response MEDIUMTEXT NOT NULL,
+                    expiration DATETIME NOT NULL,
+                    INDEX (request)
+                ) TYPE = MYISAM;";
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+        dbDelta($sql);
+    }
+    
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ?>

flickr-press/trunk/readme.txt

@@ -2 +2 @@
 Contributors:       ajferg
 Tags:               flickr, photo, gallery
-Requires at least:  3.0
-Tested up to:       3.0.1
-Stable tag:         1.2
+Requires at least:  3.1
+Tested up to:       3.1
+Stable tag:         1.3
 
 Use this plugin to display your Flickr photosets on your WordPress site.
@@ -31 +31 @@
 Sure - just mark the photo as 'private' in your Flickr account, and tick the "Hide private photos" setting your WordPress admin area.
 
+= Why am I getting 404 errors? =
+Maybe you haven't set up "pretty permalinks" yet.  If you're still using the default permalink structure (site.com/?p=3) then you're going to have some problems.
+
+= How do I apply my own CSS rules? =
+The plugin contains a file called "skeleton.css".  Copy/paste the contents of this to your theme's custom CSS file, and over-ride any style rules you like.
+
 == Changelog ==
+
+= 1.3 =
+* Better "Clear API Settings" buttons should you need to unlink from your Flickr account
+* Better cache system to reduce calls to Flickr API
+* Admin includes button to "Clear Flickr Cache", causing you to immediately refresh all your data from Flickr
+* Extensively re-written to fix some reported bugs
+* Feature: You can now select whether to insert your initial list of albums before or after your existing page content
 
 = 1.2 =