Changeset 409240

Timestamp:

07/13/2011 01:44:36 PM (14 years ago)

Author:

parelius

Message:

Version 1.0.1

Location:

ssp-director-tools/trunk

Files:

• css/sspdt-admin.css (modified) (1 diff)
• css/sspdt.css (modified) (1 diff)
• feed/feed.php (modified) (4 diffs)
• feed/includes/Encryption.php (modified) (1 diff)
• feed/includes/PhotoFeed.php (modified) (6 diffs)
• feed/includes/api/Album.php (modified) (1 diff)
• feed/includes/api/App.php (modified) (1 diff)
• feed/includes/api/Cache.php (modified) (2 diffs)
• feed/includes/api/Content.php (modified) (1 diff)
• feed/includes/api/DirectorPHP.php (modified) (13 diffs)
• feed/includes/api/Format.php (modified) (1 diff)
• feed/includes/api/Gallery.php (modified) (1 diff)
• feed/includes/api/User.php (modified) (2 diffs)
• feed/includes/api/Utils.php (modified) (4 diffs)
• includes/Encryption.php (modified) (1 diff)
• includes/SSPDT.php (modified) (17 diffs)
• includes/SSPDT_Widget.php (modified) (2 diffs)
• includes/api/Album.php (modified) (1 diff)
• includes/api/App.php (modified) (1 diff)
• includes/api/Cache.php (modified) (2 diffs)
• includes/api/Content.php (modified) (1 diff)
• includes/api/DirectorPHP.php (modified) (13 diffs)
• includes/api/Format.php (modified) (1 diff)
• includes/api/Gallery.php (modified) (1 diff)
• includes/api/User.php (modified) (2 diffs)
• includes/api/Utils.php (modified) (4 diffs)
• includes/api/cache/clear.php (modified) (1 diff)
• includes/helpers.php (modified) (1 diff)
• includes/shortcodes.php (modified) (2 diffs)
• includes/sspdt-options-page.php (modified) (6 diffs)
• js/fancybox/jquery.fancybox-1.3.4.css (modified) (6 diffs)
• languages/sspdt-de_DE.mo (modified) (previous)
• languages/sspdt-de_DE.po (modified) (3 diffs)
• readme.txt (modified) (5 diffs)
• ssp-director-tools.php (modified) (7 diffs)

ssp-director-tools/trunk/css/sspdt-admin.css

@@ -1 +1 @@
 td.thcol {
-    font-size : 13px;
-
+    font-size: 13px;
 }
 
 .sspdt_handling_icon {
-    vertical-align : middle;
-    padding-right : 6px;
+    vertical-align: middle;
+    padding-right: 6px;
 }
 
 .sspdt_thumb {
-    text-align : left;
+    text-align: left;
 }
 
 p.wp-caption-text {
-    margin-bottom : 0px !important;
+    margin-bottom: 0px !important;
 }
-

ssp-director-tools/trunk/css/sspdt.css

@@ -1 +1 @@
 div.sspdt_feedlink {
-    vertical-align:middle;
-    margin-top:10px
+    vertical-align: middle;
+    margin-top: 10px
 }
 
 div.sspdt_feedlink img {
-    margin-right:6px;
-    vertical-align:middle;
-    border-style:none;
+    margin-right: 6px;
+    vertical-align: middle;
+    border-style: none;
 }
 
 div.sspdt_feedlink a {
-    vertical-align:middle;
+    vertical-align: middle;
 }
 
 .sspdt_grid {
-    border-style:none !important;
+    border-style: none !important;
 }
 
 .sspdt_thumb {
-    border-style:none !important;
+    border-style: none !important;
 }

ssp-director-tools/trunk/feed/feed.php

@@ -4 +4 @@
 require_once 'includes/PhotoFeed.php';
 require_once 'includes/config.php';
+include_once 'includes/Testing.php';
 
 
@@ -13 +14 @@
  * @return array
  */
-function doubleExplode ($del1, $del2, $array){ 
-    
-    $array1 = explode("$del1", $array); 
-    foreach($array1 as $key=>$value){ 
-        
-        $array2 = explode("$del2", $value); 
-        foreach($array2 as $key2=>$value2){ 
-            $array3[] = $value2;  
-        } 
-    } 
-    $afinal = array();
-    
-    for ( $i = 0; $i <= count($array3); $i += 2) { 
-        if($array3[$i]!=""){ 
-        $afinal[trim($array3[$i])] = trim($array3[$i+1]); 
-        } 
-    } 
-    
-    return $afinal; 
+function doubleExplode ($del1, $del2, $array){
+
+    $array1 = explode("$del1", $array);
+    foreach($array1 as $key=>$value){
+
+        $array2 = explode("$del2", $value);
+        foreach($array2 as $key2=>$value2){
+            $array3[] = $value2;
+        }
+    }
+    $afinal = array();
+
+    for ( $i = 0; $i <= count($array3); $i += 2) {
+        if($array3[$i]!=""){
+            $afinal[trim($array3[$i])] = trim($array3[$i+1]);
+        }
+    }
+
+    return $afinal;
 }
 
@@ -38 +39 @@
 $decrypted_options = $crypt->decode($_GET['p']);
 
-if(md5($decrypted_options) != $_GET['c']) die('So nicht!');
+if(md5($decrypted_options) != $_GET['c']) die('Incorrect feed parameters.');
 
 $options = doubleExplode('&', '=', $decrypted_options);
@@ -44 +45 @@
 $feed->rss($options);
 
+
 ?>

ssp-director-tools/trunk/feed/includes/Encryption.php

@@ -2 +2 @@
 
 class Encryption {
-    
+
     var $skey;
-    
+
     public function __construct($secret){
         $this->skey = $secret;
     }
- 
-    public  function safe_b64encode($string) {
- 
-        $data = base64_encode($string);
-        $data = str_replace(array('+','/','='),array('-','_',''),$data);
-        return $data;
-    }
- 
+
+    public  function safe_b64encode($string) {
+
+        $data = base64_encode($string);
+        $data = str_replace(array('+','/','='),array('-','_',''),$data);
+        return $data;
+    }
+
     public function safe_b64decode($string) {
-        $data = str_replace(array('-','_'),array('+','/'),$string);
-        $mod4 = strlen($data) % 4;
-        if ($mod4) {
-            $data .= substr('====', $mod4);
-        }
-        return base64_decode($data);
-    }
- 
-    public  function encode($value){ 
- 
-        if(!$value){return false;}
-        $text = $value;
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->skey, $text, MCRYPT_MODE_ECB, $iv);
-        return trim($this->safe_b64encode($crypttext)); 
-    }
- 
-    public function decode($value){
- 
-        if(!$value){return false;}
-        $crypttext = $this->safe_b64decode($value); 
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->skey, $crypttext, MCRYPT_MODE_ECB, $iv);
-        return trim($decrypttext);
-    }
+        $data = str_replace(array('-','_'),array('+','/'),$string);
+        $mod4 = strlen($data) % 4;
+        if ($mod4) {
+            $data .= substr('====', $mod4);
+        }
+        return base64_decode($data);
+    }
+
+    public  function encode($value){
+
+        if(!$value){return false;}
+        $text = $value;
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->skey, $text, MCRYPT_MODE_ECB, $iv);
+        return trim($this->safe_b64encode($crypttext));
+    }
+
+    public function decode($value){
+
+        if(!$value){return false;}
+        $crypttext = $this->safe_b64decode($value);
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->skey, $crypttext, MCRYPT_MODE_ECB, $iv);
+        return trim($decrypttext);
+    }
 }
 

ssp-director-tools/trunk/feed/includes/PhotoFeed.php

@@ -5 +5 @@
 
 class PhotoFeed extends Director {
-    
+
     public $formats;
     public $api_path;
-    
+
     public function __construct($key, $path, $preview, $full) {
         parent::__construct ( $key, $path , true );
         $this->add_formats($preview, $full);
-        $this->api_path = $path;    
+        $this->api_path = $path;
+        $this->cache->set('sspdt');
     }
-    
-    
+
+
     private function add_formats($preview, $full) {
             
@@ -25 +26 @@
 
     }
-    
+
     public function rss($opts) {
-        
+
         if(!isset($opts)) return;
-        
+
         $options = array();
-        
+
         $options['only_images'] = '1';
-        
+
         if($opts['model'] == "gallery" || $opts['model'] == "album") {
             $scope = array ($opts['model'], (int) $opts['model_id']);
             $options['scope'] = $scope;
         }
-        
+
         if((int) $opts['limit'] > 0) {
             $options['limit'] = $opts['limit'];
         }
-        
+
         if($opts['tags'] != "") {
             $options['tags'] = array($opts['tags'], $opts['tagmode']);
         }
-        
+
         if($opts['sort_on'] != "null") {
             $options['sort_on'] = $opts['sort_on'];
             $options['sort_direction'] = $opts['sort_direction'];
         }
-    
+
         if($opts['sort_on' == "random"]) {
             return;
         }
-        
+
         //$this->debug($options);
-        
+
         $contents = $this->content->all($options);
-        
+
         if($opts['model'] == 'gallery') {
             $bulk = $this->gallery->get($opts['model_id']);
@@ -70 +71 @@
         $modified = date('r', (int) $bulk->modified );
         $protocol = $_SERVER['HTTPS'] != "" ? 'https://' : 'http://';
-        
+
         header('Content-type: application/rss+xml');
-        
+
         print("<?xml version='1.0' encoding='UTF-8' ?>\n");
-        print("<rss version='2.0' 
+        print("<rss version='2.0'
         xmlns:dc='http://purl.org/dc/elements/1.1/' 
         xmlns:media='http://search.yahoo.com/mrss/' 
@@ -87 +88 @@
         printf("        <generator>%s</generator>\n", "SSP Director Tools – WordPress Plugin");
         printf("        <atom:link href='%s' rel='self' type='application/rss+xml' />\n", $protocol . urlencode( $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ));
-        
+
         foreach ($contents as $content){
-            
+                
             $description = "<img src='".$content->preview->url."' /><p>". ( $content->caption ? $this->prep($content->caption) : $this->prep($content->iptc->caption) ) ."</p>";
             $url = $content->full->url;
             $filesize = $content->filesize;
             $guid = 'http://' . $this->api_path . '/content/' . $content->id;
-            
+                
             printf("        <item>\n");
             printf("            <title>%s</title>\n", $content->title ? ($content->title) : $content->src);
@@ -112 +113 @@
             printf("            <dc:date.Taken>%s</dc:date.Taken>\n", date('c', (int) $content->captured_on));
             printf("        </item>\n");
-            
+                
         }
-        
+
         print(" </channel>\n");
         print("</rss>\n");
     }
-    
+
     private function prep($string) {
         return  ( htmlspecialchars( $string, ENT_QUOTES, 'UTF-8', false ) );
     }
-    
+
     private function debug( $var ) {
         echo "<pre>";
@@ -128 +129 @@
         echo "</pre>";
     }
-    
+
 }
 

ssp-director-tools/trunk/feed/includes/api/Album.php

@@ -6 +6 @@
         return $this->parent->send('get_album', $options);
     }
-    
+
     public function all($options = array()) {
         $response = $this->parent->send('get_album_list', $options);
         return $response->albums;
     }
-    
+
     public function galleries($album_id, $options = array()) {
         if (isset($options['exclude']) && is_array($options['exclude'])) {

ssp-director-tools/trunk/feed/includes/api/App.php

@@ -6 +6 @@
         return $response->version;
     }
-    
+
     public function limits() {
         $response = $this->parent->send('app_limits');
         return $response;
     }
-    
+
     public function totals() {
         $response = $this->parent->send('app_totals');

ssp-director-tools/trunk/feed/includes/api/Cache.php

@@ -2 +2 @@
 
 class DirectorCache extends DirectorWrapper {
-    
+
     function set($key, $expires = '+1 hour') {
         $this->parent->cache_key = $key;
         $this->parent->expires = $expires;
     }
-    
+
     function disable() {
         $this->parent->cache = false;
     }
-    
+
     function get($tail = '') {
         $filename = $this->parent->cache_path . $this->parent->cache_key . DIRECTORY_SEPARATOR . $tail;
@@ -29 +29 @@
         }
     }
-    
+
     function fill($data, $tail) {
         $filename = $this->parent->cache_path . $this->parent->cache_key . DIRECTORY_SEPARATOR . $tail;

ssp-director-tools/trunk/feed/includes/api/Content.php

@@ -7 +7 @@
         return $response;
     }
-    
+
     public function all($options = array()) {
         if (isset($options['scope']) && !empty($options['scope'])) {

ssp-director-tools/trunk/feed/includes/api/DirectorPHP.php

@@ -4 +4 @@
  * DirectorPHP API class
  * Version 1.5
-*/
+ */
 
 class Director {
-    
+
     # Fill in your API key here. It can be found on your Director preferences pane,
     # under the "About your install" section.
     public $api_key = '';
-    
+
     # Path to your Director install
-    # This can also be found on your preferences pane, below the API key        
+    # This can also be found on your preferences pane, below the API key
     public $path = '';
-    
+
     ##
     # DO NOT EDIT BEYOND THIS POINT
     ##
-    
+
     public $endpoint;
     public $sizes = array();
@@ -35 +35 @@
     public $cache_invalidator;
     public $user_scope = array();
-    
+
     function __construct($api_key = '', $path = '', $debug = true) {
         $this->debug = $debug;
@@ -41 +41 @@
             $this->handle_error('The DirectorPHP class requires the cURL library.');
         }
-        
+
         if (!function_exists('json_decode')) {
             $this->handle_error('The DirectorPHP class requires the PHP 5.2.x or higher or the php-json PECL library.');
         }
-        
+
         if (!empty($api_key)) {
             $this->api_key = $api_key;
         }
-        
+
         if (!empty($path)) {
             $this->path = $path;
         }
-        
+
         $this->api_key = trim($this->api_key);
         $this->path = str_replace('http://', '', rtrim($this->path, '/'));
-        
+
         if (empty($this->api_key) || empty($this->path)) {
             $this->handle_error('You must specify an API key and install path.');
         }
-        
+
         if (preg_match('/^(local|hosted)\-(.*)/', $this->api_key, $matches)) {
             if ($matches[1] == 'local') {
@@ -73 +73 @@
         if ($this->is_local) {
             $this->endpoint .= '/index.php?';
-        } 
+        }
         $this->endpoint .= '/api/';
 
@@ -92 +92 @@
         $this->user = new DirectorUser($this);
     }
-    
+
     /********************************************************
-        
-        public functions
-        
-        Only methods in this class or a subclass of 
-        this class can call these methods.
-    
+
+    public functions
+
+    Only methods in this class or a subclass of
+    this class can call these methods.
+
     ********************************************************/
-    
+
     protected function format_sizes() {
         if (!empty($this->sizes)) {
@@ -109 +109 @@
             }
         }
-        
+
         if (!empty($this->preview)) {
             $temp_arr = array($this->preview['width'], $this->preview['height'], $this->preview['crop'], $this->preview['quality'], $this->preview['sharpening']);
@@ -115 +115 @@
             $this->params[] = 'preview=' . $preview;
         }
-        
+
         if (!empty($this->user_sizes)) {
             foreach($this->user_sizes as $key => $size) {
@@ -123 +123 @@
         }
     }
-    
+
     public function send($method, $options = array()) {
         if ($this->dead) {
@@ -143 +143 @@
                 }
             }
-            
+                
             $this->format_sizes();
-            
+                
             $params_str = join('&', $this->params);
             $this->params = array();
-            
+                
             $tail = md5($params_str);
-            
+                
             if ($this->cache && !empty($this->cache_key)) {
                 $cache = true;
@@ -158 +158 @@
                 $return = array();
             }
-            
+                
             if (empty($return)) {
                 if ($cache) {
                     $params_str .= '&invalidator[path]=' . $this->cache_invalidator . '&invalidator[name]=' . $this->cache_key . '/' . $tail;
                 }
-                $ch = curl_init($this->endpoint . $method . '?' . $params_str); 
-                
+                $ch = curl_init($this->endpoint . $method . '?' . $params_str);
+
                 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                 $return = trim(curl_exec($ch));
@@ -179 +179 @@
             }
 
-            $response = json_decode($return);   
+            $response = json_decode($return);
 
             if (!empty($response->error)) {
@@ -190 +190 @@
         }
     }
-    
+
     function handle_error($msg) {
         if ($this->debug) {
@@ -198 +198 @@
         }
     }
-    
+
 }
 

ssp-director-tools/trunk/feed/includes/api/Format.php

@@ -5 +5 @@
         $this->parent->sizes[] = $arr;
     }
-    
+
     public function user($arr) {
         $this->parent->user_sizes[] = $arr;
     }
-    
+
     public function preview($arr) {
         $this->parent->preview = $arr;
     }
-    
+
     public function clear() {
         $this->parent->preview = array();
         $this->parent->sizes = array();
-    }   
+    }
 }
 

ssp-director-tools/trunk/feed/includes/api/Gallery.php

@@ -7 +7 @@
         return $response;
     }
-    
+
     public function all($options = array()) {
         $response = $this->parent->send('get_gallery_list', $options);

ssp-director-tools/trunk/feed/includes/api/User.php

@@ -2 +2 @@
 
 class DirectorUser extends DirectorWrapper {
-    
+
     function scope($options = array()) {
         $defaults = array('all' => false);
@@ -12 +12 @@
         }
     }
-    
+
     function all($options = array()) {
         if (!empty($this->parent->user_scope)) {

ssp-director-tools/trunk/feed/includes/api/Utils.php

@@ -2 +2 @@
 
 class DirectorUtils extends DirectorWrapper {
-    
+
     function is_video($fn) {
         if (eregi('\.flv|\.mov|\.mp4|\.m4a|\.m4v|\.3gp|\.3g2', $fn)) {
@@ -10 +10 @@
         }
     }
-    
+
     function is_image($filename) {
         if (!$this->is_video($filename)) {
@@ -18 +18 @@
         }
     }
-    
+
     function is_mobile() {
-         return preg_match('/(iPhone|iPad|Android 2)/',  $_SERVER['HTTP_USER_AGENT']);
+        return preg_match('/(iPhone|iPad|Android 2)/',  $_SERVER['HTTP_USER_AGENT']);
     }
-    
+
     function truncate($string, $limit = 40, $tail = '...') {
         if (strlen($string) > $limit) {
@@ -29 +29 @@
         return $string;
     }
-    
+
     public function convert_line_breaks($string, $br = true) {
         $string = preg_replace("/(\r\n|\n|\r)/", "\n", $string);

ssp-director-tools/trunk/includes/Encryption.php

@@ -2 +2 @@
 
 class Encryption {
-    
+
     var $skey;
-    
+
     public function __construct($secret){
         $this->skey = $secret;
     }
- 
-    public  function safe_b64encode($string) {
- 
-        $data = base64_encode($string);
-        $data = str_replace(array('+','/','='),array('-','_',''),$data);
-        return $data;
-    }
- 
+
+    public  function safe_b64encode($string) {
+
+        $data = base64_encode($string);
+        $data = str_replace(array('+','/','='),array('-','_',''),$data);
+        return $data;
+    }
+
     public function safe_b64decode($string) {
-        $data = str_replace(array('-','_'),array('+','/'),$string);
-        $mod4 = strlen($data) % 4;
-        if ($mod4) {
-            $data .= substr('====', $mod4);
-        }
-        return base64_decode($data);
-    }
- 
-    public  function encode($value){ 
- 
-        if(!$value){return false;}
-        $text = $value;
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->skey, $text, MCRYPT_MODE_ECB, $iv);
-        return trim($this->safe_b64encode($crypttext)); 
-    }
- 
-    public function decode($value){
- 
-        if(!$value){return false;}
-        $crypttext = $this->safe_b64decode($value); 
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->skey, $crypttext, MCRYPT_MODE_ECB, $iv);
-        return trim($decrypttext);
-    }
+        $data = str_replace(array('-','_'),array('+','/'),$string);
+        $mod4 = strlen($data) % 4;
+        if ($mod4) {
+            $data .= substr('====', $mod4);
+        }
+        return base64_decode($data);
+    }
+
+    public  function encode($value){
+
+        if(!$value){return false;}
+        $text = $value;
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->skey, $text, MCRYPT_MODE_ECB, $iv);
+        return trim($this->safe_b64encode($crypttext));
+    }
+
+    public function decode($value){
+
+        if(!$value){return false;}
+        $crypttext = $this->safe_b64decode($value);
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->skey, $crypttext, MCRYPT_MODE_ECB, $iv);
+        return trim($decrypttext);
+    }
 }
 

ssp-director-tools/trunk/includes/SSPDT.php

@@ -5 +5 @@
 /**
  * Class handles API calls to Director Server. Subclasses Director class.
- * @author Matthias Scheidl <matthias@scheidl.name>
+ * @author Matthias Scheidl <dev@scheidl.name>
  *
  */
 class SSPDT extends Director{
-    
+
     private $format_options;
     public $formats;
-    
-    
-    public function __construct( $api_key = '', $path = '', $debug = true, $format_options ) {
-        
+
+
+    public function __construct( $api_key = '', $path = '', $debug = false, $format_options ) {
+
         parent::__construct ( $api_key, $path, $debug );
         $this->format_options = $format_options;
-        $this->add_formats($format_options);        
+        $this->add_formats($format_options);
         
     }
-    
-    
+
+
     /**
      * Adds the needes formats as defined on the plugin options page.
@@ -28 +28 @@
      * @return void
      */
-    private function add_formats($format_options) { 
-        
-         $grid = array(
+    private function add_formats($format_options) {
+
+        $grid = array(
              'name' => 'grid', 
              'width' => $format_options['grid_width'], 
@@ -37 +37 @@
              'quality' => $format_options['grid_quality'], 
              'sharpening' => ($format_options['grid_sharpen'] == '1' ? 1 : 0)
-          );
-          
-          $thumb = array(
+        );
+
+        $thumb = array(
              'name' => 'thumb', 
              'width' => $format_options['thumb_width'], 
@@ -46 +46 @@
              'quality' => $format_options['thumb_quality'], 
              'sharpening' => ($format_options['thumb_sharpen'] == '1' ? 1 : 0)
-          );
-        
-          $large = array(
+        );
+
+        $large = array(
              'name' => 'large', 
              'width' => $format_options['large_width'], 
@@ -55 +55 @@
              'quality' => $format_options['large_quality'], 
              'sharpening' => ($format_options['large_sharpen'] == '1' ? 1 : 0)
-          );
-    
+        );
+
         $this->format->add($grid);
         $this->format->add($thumb);
         $this->format->add($large);
-        
+
         // Make our formats accessible more easily
         $this->formats['grid'] = $grid;
         $this->formats['thumb'] = $thumb;
         $this->formats['large'] = $large;
-        
-        
-    }
-    
+
+
+    }
+
     /**
      * Creates a grid of photos
@@ -77 +77 @@
      */
     public function photogrid($content_options, $context) {
-        
+
         $options = array();
         $params= "";
-        
+
         //show images, only
         $options['only_images'] = '1';
         $params .= "&only_images=1";
-    
+
         if($content_options['model'] == "gallery" || $content_options['model'] == "album") {
             $scope = array ($content_options['model'], (int) $content_options['model_id']);
@@ -91 +91 @@
             $params .= "&model_id=" . $content_options['model_id'];
         }
-        
+
         if((int) $content_options['limit'] > 0) {
             $options['limit'] = $content_options['limit'];
             $params .= "&limit=" . $content_options['limit'];
         }
-        
+
         if($content_options['tags'] != "") {
             $options['tags'] = array($content_options['tags'], $content_options['tagmode']);
@@ -102 +102 @@
             $params .= "&tagmode=" . $content_options['tagmode'];
         }
-        
+
         if($content_options['sort_on'] != "null") {
             $options['sort_on'] = $content_options['sort_on'];
@@ -109 +109 @@
             $params .= "&sort_direction=" . $content_options['sort_direction'];
         }
-    
+
         if($content_options['sort_on' == "random"]) {
             $this->cache->disable();
         }
-        
+
         if($context == 'post') {
             $rel = "post-" . get_the_ID();
@@ -121 +121 @@
 
         $params = substr($params, 1);
-        
+
         $feed_options = get_option('sspdt_feed_options');
-        $baseurl = $feed_options['feed_url'];
+        $baseurl = $feed_options['feed_url'] . 'feed.php';
         $secret = $feed_options['secret'];
-        
+
         $crypt = new Encryption($secret);
         $checksum = md5($params);
-        
+
         $feedurl = $baseurl . '?p=' . $crypt->encode($params) . '&c=' . $checksum;
 
         $contents = $this->content->all($options);
-        
+
         $out = ( "\n<div class='sspd_grid' style='display:block;margin-top:6px;'>\n" );
-    
+
         foreach( $contents as $content ) {
             $width =  (int)$content->grid->width;
@@ -143 +143 @@
     <img class='sspdt_grid' src='%s' alt='%s' width='%s' height='%s' type='image/jpeg'/>
 </a>\n", "fancybox", $rel, $content->large->url, $title, $content->grid->url, $alt, $width, $height);
-        } 
-        
+        }
+
         $out .= ( "</div>\n" );
         if($content_options['rss'] == '1' || $content_options == 'yes' && $content_options['sort_on'] != 'random') {
@@ -152 +152 @@
         $out .= "\n";
 
-        
+
         return $out;
     }
-    
+
     /**
      *  Creates a single content item (image)
-     *  @param integer $image A unique Director content ID 
+     *  @param integer $image A unique Director content ID
      *  @param string $align attribute for image alignment: left|center|right
      *  @param string $showcaption attribute determines if captions shall be shown: yes|no
@@ -165 +165 @@
      */
     public function single($image, $align, $showcaption, $post_id) {
-        
+
         $content = $this->content->get($image);
         $large = $content->large->url;
         $thumb = $content->thumb->url;
         $title = $content->caption ? $this->prep($content->caption) : "";
-        
+
         $width =  (int)$content->thumb->width;
         $height = (int)$content->thumb->height;
@@ -178 +178 @@
         $rel = "post-" . $post_id;
         $alt = $content->caption ? $this->prep($content->caption) : "";
-        
+
         if($showcaption) {
             $caption = ($content->caption) ? $this->prep($content->caption) : $this->prep($content->iptc->caption);
-            
+                
             if($caption != "") {
                 return sprintf("<div id='sspdt-content-%s' class='wp-caption %s' style='width:%spx'>
@@ -191 +191 @@
                 $image, $align, $captionwidth, "fancybox", $large, $rel, $title, $thumb, $alt, $width, $height, $caption);
             }
-        } 
-        
+        }
+
         return sprintf("<a class='%s sspdt_thumb' href='%s' rel='%s' title='%s'>
             <img class='%s' src='%s' alt='%s' width='%s' height='%s' />
@@ -199 +199 @@
 
     }
-    
+
     /**
      * Prepares a string for HTML output
@@ -209 +209 @@
     }
 
-    
+
 }
 

ssp-director-tools/trunk/includes/SSPDT_Widget.php

@@ -5 +5 @@
 /**
  * Our widget class extending WP_Widget class
- * @author Matthias Scheidl <matthias@scheidl.name>
+ * @author Matthias Scheidl <dev@scheidl.name>
  *
  */
 class SSPDT_Widget extends WP_Widget {
-    
-
-    function SSPDT_Widget() {
-        $widget_ops = array( 
+
+
+    function SSPDT_Widget() {
+        $widget_ops = array(
             'classname' => 'SSPDT_Widget', 
             'description' => __('Displays a photogrid populated with SSP Director content.', 'sspdt')
-            ); 
+        );
         $control_ops = array (
             'width' => '300',
             'height' => '200'
-        );
-        parent::WP_Widget(false, $name = __('Director Photogrid', 'sspdt'), $widget_options = $widget_ops, $control_options = $control_ops);
-    }
-    
-    
-    /**
-     * Create the widget form
-     * @param array $instance Our instance variables
-     * @return void
-     */
-    function form($instance) {
-        $defaults = array(
+            );
+            parent::WP_Widget(false, $name = __('Director Photogrid', 'sspdt'), $widget_options = $widget_ops, $control_options = $control_ops);
+    }
+
+
+    /**
+     * Create the widget form
+     * @param array $instance Our instance variables
+     * @return void
+     */
+    function form($instance) {
+        $defaults = array(
             'title' => __('Title', 'sspdt'), 
             'model' => 'album', 
@@ -40 +40 @@
             'sort_direction' => 'DESC',
             'element' => 'h3'
-        ); 
-        
-        $instance = wp_parse_args( (array) $instance, $defaults );
-        $title = $instance['title'];
-        $model = $instance['model'];
-        $model_id = $instance['model_id'];
-        $limit = $instance['limit'];
-        $tags = $instance['tags'];
-        $tagmode = $instance['tagmode'];
-        $sort_on = $instance['sort_on'];
-        $sort_direction = $instance['sort_direction'];
-        $element = $instance['element'];
-        
-        ?>  
-            <p><?php  _e('Title', 'sspdt'); ?>
-                <input class="widefat" name="<?php echo $this->get_field_name( 'title' ); ?>"  type="text" value="<?php echo esc_attr( $title ); ?>" />
-            </p>
-            <p><?php _e('Surrounding HTML Element', 'sspdt'); ?>
-                <select name="<?php echo $this->get_field_name( 'element' ); ?>" style="min-width:60px;">
-                    <option value="h2" <?php if(esc_attr($element) == 'h2') {echo "selected"; } ?>>h2</option>
-                    <option value="h3" <?php if(esc_attr($element) == 'h3') {echo "selected"; } ?>>h3</option>
-                    <option value="p" <?php if(esc_attr($element) == 'p') {echo "selected"; } ?>>p</option>
-                </select>
-            </p>
-            <p><?php  _e('Scope', 'sspdt'); ?><br />
-                <select name="<?php echo $this->get_field_name( 'model' ); ?>" onchange="model_on_change();">
-                    <option value="null" <?php if(esc_attr($model) == 'null') {echo "selected";}?>><?php _e('-- Not specified --', 'sspdt'); ?></option>
-                    <option value="gallery" <?php if(esc_attr($model) == 'gallery') {echo "selected";}?>><?php _e('Gallery', 'sspdt'); ?></option>
-                    <option value="album" <?php if(esc_attr($model) == 'album') {echo "selected";}?>><?php _e('Album', 'sspdt'); ?></option>
-                </select>
-                ID <input name="<?php echo $this->get_field_name( 'model_id' ); ?>" size="3" type="text" value="<?php echo esc_attr( $model_id ); ?>" />
-            </p>
-            <p>
-                <?php  printf(__('Limit to <input name="%s" type="text" size="3" value="%s"/> images.', 'sspdt'), esc_attr($this->get_field_name( 'limit' )), $limit); ?>
-            </p>
-            <p><?php  _e('Tags', 'sspdt'); ?>
-                <input  name="<?php echo $this->get_field_name('tags'); ?>" type="text" value="<?php echo esc_attr($tags); ?>"/>
-                <select name="<?php echo $this->get_field_name( 'tagmode' ); ?>">
-                    <option value="all" <?php if(esc_attr($tagmode) == 'all') {echo "selected";}?> ><?php _e('all', 'sspdt'); ?></option>
-                    <option value="one" <?php if(esc_attr($tagmode) == 'null') {echo "selected";}?> ><?php _e('one', 'sspdt'); ?></option>
-                </select>
-            </p>
-            <p><?php  _e('Sort by', 'sspdt'); ?>
-                <select id="sort_on" name="<?php echo $this->get_field_name( 'sort_on' ); ?>" style="min-width:120px;" onchange="sort_on_change();">
-                    <option value="null" <?php if($sort_on == 'null') {echo "selected";} ?> ><?php _e('-- Not specified --', 'sspdt'); ?></option>
-                    <option value="created_on" <?php if($sort_on == 'created_on') {echo "selected";} ?> ><?php _e('Creation Date', 'sspdt'); ?></option>
-                    <option value="captured_on" <?php if($sort_on == 'captured_on') {echo "selected";} ?> ><?php _e('Capture Date', 'sspdt'); ?></option>
-                    <option value="modified_on" <?php if($sort_on == 'modified_on') {echo "selected";} ?> ><?php _e('Modification Date', 'sspdt'); ?></option>
-                    <option value="filename" <?php if($sort_on == 'filename') {echo "selected";} ?> ><?php _e('File Name', 'sspdt'); ?></option>
-                    <option value="random" <?php if($sort_on == 'random') {echo "selected";} ?> ><?php _e('Random', 'sspdt'); ?></option>
-                </select>
-                <select id="sort_direction" name="<?php echo $this->get_field_name( 'sort_direction' ); ?>" style="min-width:80px;" <?php if($sort_on == 'null' || $sort_on == null || $sort_on == 'random') {echo "disabled";} ?> >
-                    <option value="ASC" <?php if($sort_direction == 'ASC') {echo "selected";} ?> ><?php _e('ascending', 'sspdt'); ?></option>
-                    <option value="DESC" <?php if($sort_direction == 'DESC') {echo "selected";} ?> ><?php _e('descending', 'sspdt'); ?></option>
-                </select>
-            </p>
-
-        <?php 
-    }
-    
-    
-    /**
-     *  Update the widget
-     *  @param array $new_instance The new instance variables
-     *  @param array $old_instance The old instance varaiables
-     *  @return array $instance The new instance variables returned
-     */
-    function update($new_instance, $old_instance) {
-        $instance = $old_instance;
-        $instance['title'] = strip_tags( $new_instance['title'] );
-        $instance['model'] = strip_tags( $new_instance['model'] );
-        $instance['model_id'] = strip_tags( $new_instance['model_id'] );
-        $instance['limit'] = strip_tags( $new_instance['limit'] );
-        $instance['tags'] = strip_tags( $new_instance['tags'] );
-        $instance['tagmode'] = strip_tags( $new_instance['tagmode'] );
-        $instance['sort_on'] = strip_tags( $new_instance['sort_on'] );
-        $instance['sort_direction'] = strip_tags( $new_instance['sort_direction'] );
-        $instance['element'] = strip_tags($new_instance['element'] );
-        return $instance;
-    }
-    
-    
-    
-    /**
-     *  Display the widget in the frontend
-     *  @param array $args
-     *  @param array $instance
-     *  @return void
-     */
-    function widget( $args, $instance ) {
-        extract($args);
-        
-        $sspdt = new SSPDT(get_option('sspdt_api_key'), get_option('sspdt_api_path'), true, get_option('sspdt_format_options'));
-        
-        $title = apply_filters( 'widget_title', $instance['title'] );
-        $elem = $instance['element'];
-        
-        $presentation_ops = get_option('sspdt_helpers');
-        $presentation_helper = $presentation_ops['presentation_helper'];
-        $helper = array('class' => $presentation_helper );
- 
-        echo $before_widget;      
+            );
+
+            $instance = wp_parse_args( (array) $instance, $defaults );
+            $title = $instance['title'];
+            $model = $instance['model'];
+            $model_id = $instance['model_id'];
+            $limit = $instance['limit'];
+            $tags = $instance['tags'];
+            $tagmode = $instance['tagmode'];
+            $sort_on = $instance['sort_on'];
+            $sort_direction = $instance['sort_direction'];
+            $element = $instance['element'];
+
+            ?>
+<p>
+<?php  _e('Title', 'sspdt'); ?>
+    <input class="widefat"
+        name="<?php echo $this->get_field_name( 'title' ); ?>" type="text"
+        value="<?php echo esc_attr( $title ); ?>" />
+</p>
+<p>
+<?php _e('Surrounding HTML Element', 'sspdt'); ?>
+    <select name="<?php echo $this->get_field_name( 'element' ); ?>"
+        style="min-width: 60px;">
+        <option value="h2"
+        <?php if(esc_attr($element) == 'h2') {echo "selected"; } ?>>h2</option>
+        <option value="h3"
+        <?php if(esc_attr($element) == 'h3') {echo "selected"; } ?>>h3</option>
+        <option value="p"
+        <?php if(esc_attr($element) == 'p') {echo "selected"; } ?>>p</option>
+    </select>
+</p>
+<p>
+<?php  _e('Scope', 'sspdt'); ?>
+    <br /> <select name="<?php echo $this->get_field_name( 'model' ); ?>"
+        onchange="model_on_change();">
+        <option value="null"
+        <?php if(esc_attr($model) == 'null') {echo "selected";}?>>
+            <?php _e('-- Not specified --', 'sspdt'); ?>
+        </option>
+        <option value="gallery"
+        <?php if(esc_attr($model) == 'gallery') {echo "selected";}?>>
+            <?php _e('Gallery', 'sspdt'); ?>
+        </option>
+        <option value="album"
+        <?php if(esc_attr($model) == 'album') {echo "selected";}?>>
+            <?php _e('Album', 'sspdt'); ?>
+        </option>
+    </select> ID <input
+        name="<?php echo $this->get_field_name( 'model_id' ); ?>" size="3"
+        type="text" value="<?php echo esc_attr( $model_id ); ?>" />
+</p>
+<p>
+<?php  printf(__('Limit to <input name="%s" type="text" size="3" value="%s"/> images.', 'sspdt'), esc_attr($this->get_field_name( 'limit' )), $limit); ?>
+</p>
+<p>
+<?php  _e('Tags', 'sspdt'); ?>
+    <input name="<?php echo $this->get_field_name('tags'); ?>" type="text"
+        value="<?php echo esc_attr($tags); ?>" /> <select
+        name="<?php echo $this->get_field_name( 'tagmode' ); ?>">
+        <option value="all"
+        <?php if(esc_attr($tagmode) == 'all') {echo "selected";}?>>
+            <?php _e('all', 'sspdt'); ?>
+        </option>
+        <option value="one"
+        <?php if(esc_attr($tagmode) == 'null') {echo "selected";}?>>
+            <?php _e('one', 'sspdt'); ?>
+        </option>
+    </select>
+</p>
+<p>
+<?php  _e('Sort by', 'sspdt'); ?>
+    <select id="sort_on"
+        name="<?php echo $this->get_field_name( 'sort_on' ); ?>"
+        style="min-width: 120px;" onchange="sort_on_change();">
+        <option value="null"
+        <?php if($sort_on == 'null') {echo "selected";} ?>>
+            <?php _e('-- Not specified --', 'sspdt'); ?>
+        </option>
+        <option value="created_on"
+        <?php if($sort_on == 'created_on') {echo "selected";} ?>>
+            <?php _e('Creation Date', 'sspdt'); ?>
+        </option>
+        <option value="captured_on"
+        <?php if($sort_on == 'captured_on') {echo "selected";} ?>>
+            <?php _e('Capture Date', 'sspdt'); ?>
+        </option>
+        <option value="modified_on"
+        <?php if($sort_on == 'modified_on') {echo "selected";} ?>>
+            <?php _e('Modification Date', 'sspdt'); ?>
+        </option>
+        <option value="filename"
+        <?php if($sort_on == 'filename') {echo "selected";} ?>>
+            <?php _e('File Name', 'sspdt'); ?>
+        </option>
+        <option value="random"
+        <?php if($sort_on == 'random') {echo "selected";} ?>>
+            <?php _e('Random', 'sspdt'); ?>
+        </option>
+    </select> <select id="sort_direction"
+        name="<?php echo $this->get_field_name( 'sort_direction' ); ?>"
+        style="min-width: 80px;"
+            <?php if($sort_on == 'null' || $sort_on == null || $sort_on == 'random') {echo "disabled";} ?>>
+        <option value="ASC"
+        <?php if($sort_direction == 'ASC') {echo "selected";} ?>>
+            <?php _e('ascending', 'sspdt'); ?>
+        </option>
+        <option value="DESC"
+        <?php if($sort_direction == 'DESC') {echo "selected";} ?>>
+            <?php _e('descending', 'sspdt'); ?>
+        </option>
+    </select>
+</p>
+
+            <?php
+    }
+
+
+    /**
+     *  Update the widget
+     *  @param array $new_instance The new instance variables
+     *  @param array $old_instance The old instance varaiables
+     *  @return array $instance The new instance variables returned
+     */
+    function update($new_instance, $old_instance) {
+        $instance = $old_instance;
+        $instance['title'] = strip_tags( $new_instance['title'] );
+        $instance['model'] = strip_tags( $new_instance['model'] );
+        $instance['model_id'] = strip_tags( $new_instance['model_id'] );
+        $instance['limit'] = strip_tags( $new_instance['limit'] );
+        $instance['tags'] = strip_tags( $new_instance['tags'] );
+        $instance['tagmode'] = strip_tags( $new_instance['tagmode'] );
+        $instance['sort_on'] = strip_tags( $new_instance['sort_on'] );
+        $instance['sort_direction'] = strip_tags( $new_instance['sort_direction'] );
+        $instance['element'] = strip_tags($new_instance['element'] );
+        return $instance;
+    }
+
+
+
+    /**
+     *  Display the widget in the frontend
+     *  @param array $args
+     *  @param array $instance
+     *  @return void
+     */
+    function widget( $args, $instance ) {
+        extract($args);
+
+        $sspdt = new SSPDT(get_option('sspdt_api_key'), get_option('sspdt_api_path'), true, get_option('sspdt_format_options'));
+        
+        if(get_option('sspdt_api_cache')) {
+            $sspdt->cache->set('sspdt');
+        }
+
+        $title = apply_filters( 'widget_title', $instance['title'] );
+        $elem = $instance['element'];
+
+        $presentation_ops = get_option('sspdt_helpers');
+        $presentation_helper = $presentation_ops['presentation_helper'];
+        $helper = array('class' => $presentation_helper );
+
+        echo $before_widget;
         echo "<$elem class='widget-title'>$title</$elem>";
         echo $sspdt->photogrid($instance, 'widget');
-        echo $after_widget;
-    }
-    
+        echo $after_widget;
+    }
+
 }
 

ssp-director-tools/trunk/includes/api/Album.php

@@ -6 +6 @@
         return $this->parent->send('get_album', $options);
     }
-    
+
     public function all($options = array()) {
         $response = $this->parent->send('get_album_list', $options);
         return $response->albums;
     }
-    
+
     public function galleries($album_id, $options = array()) {
         if (isset($options['exclude']) && is_array($options['exclude'])) {

ssp-director-tools/trunk/includes/api/App.php

@@ -6 +6 @@
         return $response->version;
     }
-    
+
     public function limits() {
         $response = $this->parent->send('app_limits');
         return $response;
     }
-    
+
     public function totals() {
         $response = $this->parent->send('app_totals');

ssp-director-tools/trunk/includes/api/Cache.php

@@ -2 +2 @@
 
 class DirectorCache extends DirectorWrapper {
-    
+
     function set($key, $expires = '+1 hour') {
         $this->parent->cache_key = $key;
         $this->parent->expires = $expires;
     }
-    
+
     function disable() {
         $this->parent->cache = false;
     }
-    
+
     function get($tail = '') {
         $filename = $this->parent->cache_path . $this->parent->cache_key . DIRECTORY_SEPARATOR . $tail;
@@ -29 +29 @@
         }
     }
-    
+
     function fill($data, $tail) {
         $filename = $this->parent->cache_path . $this->parent->cache_key . DIRECTORY_SEPARATOR . $tail;

ssp-director-tools/trunk/includes/api/Content.php

@@ -7 +7 @@
         return $response;
     }
-    
+
     public function all($options = array()) {
         if (isset($options['scope']) && !empty($options['scope'])) {

ssp-director-tools/trunk/includes/api/DirectorPHP.php

@@ -4 +4 @@
  * DirectorPHP API class
  * Version 1.5
-*/
+ */
 
 class Director {
-    
+
     # Fill in your API key here. It can be found on your Director preferences pane,
     # under the "About your install" section.
     public $api_key = '';
-    
+
     # Path to your Director install
-    # This can also be found on your preferences pane, below the API key        
+    # This can also be found on your preferences pane, below the API key
     public $path = '';
-    
+
     ##
     # DO NOT EDIT BEYOND THIS POINT
     ##
-    
+
     public $endpoint;
     public $sizes = array();
@@ -35 +35 @@
     public $cache_invalidator;
     public $user_scope = array();
-    
+
     function __construct($api_key = '', $path = '', $debug = true) {
         $this->debug = $debug;
@@ -41 +41 @@
             $this->handle_error('The DirectorPHP class requires the cURL library.');
         }
-        
+
         if (!function_exists('json_decode')) {
             $this->handle_error('The DirectorPHP class requires the PHP 5.2.x or higher or the php-json PECL library.');
         }
-        
+
         if (!empty($api_key)) {
             $this->api_key = $api_key;
         }
-        
+
         if (!empty($path)) {
             $this->path = $path;
         }
-        
+
         $this->api_key = trim($this->api_key);
         $this->path = str_replace('http://', '', rtrim($this->path, '/'));
-        
+
         if (empty($this->api_key) || empty($this->path)) {
             $this->handle_error('You must specify an API key and install path.');
         }
-        
+
         if (preg_match('/^(local|hosted)\-(.*)/', $this->api_key, $matches)) {
             if ($matches[1] == 'local') {
@@ -73 +73 @@
         if ($this->is_local) {
             $this->endpoint .= '/index.php?';
-        } 
+        }
         $this->endpoint .= '/api/';
 
@@ -92 +92 @@
         $this->user = new DirectorUser($this);
     }
-    
+
     /********************************************************
-        
-        public functions
-        
-        Only methods in this class or a subclass of 
-        this class can call these methods.
-    
+
+    public functions
+
+    Only methods in this class or a subclass of
+    this class can call these methods.
+
     ********************************************************/
-    
+
     protected function format_sizes() {
         if (!empty($this->sizes)) {
@@ -109 +109 @@
             }
         }
-        
+
         if (!empty($this->preview)) {
             $temp_arr = array($this->preview['width'], $this->preview['height'], $this->preview['crop'], $this->preview['quality'], $this->preview['sharpening']);
@@ -115 +115 @@
             $this->params[] = 'preview=' . $preview;
         }
-        
+
         if (!empty($this->user_sizes)) {
             foreach($this->user_sizes as $key => $size) {
@@ -123 +123 @@
         }
     }
-    
+
     public function send($method, $options = array()) {
         if ($this->dead) {
@@ -143 +143 @@
                 }
             }
-            
+                
             $this->format_sizes();
-            
+                
             $params_str = join('&', $this->params);
             $this->params = array();
-            
+                
             $tail = md5($params_str);
-            
+                
             if ($this->cache && !empty($this->cache_key)) {
                 $cache = true;
@@ -158 +158 @@
                 $return = array();
             }
-            
+                
             if (empty($return)) {
                 if ($cache) {
                     $params_str .= '&invalidator[path]=' . $this->cache_invalidator . '&invalidator[name]=' . $this->cache_key . '/' . $tail;
                 }
-                $ch = curl_init($this->endpoint . $method . '?' . $params_str); 
-                
+                $ch = curl_init($this->endpoint . $method . '?' . $params_str);
+
                 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                 $return = trim(curl_exec($ch));
@@ -179 +179 @@
             }
 
-            $response = json_decode($return);   
+            $response = json_decode($return);
 
             if (!empty($response->error)) {
@@ -190 +190 @@
         }
     }
-    
+
     function handle_error($msg) {
         if ($this->debug) {
@@ -198 +198 @@
         }
     }
-    
+
 }
 

ssp-director-tools/trunk/includes/api/Format.php

@@ -5 +5 @@
         $this->parent->sizes[] = $arr;
     }
-    
+
     public function user($arr) {
         $this->parent->user_sizes[] = $arr;
     }
-    
+
     public function preview($arr) {
         $this->parent->preview = $arr;
     }
-    
+
     public function clear() {
         $this->parent->preview = array();
         $this->parent->sizes = array();
-    }   
+    }
 }
 

ssp-director-tools/trunk/includes/api/Gallery.php

@@ -7 +7 @@
         return $response;
     }
-    
+
     public function all($options = array()) {
         $response = $this->parent->send('get_gallery_list', $options);

ssp-director-tools/trunk/includes/api/User.php

@@ -2 +2 @@
 
 class DirectorUser extends DirectorWrapper {
-    
+
     function scope($options = array()) {
         $defaults = array('all' => false);
@@ -12 +12 @@
         }
     }
-    
+
     function all($options = array()) {
         if (!empty($this->parent->user_scope)) {

ssp-director-tools/trunk/includes/api/Utils.php

@@ -2 +2 @@
 
 class DirectorUtils extends DirectorWrapper {
-    
+
     function is_video($fn) {
         if (eregi('\.flv|\.mov|\.mp4|\.m4a|\.m4v|\.3gp|\.3g2', $fn)) {
@@ -10 +10 @@
         }
     }
-    
+
     function is_image($filename) {
         if (!$this->is_video($filename)) {
@@ -18 +18 @@
         }
     }
-    
+
     function is_mobile() {
-         return preg_match('/(iPhone|iPad|Android 2)/',  $_SERVER['HTTP_USER_AGENT']);
+        return preg_match('/(iPhone|iPad|Android 2)/',  $_SERVER['HTTP_USER_AGENT']);
     }
-    
+
     function truncate($string, $limit = 40, $tail = '...') {
         if (strlen($string) > $limit) {
@@ -29 +29 @@
         return $string;
     }
-    
+
     public function convert_line_breaks($string, $br = true) {
         $string = preg_replace("/(\r\n|\n|\r)/", "\n", $string);

ssp-director-tools/trunk/includes/api/cache/clear.php

@@ -1 +1 @@
 <?php
-    $names = explode(',', $_GET['name']);
-    foreach($names as $name) {
-        $name = str_replace('/', DIRECTORY_SEPARATOR, str_replace('.', '', $name));
-        $to_clear = dirname(__FILE__) . DIRECTORY_SEPARATOR . $name;
-        if (file_exists($to_clear)) {
-            unlink($to_clear);
-        }
+$names = explode(',', $_GET['name']);
+foreach($names as $name) {
+    $name = str_replace('/', DIRECTORY_SEPARATOR, str_replace('.', '', $name));
+    $to_clear = dirname(__FILE__) . DIRECTORY_SEPARATOR . $name;
+    if (file_exists($to_clear)) {
+        unlink($to_clear);
     }
+}
 ?>

ssp-director-tools/trunk/includes/helpers.php

@@ -44 +44 @@
 }
 
-//sanitize text 
+//sanitize text
 function sspdt_nohtml($val) {
     return wp_kses($val, array());

ssp-director-tools/trunk/includes/shortcodes.php

@@ -4 +4 @@
 
 /**
- * Shortcut for the 'sspd' tag. Creates HTML code for Director photo grids or single images 
- * @author Matthias Scheidl <matthias@scheidl.name>
+ * Shortcut for the 'sspd' tag. Creates HTML code for Director photo grids or single images
+ * @author Matthias Scheidl <dev@scheidl.name>
  * @param array $atts The attributes of the sspd tag
  * @return string The HTML code
@@ -22 +22 @@
             'sort_direction' => '',
             'rss' => ''
-        ), $atts ) );
-        
-        //helper info
-        $presentation_ops = get_option('sspdt_helpers');
+            ), $atts ) );
 
-        //Do not filter if we are on a search result page
-        if(get_search_query() == "")
-        {
-            $sspdt = new SSPDT(get_option('sspdt_api_key'), get_option('sspdt_api_path'), true, get_option('sspdt_format_options'));
-            
-            if($image == '') { //we make a photo grid with multiple images
-            
-                $defaults = get_option('sspdt_defaults');
-                $options = array();
+            //helper info
+            $presentation_ops = get_option('sspdt_helpers');
+
+            //Do not filter if we are on a search result page
+            if(get_search_query() == "")
+            {
+                $sspdt = new SSPDT(get_option('sspdt_api_key'), get_option('sspdt_api_path'), false, get_option('sspdt_format_options'));
                 
-                // Determine the scope of the request
-                if($gallery != '') {
-                    $options['model'] = 'gallery';
-                    $options['model_id'] = $gallery;
-                } elseif ($album != '') {
-                    $options['model'] = 'album';
-                    $options['model_id'] = $album;
-                } elseif ($defaults['model'] =='gallery' || $defaults['model'] == 'album') {
-                    $options['model'] = $defaults['model'];
-                    $options['model_id'] = $defaults['model_id'] != '' ? $defaults['model_id'] : 1;
+                if(get_option('sspdt_api_cache')) {
+                    $sspdt->cache->set('sspdt');
                 }
-                
-                
-                // Determine the maximum number of images to show 
-                if($limit != '0' && $limit != '') {
-                    $options['limit'] = $limit;
-                } elseif ($defaults['limit'] != '0' && $defaults['limit'] != '') {
-                    $options['limit'] = $defaults['limit'];
+                    
+                if($image == '') { //we make a photo grid with multiple images
+                        
+                    $defaults = get_option('sspdt_defaults');
+                    $options = array();
+
+                    // Determine the scope of the request
+                    if($gallery != '') {
+                        $options['model'] = 'gallery';
+                        $options['model_id'] = $gallery;
+                    } elseif ($album != '') {
+                        $options['model'] = 'album';
+                        $options['model_id'] = $album;
+                    } elseif ($defaults['model'] =='gallery' || $defaults['model'] == 'album') {
+                        $options['model'] = $defaults['model'];
+                        $options['model_id'] = $defaults['model_id'] != '' ? $defaults['model_id'] : 1;
+                    }
+
+
+                    // Determine the maximum number of images to show
+                    if($limit != '0' && $limit != '') {
+                        $options['limit'] = $limit;
+                    } elseif ($defaults['limit'] != '0' && $defaults['limit'] != '') {
+                        $options['limit'] = $defaults['limit'];
+                    }
+
+                    // Determine if we do tag filtering
+                    if($tags != '') {
+                        if(strtolower($tagmode) == 'all' || strtolower($tagmode) == 'one') {
+                            $options['tags'] = $tags;
+                            $options['tagmode'] = strtolower($tagmode);
+                        } elseif ($defaults['tagmode'] == 'all' || $defaults['tagmode'] == 'one') {
+                            $options['tags'] = $tags;
+                            $options['tagmode'] = $defaults['tagmode'];
+                        } else {
+                            $options['tags'] = $tags;
+                            $options['tagmode'] = 'one';
+                        }
+                    } elseif ($defaults['tags'] != '') {
+                        $options['tags'] = $defaults['tags'];
+                        $options['tagmode'] = $defaults['tagmode'];
+                    }
+
+                    // Determine the sort policy
+                    if($sort_on != '' && $sort_on != 'null') {
+                        $options['sort_on'] = $sort_on;
+                    } elseif ($defaults['sort_on'] != '' && $defaults['sort_on'] != 'null') {
+                        $options['sort_on'] = $defaults['sort_on'];
+                    }
+
+                    // Determine the sort direction
+                    if(strtoupper($sort_direction) == 'ASC' || strtoupper($sort_direction) == 'DESC') {
+                        $options['sort_direction'] = $sort_direction;
+                    } elseif ($defaults['sort_direction'] == 'ASC' || $defaults['sort_direction'] == 'DESC'){
+                        $options['sort_direction'] = $defaults['sort_direction'];
+                    } else {
+                        $options['sort_direction'] = 'DESC';
+                    }
+
+                    // Show RSS feed?
+                    if($options['sort_on'] != 'random') {
+                        // show rss feed only if our gallery is not randomised
+                        if( $rss == 'yes' || $rss === '1' || $rss == 'no' || $rss === '0') {
+                            $options['rss'] = $rss;
+                        } elseif ( $defaults['rss'] == 'yes' || $defaults['rss'] === '1' ) {
+                            $options['rss'] = '1';
+                        } else {
+                            $options['rss'] = '0';
+                        }
+                            
+                    }
+
+
+                    //debug_var($options);
+
+                    return $sspdt->photogrid($options, 'post');
+
+                } else { //we make a single image
+
+                    $format_options = get_option('sspdt_format_options');
+
+                    // Get the plugin settings
+                    $showcaption = isset($format_options['thumb_caption']) ? $format_options['thumb_caption'] : false;
+                    $thumbalign = isset($format_options['thumb_align']) ? $format_options['thumb_align'] : 'alignnone';
+
+                    // Override alignment settings if align attribute provided
+                    if($align == 'left') $thumbalign = 'alignleft';
+                    if($align == 'center') $thumbalign = 'aligncenter';
+                    if($align == 'right') $thumbalign = 'alignright';
+
+                    // Override caption settings if caption attribute is set to 'yes' or '1'
+                    if($caption == 'yes' || $caption == '1') {
+                        $showcaption = true;
+                    } elseif ($caption == 'no' || $caption == '0') {
+                        $showcaption = false;
+                    }
+
+                    //post ID
+                    $post_id = get_the_ID();
+
+                    return $sspdt->single($image, $thumbalign, $showcaption, $post_id);
                 }
-                
-                // Determine if we do tag filtering
-                if($tags != '') {
-                    if(strtolower($tagmode) == 'all' || strtolower($tagmode) == 'one') {
-                        $options['tags'] = $tags;
-                        $options['tagmode'] = strtolower($tagmode);
-                    } elseif ($defaults['tagmode'] == 'all' || $defaults['tagmode'] == 'one') {
-                        $options['tags'] = $tags;
-                        $options['tagmode'] = $defaults['tagmode'];
-                    } else {
-                        $options['tags'] = $tags;
-                        $options['tagmode'] = 'one';
-                    }
-                } elseif ($defaults['tags'] != '') {
-                    $options['tags'] = $defaults['tags'];
-                    $options['tagmode'] = $defaults['tagmode'];
-                }
-                
-                // Determine the sort policy
-                if($sort_on != '' && $sort_on != 'null') {
-                    $options['sort_on'] = $sort_on;
-                } elseif ($defaults['sort_on'] != '' && $defaults['sort_on'] != 'null') {
-                    $options['sort_on'] = $defaults['sort_on'];
-                }
-                
-                // Determine the sort direction
-                if(strtoupper($sort_direction) == 'ASC' || strtoupper($sort_direction) == 'DESC') {
-                    $options['sort_direction'] = $sort_direction;
-                } elseif ($defaults['sort_direction'] == 'ASC' || $defaults['sort_direction'] == 'DESC'){
-                    $options['sort_direction'] = $defaults['sort_direction'];
-                } else {
-                    $options['sort_direction'] = 'DESC';
-                }
-                
-                // Show RSS feed?
-                if($options['sort_on'] != 'random') {
-                    // show rss feed only if our gallery is not randomised
-                    if( $rss == 'yes' || $rss === '1' || $rss == 'no' || $rss === '0') {
-                        $options['rss'] = $rss;
-                    } elseif ( $defaults['rss'] == 'yes' || $defaults['rss'] === '1' ) {
-                        $options['rss'] = '1';
-                    } else {
-                        $options['rss'] = '0';
-                    }
-                    
-                }
-                
-                
-                //debug_var($options);
-                
-                return $sspdt->photogrid($options, 'post');
-                
-            } else { //we make a single image
-                
-                $format_options = get_option('sspdt_format_options');
-                
-                // Get the plugin settings
-                $showcaption = isset($format_options['thumb_caption']) ? $format_options['thumb_caption'] : false;
-                $thumbalign = isset($format_options['thumb_align']) ? $format_options['thumb_align'] : 'alignnone';
-                
-                // Override alignment settings if align attribute provided
-                if($align == 'left') $thumbalign = 'alignleft';
-                if($align == 'center') $thumbalign = 'aligncenter';
-                if($align == 'right') $thumbalign = 'alignright';
-                
-                // Override caption settings if caption attribute is set to 'yes' or '1'
-                if($caption == 'yes' || $caption == '1') {
-                    $showcaption = true;
-                } elseif ($caption == 'no' || $caption == '0') {
-                    $showcaption = false;
-                }
-                
-                //post ID
-                $post_id = get_the_ID();
+            }
 
-                return $sspdt->single($image, $thumbalign, $showcaption, $post_id);
-            }
-        }
 
-    
 }
 

ssp-director-tools/trunk/includes/sspdt-options-page.php

@@ -6 +6 @@
     if ( isset($_POST['submit']) ) {
         if ( function_exists('current_user_can') && !current_user_can('manage_options') )
-            die(__('Cheatin’ uh?', 'ssspdt'));
+        die(__('Cheatin’ uh?', 'ssspdt'));
 
         check_admin_referer( $sspdt_nonce );
-        
+
         $director = new Director($_POST['sspdt_api_key'],$_POST['sspdt_api_path'],false);
-        
+
         if ( !$director->dead == true ) {
-                
+
             update_option( 'sspdt_api_key', $_POST['sspdt_api_key'] );
             update_option( 'sspdt_api_path', $_POST['sspdt_api_path'] );
-            
-            ?><div id="message" class="updated fade"><p><strong><?php _e('Settings have been saved.', 'sspdt'); ?></strong></p></div><?php
+                
+            ?>
+<div id="message" class="updated fade">
+    <p>
+        <strong><?php _e('Settings have been saved.', 'sspdt'); ?>
+        </strong>
+    </p>
+</div>
+            <?php
             unset( $director );
             unset( $_POST['sspdt_api_key']);
             unset( $_POST['sspdt_api_key']);
-            
+                
         }
-        
+
         else {
-        
-            ?><div id="message" class="error"><p><strong><?php _e('API Settings seem wrong. Please double check them.', 'sspdt'); ?></strong></p></div>
-        <?php
-        }   
-        
+
+            ?>
+<div id="message" class="error">
+    <p>
+        <strong><?php _e('API Settings seem wrong. Please double check them.', 'sspdt'); ?>
+        </strong>
+    </p>
+</div>
+            <?php
+        }
+
         update_option( 'sspdt_api_cache', $_POST['sspdt_api_cache'] );
 
         $format_options = array();
-        
+
         $format_options['grid_width'] = sspdt_posint ( $_POST['grid_width'] );
         $format_options['grid_height'] = sspdt_posint ( $_POST['grid_height'] );
@@ -39 +52 @@
         $format_options['grid_quality'] = sspdt_posint ( $_POST['grid_quality'] );
         $format_options['grid_sharpen'] = sspdt_bool( $_POST['grid_sharpen'] );
-        
+
         $format_options['thumb_width'] = sspdt_posint( $_POST['thumb_width'] );
         $format_options['thumb_height'] = sspdt_posint( $_POST['thumb_height'] );
@@ -47 +60 @@
         $format_options['thumb_align'] = sspdt_align( $_POST['thumb_align'] );
         $format_options['thumb_caption'] = sspdt_bool( $_POST['thumb_caption'] );
-        
+
         $format_options['large_width'] = sspdt_posint( $_POST['large_width'] );
         $format_options['large_height'] = sspdt_posint( $_POST['large_height'] );
         $format_options['large_crop'] = sspdt_bool( $_POST['large_crop'] );
-        $format_options['large_quality'] = sspdt_posint( $_POST['large_quality'] ); 
+        $format_options['large_quality'] = sspdt_posint( $_POST['large_quality'] );
         $format_options['large_sharpen'] = sspdt_bool( $_POST['large_sharpen'] );
-        //$format_options['large_caption'] = sspdt_bool( $_POST['large_caption'] );
-        
+
         $defaults = array();
-        
+
         $defaults['model'] = sspdt_model( $_POST['model'] );
         $defaults['model_id'] = sspdt_posint( $_POST['model_id'] );
@@ -65 +77 @@
         $defaults['sort_direction'] = sspdt_sort_direction( $_POST['sort_direction'] );
         $defaults['rss'] = sspdt_bool( $_POST['rss'] );
-        
+
         $fb = array();
-        
+
         $fb['padding'] = sspdt_posint( $_POST['padding'] );
         $fb['margin'] = sspdt_posint( $_POST['margin'] );
-        
+
         $fb['titleShow'] = sspdt_bool( $_POST['titleShow'] );
         $fb['titlePosition'] = sspdt_fb_title_position( $_POST['titlePosition'] );
         $fb['counterShow'] = sspdt_bool( $_POST['counterShow'] );
-        
+
         $fb['overlayShow'] = sspdt_bool( $_POST['overlayShow'] );
         $fb['overlayOpacity'] = sspdt_fb_opacity( $_POST['overlayOpacity'] );
         $fb['overlayColor'] = sspdt_color( $_POST['overlayColor'] );
-        
+
         $fb['cyclic'] = sspdt_bool( $_POST['cyclic'] );
         $fb['showNavArrows'] = sspdt_bool( $_POST['showNavArrows'] );
         $fb['showCloseButton'] = sspdt_bool( $_POST['showCloseButton'] );
         $fb['enableEscapeButton'] = sspdt_bool( $_POST['enableEscapeButton'] );
-        
+
         $fb['transitionIn'] = sspdt_fb_transition( $_POST['transitionIn'] );
         $fb['speedIn'] = sspdt_posint( $_POST['speedIn'] );
@@ -91 +103 @@
         $fb['easingOut'] = sspdt_fb_easing( $_POST['easingOut'] );
         $fb['changeSpeed'] = sspdt_posint( $_POST['changeSpeed'] );
-        
+
         $feed_options = array();
-        
-        $feed_options['feed_url'] = esc_url( $_POST['feed_url'] );
+
+        $feed_options['feed_url'] = rtrim( esc_url( $_POST['feed_url'] ), " /") . "/";
         $feed_options['secret'] = sspdt_nohtml( $_POST['secret'] );
-        
-        
+
+
         update_option( 'sspdt_format_options', $format_options );
         update_option( 'sspdt_defaults', $defaults );
         update_option( 'sspdt_fancybox', $fb );
         update_option( 'sspdt_feed_options', $feed_options);
-        
+
+    }
+
+    if(get_option('sspdt_api_key') == null) {
+        ?>
+<div id="message" class="error">
+    <p>
+        <strong><?php _e('You must define the API settings. Otherwise this plugin won\'t work.', 'sspdt'); ?>
+        </strong>
+    </p>
+</div>
+        <?php   
     }
     
-        if(get_option('sspdt_api_key') == null) {
-            ?>
-            <div id="message" class="error">
-                <p><strong><?php _e('You must define the API settings. Otherwise this plugin won\'t work.', 'sspdt'); ?></strong></p>
-            </div><?php 
-        }
-        
-        $fo = get_option('sspdt_feed_options');
-        if($fo['feed_url'] == null || $fo['feed_url'] == '') {
-
-        }
-    
-        if(get_option('sspdt_format_options') == null) {
-        
-            $format_options['grid_width'] = '60';
-            $format_options['grid_height'] = '60';
-            $format_options['grid_crop'] = '1';
-            $format_options['grid_quality'] = '75';
-            $format_options['grid_sharpen'] = '1';
-            
-            $format_options['thumb_width'] = '240';
-            $format_options['thumb_height'] = '240';
-            $format_options['thumb_crop'] = '0';
-            $format_options['thumb_quality'] = '80';
-            $format_options['thumb_sharpen'] = '1';
-            $format_options['thumb_align'] = 'alignleft';
-            $format_options['thumb_caption'] = '1';
-            
-            $format_options['large_width'] = '1000';
-            $format_options['large_height'] = '720';
-            $format_options['large_crop'] = '0';
-            $format_options['large_quality'] = '85';
-            $format_options['large_sharpen'] = '1';
-            //$format_options['large_caption'] = '1';
-            
-            $format_options['preview_width'] = '180';
-            $format_options['preview_height'] = '180';
-            $format_options['preview_crop'] = '0';
-            $format_options['preview_quality'] = '75';
-            $format_options['preview_sharpen'] = '1';
-            
-            $format_options['full_width'] = '1920';
-            $format_options['full_height'] = '1920';
-            $format_options['full_crop'] = '0';
-            $format_options['full_quality'] = '90';
-            $format_options['full_sharpen'] = '1';
-            
-            update_option( 'sspdt_format_options', $format_options );
-        }
-        
-        if(get_option('sspdt_defaults') == null) {
-            $defaults['model'] = 'gallery';
-            $defaults['model_id'] = '1';
-            $defaults['limit'] = '12';
-            $defaults['tags'] = '';
-            $defaults['tagmode'] = 'one';
-            $defaults['sort_on'] = 'captured_on';
-            $defaults['sort_direction'] = 'DESC';
-            $defaults['rss'] = '0'; 
-            
-            update_option( 'sspdt_defaults', $defaults );
-        }
-        
-        if(get_option('sspdt_fancybox') == null) {
-            $fb['padding'] = '10';
-            $fb['margin'] = '20';
-            
-            $fb['titleShow'] = '1';
-            $fb['titlePosition'] = 'outside';
-            $fb['counterShow'] = '0';
-            
-            $fb['overlayShow'] = '1';
-            $fb['overlayOpacity'] = '0.3';
-            $fb['overlayColor'] = '#666';
-            
-            $fb['cyclic'] = '0';
-            $fb['showNavArrows'] = '1';
-            $fb['showCloseButton'] = '1';
-            $fb['enableEscapeButton'] = '1';
-            
-            $fb['transitionIn'] = '1';
-            $fb['speedIn'] = '300';
-            $fb['easingIn'] = 'linear';
-            $fb['transitionOut'] = '1';
-            $fb['speedOut'] = '400';
-            $fb['easingOut'] = 'linear';
-            $fb['changeSpeed'] = '400'; 
-            
-            update_option( 'sspdt_fancybox', $fb );
-        }
-    
-        $format_options = get_option('sspdt_format_options');
-        $defaults = get_option('sspdt_defaults');
-        $fb = get_option('sspdt_fancybox');
-        $feed_options = get_option('sspdt_feed_options');
-        
-        $imdir =  WP_PLUGIN_URL . "/ssp-director-tools/images/";
-
-?>
-
-        <?php $phpversion = explode( ".", phpversion()); ?>
+
+
+    if(get_option('sspdt_format_options') == null) {
+
+        $format_options['grid_width'] = '60';
+        $format_options['grid_height'] = '60';
+        $format_options['grid_crop'] = '1';
+        $format_options['grid_quality'] = '75';
+        $format_options['grid_sharpen'] = '1';
+            
+        $format_options['thumb_width'] = '240';
+        $format_options['thumb_height'] = '240';
+        $format_options['thumb_crop'] = '0';
+        $format_options['thumb_quality'] = '80';
+        $format_options['thumb_sharpen'] = '1';
+        $format_options['thumb_align'] = 'alignleft';
+        $format_options['thumb_caption'] = '1';
+            
+        $format_options['large_width'] = '1000';
+        $format_options['large_height'] = '720';
+        $format_options['large_crop'] = '0';
+        $format_options['large_quality'] = '85';
+        $format_options['large_sharpen'] = '1';
+            
+        update_option( 'sspdt_format_options', $format_options );
+    }
+
+    if(get_option('sspdt_defaults') == null) {
+        $defaults['model'] = 'gallery';
+        $defaults['model_id'] = '1';
+        $defaults['limit'] = '12';
+        $defaults['tags'] = '';
+        $defaults['tagmode'] = 'one';
+        $defaults['sort_on'] = 'captured_on';
+        $defaults['sort_direction'] = 'DESC';
+        $defaults['rss'] = '0';
+            
+        update_option( 'sspdt_defaults', $defaults );
+    }
+
+    if(get_option('sspdt_fancybox') == null) {
+        $fb['padding'] = '10';
+        $fb['margin'] = '20';
+            
+        $fb['titleShow'] = '1';
+        $fb['titlePosition'] = 'outside';
+        $fb['counterShow'] = '0';
+            
+        $fb['overlayShow'] = '1';
+        $fb['overlayOpacity'] = '0.3';
+        $fb['overlayColor'] = '#666';
+            
+        $fb['cyclic'] = '0';
+        $fb['showNavArrows'] = '1';
+        $fb['showCloseButton'] = '1';
+        $fb['enableEscapeButton'] = '1';
+            
+        $fb['transitionIn'] = '1';
+        $fb['speedIn'] = '300';
+        $fb['easingIn'] = 'linear';
+        $fb['transitionOut'] = '1';
+        $fb['speedOut'] = '400';
+        $fb['easingOut'] = 'linear';
+        $fb['changeSpeed'] = '400';
+            
+        update_option( 'sspdt_fancybox', $fb );
+    }
+
+    $format_options = get_option('sspdt_format_options');
+    $defaults = get_option('sspdt_defaults');
+    $fb = get_option('sspdt_fancybox');
+    $feed_options = get_option('sspdt_feed_options');
+
+    $imdir =  WP_PLUGIN_URL . "/ssp-director-tools/images/";
+
+    ?>
+
+    <?php $phpversion = explode( ".", phpversion()); ?>
 
     <?php if ( $phpversion[0] < "5" ) { ?>
-    <div class="error" id="message">
-        <p><strong><?php _e('Your PHP version is too old.', 'sspdt');?></strong></p>
-        <p><?php _e('The DirectorPHP API needs at least PHP 5. Please install it or get in touch with your internet provider or system administrator', 'sspdt'); ?></p>
-    </div>
-    <?php } 
+<div class="error" id="message">
+    <p>
+        <strong><?php _e('Your PHP version is too old.', 'sspdt');?> </strong>
+    </p>
+    <p>
+    <?php _e('The DirectorPHP API needs at least PHP 5. Please install it or get in touch with your internet provider or system administrator', 'sspdt'); ?>
+    </p>
+</div>
+    <?php }
     ?>
-    
+
     <?php if ( !function_exists ( curl_version ) ) { ?>
-    <div class="error fade" id="message">
-        <p><strong><?php _e('php_curl is not installed.', 'sspdt');?></strong></p>
-        <p><?php _e('SSP Director Tools need php_curl be installed to work properly.', 'sspdt'); ?></p>
-    </div>
-    <?php } 
+<div class="error fade" id="message">
+    <p>
+        <strong><?php _e('php_curl is not installed.', 'sspdt');?> </strong>
+    </p>
+    <p>
+    <?php _e('SSP Director Tools need php_curl be installed to work properly.', 'sspdt'); ?>
+    </p>
+</div>
+    <?php }
     ?>
-    
+
 <script type="text/javascript">
 <!--
@@ -244 +252 @@
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('SlideShowPro Director Tools', 'sspdt'); ?></h2>
-<div class="narrow">
-<form action="" method="post" id="sspdt-conf" >
-
-<?php sspdt_nonce_field($sspdt_nonce); ?>
-
-<h3><?php _e('API Settings', 'sspdt'); ?></h3>
-    <p><i><?php _e('The settings can be found on the "System Info" page of your SlideShowPro Director installation.', 'sspdt'); ?></i></p>
-
-    <table class="form-table">
-        <tr valign="middle">
-            <th scope="row">
-                <label for="sspdt_api_key"><?php _e('API Key', 'sspdt'); ?></label>
-            </th> 
-            <td><input id="sspdt_api_key" name="sspdt_api_key" type="text" size="60" value="<?php echo get_option('sspdt_api_key'); ?>" /> 
-            </td>
-        </tr>
-        <tr>
-            <th scope="row">
-                <label for="sspdt_api_path"><?php _e('API Path', 'sspdt'); ?></label>
-            </th> 
-            <td><input id="sspdt_api_path" name="sspdt_api_path" type="text" size="60" value="<?php echo get_option('sspdt_api_path'); ?>" /> 
-            </td>
-        </tr>
-    </table>
-
-    <?php if (!is_writable ( realpath(dirname(__FILE__)) . '/api/cache' )) { 
-        $disable_cache = 1;
-        update_option('sspdt_api_cache', '0');
-        echo "<div class='updated fade'><p><strong>";
-        _e('Caching disabled', 'sspdt');
-        echo "</strong></p><p>";
-        printf( __( "Your cache directory %s is not writable.", "sspdt"), "<code>". realpath(dirname(__FILE__)) ."/api/cache</code>");
-        echo "<br />";
-        _e("You must allow your web server to write to it in order to enable caching.", "sspdt" );
-        echo "</p></div>";
-    }?>
-
-    <table class="form-table">
-        <tr valign="middle">
-            <th scope="row">
-                <label for="sspdt_api_cache"><?php _e('API Cache', 'sspdt'); ?></label>
-            </th> 
-            <td>
-            <input style='margin-right:6px;' <?php if ($disable_cache == 1) { echo "DISABLED";} ?> id="sspdt_api_cache" name="sspdt_api_cache" type="checkbox" value="1" <?php if (get_option('sspdt_api_cache') == '1') {echo "checked = 'checked'";} ?> />
-            <?php _e('API Cache activated', 'sspdt'); ?><i style='margin-left:20px;'><?php _e('The API cache can improve performance dramatically.', 'sspdt'); ?></i><br/>
-            </td>
-        </tr>
-    </table>
-    
-    <h3><?php _e('Photo Feed Options', 'sspdt'); ?></h3>
-    <p><i><?php _e('Needed, if you want to use the photo feed functionality.', 'sspdt'); ?></i></p>
-    <table class="form-table">
-        <tr valign="middle">
-            <th scope="row"><label for="feed_url"><?php _e('Photo Feed URL', 'sspdt'); ?></label></th>
-            <td><input id="feed_url" name="feed_url" type="text" size="60" value="<?php echo $feed_options['feed_url']; ?>" /></td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row"><label for="secret"><?php _e('Secret', 'sspdt'); ?></label></th>
-            <td><input id="secret" name="secret" type="text" size="60" value="<?php echo $feed_options['secret']; ?>" /></td>
-        </tr>
-    </table>
-    
-    <h3><?php _e('Image Sizes an Handling', 'sspdt'); ?></h3>
-    <p><i><?php _e('Define image sizes, quality and cropping.', 'sspdt'); ?></i></p>
-    <table class="wp-list-table widefat" cellspacing="0">
-        <thead>
-            <tr valign="middle" >
-                <th>&nbsp;</th>
-                <th class="manage-column"><?php _e('Width', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Height', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Quality', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Cropping', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Sharpening', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Alignment', 'sspdt'); ?></th>
-                <th class="manage-column"><?php _e('Caption', 'sspdt'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-        <tr valign="middle">
-            <th scope="row"><img class="sspdt_handling_icon" src="<?php echo $imdir . 'grid.png'?>" width="20" height="20" alt="icon" />
-                <label for="sspdt_grid" ><?php _e('Grid', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="grid_width" name="grid_width" type="text" size="4" value="<?php echo $format_options['grid_width']; ?>" />
-            </td>
-            <td>
-                <input id="grid_height" name="grid_height" type="text" size="4" value="<?php echo $format_options['grid_height']; ?>" /> 
-            </td>
-            <td>
-                <input id="grid_quality" name="grid_quality" type="text" size="4" value="<?php echo $format_options['grid_quality']; ?>" /> 
-            </td>
-            <td>
-                <input id="grid_crop" name="grid_crop" type="checkbox" value="1" <?php if ( $format_options['grid_crop'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td>
-                <input id="grid_sharpen" name="grid_sharpen" type="checkbox" value="1" <?php if ( $format_options['grid_sharpen'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td></td>
-            <td></td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row"><img class="sspdt_handling_icon"  src="<?php echo $imdir . 'thumb.png'?>" width="20" height="20" alt="icon" />
-                <label for="sspdt_thumb"><?php _e('Thumbnail', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="thumb_width" name="thumb_width" type="text" size="4" value="<?php echo $format_options['thumb_width']; ?>" /> 
-            </td>
-            <td>
-                <input id="thumb_height" name="thumb_height" type="text" size="4" value="<?php echo $format_options['thumb_height']; ?>" /> 
-            </td>
-            <td>
-                <input id="thumb_quality" name="thumb_quality" type="text" size="4" value="<?php echo $format_options['thumb_quality']; ?>" /> 
-            </td>
-            <td>
-                <input id="thumb_crop" name="thumb_crop" type="checkbox" value="1" <?php if ( $format_options['thumb_crop'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td>
-                <input id="thumb_sharpen" name="thumb_sharpen" type="checkbox" value="1" <?php if ( $format_options['thumb_sharpen'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td>
-                <select id="thumb_align" name="thumb_align">
-                    <option value="alignnone" <?php if($format_options['thumb_align'] == 'alignnone') {echo "selected";} ?> ><?php _e('none', 'sspdt'); ?></option>
-                    <option value="alignleft" <?php if($format_options['thumb_align'] == 'alignleft') {echo "selected";} ?> ><?php _e('left', 'sspdt'); ?></option>
-                    <option value="aligncenter" <?php if($format_options['thumb_align'] == 'aligncenter') {echo "selected";} ?> ><?php _e('center', 'sspdt'); ?></option>
-                    <option value="alignright" <?php if($format_options['thumb_align'] == 'alignright') {echo "selected";} ?> ><?php _e('right', 'sspdt'); ?></option>
-                </select>
-            </td>
-            <td>
-                <input id="thumb_caption" name="thumb_caption" type="checkbox" value="1" <?php if ( $format_options['thumb_caption'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row"><img class="sspdt_handling_icon"  src="<?php echo $imdir . 'large.png'?>" width="20" height="20" alt="icon" />
-                <label for="sspdt_large"><?php _e('Image', 'sspdt'); ?></label>
-            </th> 
-            <td>
-                <input id="large_width" name="large_width" type="text" size="4" value="<?php echo $format_options['large_width']; ?>" /> 
-            </td>
-            <td>
-                <input id="large_height" name="large_height" type="text" size="4" value="<?php echo $format_options['large_height']; ?>" /> 
-            </td>
-            <td>
-                <input id="large_quality" name="large_quality" type="text" size="4" value="<?php echo $format_options['large_quality']; ?>" /> 
-            </td>
-            <td>
-                <input id="large_crop" name="large_crop" type="checkbox" value="1" <?php if ( $format_options['large_crop'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td>
-                <input id="large_sharpen" name="large_sharpen" type="checkbox" value="1" <?php if ( $format_options['large_sharpen'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-            <td></td>
-            <td>
-                <input id="titleShow" name="titleShow" type="checkbox" value="1" <?php if ( $fb['titleShow'] == '1') { echo "checked = 'checked'";}  ?>/>
-            </td>
-        </tr>
-
-        </tbody>
-        <tfoot>
-            <tr valign="middle" >
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-            </tr>
-        </tfoot>
-    </table>
-    
-    <h3><?php _e('Photo Grid Defaults', 'sspdt'); ?></h3>
-    <p><i><?php _e('Default settings for SSP Director Photo Grids.', 'sspdt'); ?><br/>
-    <?php _e('These settings can be overridden by the photo grid shortcode [sspd] attributes.', 'sspdt'); ?></i></p>
-    <table class="form-table">
-        <tr valign="middle">
-            <th scope="row">
-                <label for="model"><?php _e('Scope', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <select id="model" name="model" style="min-width:120px;" onchange="model_on_change();">
-                    <option value="null" <?php if($defaults['model'] == 'null') {echo "selected";} ?> ><?php _e('-- Not specified --', 'sspdt')?></option>
-                    <option value="gallery" <?php if($defaults['model'] == 'gallery') {echo "selected";} ?> ><?php _e('Gallery', 'sspdt'); ?></option>
-                    <option value="album" <?php if($defaults['model'] == 'album') {echo "selected";} ?> ><?php _e('Album', 'sspdt'); ?></option>
-                </select> 
-                ID <input id="model_id" name="model_id" size="4" type="text" value="<?php echo $defaults['model_id']; ?>" <?php if($defaults['model'] == null || $defaults['model'] == 'null') {echo "disabled";} ?>/>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row">
-                <label for="limit"><?php _e('Limit', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="limit" name="limit" type="text" size="4" value="<?php echo $defaults['limit']; ?>" />
-                <i><?php _e('Leave blank if no limit should be specified.', 'sspdt');?></i>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row">
-                <label for="tags"><?php _e('Tags', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="tags" name="tags" type="text" size="40" value="<?php echo $defaults['tags']; ?>" onkeypress="tags_on_change();" onblur="tags_on_change();" />
-                <select id="tagmode" name="tagmode" <?php if($defaults['tags'] == null || $defaults['tags'] == '') {echo "disabled";} ?> >
-                    <option value="all" <?php if($defaults['tagmode'] == 'all') {echo "selected";} ?> ><?php _e('all', 'sspdt'); ?></option>
-                    <option value="one" <?php if($defaults['tagmode'] == 'one') {echo "selected";} ?> ><?php _e('one', 'sspdt'); ?></option>
-                </select>
-                <i><?php _e('Leave blank if no tags should be specified.', 'sspdt'); ?></i>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row">
-                <label for="sort_on"><?php _e('Sort', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <select id="sort_on" name="sort_on" style="min-width:120px;" onchange="sort_on_change();">
-                    <option value="null" <?php if($defaults['sort_on'] == 'null') {echo "selected";} ?> ><?php _e('-- Not specified --', 'sspdt'); ?></option>
-                    <option value="created_on" <?php if($defaults['sort_on'] == 'created_on') {echo "selected";} ?> ><?php _e('Creation Date', 'sspdt'); ?></option>
-                    <option value="captured_on" <?php if($defaults['sort_on'] == 'captured_on') {echo "selected";} ?> ><?php _e('Capture Date', 'sspdt'); ?></option>
-                    <option value="modified_on" <?php if($defaults['sort_on'] == 'modified_on') {echo "selected";} ?> ><?php _e('Modification Date', 'sspdt'); ?></option>
-                    <option value="filename" <?php if($defaults['sort_on'] == 'filename') {echo "selected";} ?> ><?php _e('File Name', 'sspdt'); ?></option>
-                    <option value="random" <?php if($defaults['sort_on'] == 'random') {echo "selected";} ?> ><?php _e('Random', 'sspdt'); ?></option>
-                </select>
-                <select id="sort_direction" name="sort_direction" style="min-width:80px;" <?php if($defaults['sort_on'] == 'null' || $defaults['sort_on'] == null || $defaults['sort_on'] == 'random') {echo "disabled";} ?> >
-                    <option value="ASC" <?php if($defaults['sort_direction'] == 'ASC') {echo "selected";} ?> ><?php _e('ascending', 'sspdt'); ?></option>
-                    <option value="DESC" <?php if($defaults['sort_direction'] == 'DESC') {echo "selected";} ?> ><?php _e('descending', 'sspdt'); ?></option>
-                </select>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row">
-                <label for="rss"><?php _e('Photo Feed', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="rss" name="rss" type="checkbox" value="1" <?php if($defaults['rss'] == "1")  { echo "checked = 'checked'";} ?> /> <?php _e('Show a link to a photo feed for gallery images.', 'sspdt'); ?>
-            </td>
-        </tr>
-    </table>
-    
-    <h3><?php _e('Presentation', 'sspdt'); ?></h3>
-    <p><i><?php _e('FancyBox settings for image presentation.', 'sspdt'); ?></i></p>
-    <table class="form-table">
-        <tr valign="middle">
-            <th scope="row">
-                <label><?php _e('Box', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <?php _e('Padding', 'sspdt');?>
-                <input id="padding" name="padding" type="text" size="2" value="<?php echo $fb['padding']; ?>"/>px
-                <span style="margin-left: 20px;"><?php _e('Margin', 'sspdt'); ?></span>
-                <input id="margin" name="margin" type="text" size="2" value="<?php echo $fb['margin']; ?>"/>px
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th scope="row">
-                <label for="fb_title"><?php _e('Caption', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <?php _e('Position:', 'sspdt'); ?>
-                <select id="titlePosition" name="titlePosition">
-                    <option value="outside" <?php if($fb['titlePosition'] == 'outside') {echo "selected";} ?> ><?php _e('outside frame', 'sspdt'); ?></option>
-                    <option value="inside" <?php if($fb['titlePosition'] == 'inside') {echo "selected";} ?> ><?php _e('inside frame', 'sspdt'); ?></option>
-                    <option value="over" <?php if($fb['titlePosition'] == 'over') {echo "selected";} ?> ><?php _e('over image', 'sspdt'); ?></option>
-                </select>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th>
-                <label for="fb_overlay"><?php _e('Overlay', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <input id="overlayShow" name="overlayShow" type="checkbox" value="1" <?php if($fb['overlayShow'] == "1")  { echo "checked = 'checked'";} ?> />
-                <?php _e('Show overlay', 'sspdt'); ?> 
-                <span style="margin-left: 20px;"><?php _e('Opacity:', 'sspdt'); ?> </span>
-                <select id="overlayOpacity" name="overlayOpacity">
-                    <option value="0" <?php if($fb['overlayOpacity'] == '0') {echo "selected";} ?> >0</option>
-                    <option value="0.1" <?php if($fb['overlayOpacity'] == '0.1') {echo "selected";} ?> >0.1</option>
-                    <option value="0.2" <?php if($fb['overlayOpacity'] == '0.2') {echo "selected";} ?> >0.2</option>
-                    <option value="0.3" <?php if($fb['overlayOpacity'] == '0.3') {echo "selected";} ?> >0.3</option>
-                    <option value="0.4" <?php if($fb['overlayOpacity'] == '0.4') {echo "selected";} ?> >0.4</option>
-                    <option value="0.5" <?php if($fb['overlayOpacity'] == '0.5') {echo "selected";} ?> >0.5</option>
-                    <option value="0.6" <?php if($fb['overlayOpacity'] == '0.6') {echo "selected";} ?> >0.6</option>
-                    <option value="0.7" <?php if($fb['overlayOpacity'] == '0.7') {echo "selected";} ?> >0.7</option>
-                    <option value="0.8" <?php if($fb['overlayOpacity'] == '0.8') {echo "selected";} ?> >0.8</option>
-                    <option value="0.9" <?php if($fb['overlayOpacity'] == '0.9') {echo "selected";} ?> >0.9</option>
-                    <option value="1" <?php if($fb['overlayOpacity'] == '1') {echo "selected";} ?> >1</option>
-                </select>
-                <span style="margin-left: 20px;"><?php _e('Color:', 'sspdt'); ?></span>
-                <input type="text" id="overlayColor" name="overlayColor" value="<?php echo $fb['overlayColor'];?>" size="8"/>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th>
-                <label><?php _e('Navigation', 'sspdt'); ?></label>
-            </th>
-            <td>
-                <p><input type="checkbox" id="cyclic" name="cyclic" value="1" <?php if($fb['cyclic'] == "1")  { echo "checked = 'checked'";} ?> /> <?php _e('Cyclic navigation', 'sspdt'); ?></p>
-                <p><input type ="checkbox" id="showCloseButton" name="showCloseButton" value="1" <?php if($fb['showCloseButton'] == "1")  { echo "checked = 'checked'";} ?>/> <?php _e('Show close button', 'sspdt'); ?></p>
-                <p><input type="checkbox" id="showNavArrows" name="showNavArrows" value="1" <?php if($fb['showNavArrows'] == "1")  { echo "checked = 'checked'";} ?> /> <?php _e('Show navigation arrows', 'sspdt'); ?></p>
-                <p><input type="checkbox" id="enableEscapeButton" name="enableEscapeButton" value="1" <?php if($fb['enableEscapeButton'] == "1")  { echo "checked = 'checked'";} ?> /> <?php _e('Enable ESC key', 'sspdt'); ?></p>
-            </td>
-        </tr>
-        <tr valign="middle">
-            <th>
-                <label><?php _e('Transitions', 'sspdt'); ?></label>
-            </th>
-            <td>
-                    <p>
-                    <?php _e('In:', 'sspdt'); ?>
-                    <select id="transitionIn" name="transitionIn">
-                        <option value="none" <?php if($fb['transitionIn'] == 'none') {echo "selected";} ?>><?php _e('none', 'sspdt'); ?></option>
-                        <option value="fade" <?php if($fb['transitionIn'] == 'fade') {echo "selected";} ?>><?php _e('fade', 'sspdt'); ?></option>
-                        <option value="elastic" <?php if($fb['transitionIn'] == 'elastic') {echo "selected";} ?>><?php _e('elastic', 'sspdt'); ?></option>
+    <h2>
+    <?php _e('SlideShowPro Director Tools', 'sspdt'); ?>
+    </h2>
+    <div class="narrow">
+        <form action="" method="post" id="sspdt-conf">
+
+        <?php sspdt_nonce_field($sspdt_nonce); ?>
+
+            <h3>
+            <?php _e('API Settings', 'sspdt'); ?>
+            </h3>
+            <p>
+                <i><?php _e('The settings can be found on the "System Info" page of your SlideShowPro Director installation.', 'sspdt'); ?>
+                </i>
+            </p>
+
+            <table class="form-table">
+                <tr valign="middle">
+                    <th scope="row"><label for="sspdt_api_key"><?php _e('API Key', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><input id="sspdt_api_key" name="sspdt_api_key" type="text"
+                        size="60" value="<?php echo get_option('sspdt_api_key'); ?>" />
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"><label for="sspdt_api_path"><?php _e('API Path', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><input id="sspdt_api_path" name="sspdt_api_path" type="text"
+                        size="60" value="<?php echo get_option('sspdt_api_path'); ?>" />
+                    </td>
+                </tr>
+            </table>
+
+            <?php if (!is_writable ( realpath(dirname(__FILE__)) . '/api/cache' )) {
+                $disable_cache = 1;
+                update_option('sspdt_api_cache', '0');
+                echo "<div class='updated fade'><p><strong>";
+                _e('Caching disabled', 'sspdt');
+                echo "</strong></p><p>";
+                printf( __( "Your cache directory %s is not writable.", "sspdt"), "<code>". realpath(dirname(__FILE__)) ."/api/cache</code>");
+                echo "<br />";
+                _e("You must allow your web server to write to it in order to enable caching.", "sspdt" );
+                echo "</p></div>";
+            }?>
+
+            <table class="form-table">
+                <tr valign="middle">
+                    <th scope="row"><label for="sspdt_api_cache"><?php _e('API Cache', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><input style='margin-right: 6px;'
+            <?php if ($disable_cache == 1) { echo "DISABLED";} ?>
+                        id="sspdt_api_cache" name="sspdt_api_cache" type="checkbox"
+                        value="1"
+                        <?php if (get_option('sspdt_api_cache') == '1') {echo "checked = 'checked'";} ?> />
+                        <?php _e('API Cache activated', 'sspdt'); ?><i
+                        style='margin-left: 20px;'><?php _e('The API cache can improve performance dramatically.', 'sspdt'); ?>
+                    </i><br />
+                    </td>
+                </tr>
+            </table>
+
+            <h3>
+            <?php _e('Photo Feed Options', 'sspdt'); ?>
+            </h3>
+            <p>
+                <i><?php _e('Needed, if you want to use the photo feed functionality.', 'sspdt'); ?>
+                </i>
+            </p>
+            <table class="form-table">
+                <tr valign="middle">
+                    <th scope="row"><label for="feed_url"><?php _e('Photo Feed URL', 'sspdt'); ?>
+                    </label></th>
+                    <td><input id="feed_url" name="feed_url" type="text" size="60"
+                        value="<?php echo $feed_options['feed_url']; ?>" /><br/><i> <?php _e('Path to the photo feed installation with tailing slash.', 'sspdt'); ?></i></td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="secret"><?php _e('Secret', 'sspdt'); ?>
+                    </label></th>
+                    <td><input id="secret" name="secret" type="text" size="60"
+                        value="<?php echo $feed_options['secret']; ?>" /><br/><i> <?php _e('Enter the same secret as in the config.php file of your photo feed installation.', 'sspdt'); ?></i></td>
+                </tr>
+            </table>
+
+            <h3>
+            <?php _e('Image Sizes an Handling', 'sspdt'); ?>
+            </h3>
+            <p>
+                <i><?php _e('Define image sizes, quality and cropping.', 'sspdt'); ?>
+                </i>
+            </p>
+            <table class="wp-list-table widefat" cellspacing="0">
+                <thead>
+                    <tr valign="middle">
+                        <th>&nbsp;</th>
+                        <th class="manage-column"><?php _e('Width', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Height', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Quality', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Cropping', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Sharpening', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Alignment', 'sspdt'); ?></th>
+                        <th class="manage-column"><?php _e('Caption', 'sspdt'); ?></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr valign="middle">
+                        <th scope="row"><img class="sspdt_handling_icon"
+                            src="<?php echo $imdir . 'grid.png'?>" width="20" height="20"
+                            alt="icon" /> <label for="sspdt_grid"><?php _e('Grid', 'sspdt'); ?>
+                        </label>
+                        </th>
+                        <td><input id="grid_width" name="grid_width" type="text" size="4"
+                            value="<?php echo $format_options['grid_width']; ?>" />
+                        </td>
+                        <td><input id="grid_height" name="grid_height" type="text"
+                            size="4" value="<?php echo $format_options['grid_height']; ?>" />
+                        </td>
+                        <td><input id="grid_quality" name="grid_quality" type="text"
+                            size="4" value="<?php echo $format_options['grid_quality']; ?>" />
+                        </td>
+                        <td><input id="grid_crop" name="grid_crop" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['grid_crop'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td><input id="grid_sharpen" name="grid_sharpen" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['grid_sharpen'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr valign="middle">
+                        <th scope="row"><img class="sspdt_handling_icon"
+                            src="<?php echo $imdir . 'thumb.png'?>" width="20" height="20"
+                            alt="icon" /> <label for="sspdt_thumb"><?php _e('Thumbnail', 'sspdt'); ?>
+                        </label>
+                        </th>
+                        <td><input id="thumb_width" name="thumb_width" type="text"
+                            size="4" value="<?php echo $format_options['thumb_width']; ?>" />
+                        </td>
+                        <td><input id="thumb_height" name="thumb_height" type="text"
+                            size="4" value="<?php echo $format_options['thumb_height']; ?>" />
+                        </td>
+                        <td><input id="thumb_quality" name="thumb_quality" type="text"
+                            size="4" value="<?php echo $format_options['thumb_quality']; ?>" />
+                        </td>
+                        <td><input id="thumb_crop" name="thumb_crop" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['thumb_crop'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td><input id="thumb_sharpen" name="thumb_sharpen" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['thumb_sharpen'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td><select id="thumb_align" name="thumb_align">
+                                <option value="alignnone"
+                                <?php if($format_options['thumb_align'] == 'alignnone') {echo "selected";} ?>>
+                                    <?php _e('none', 'sspdt'); ?>
+                                </option>
+                                <option value="alignleft"
+                                <?php if($format_options['thumb_align'] == 'alignleft') {echo "selected";} ?>>
+                                    <?php _e('left', 'sspdt'); ?>
+                                </option>
+                                <option value="aligncenter"
+                                <?php if($format_options['thumb_align'] == 'aligncenter') {echo "selected";} ?>>
+                                    <?php _e('center', 'sspdt'); ?>
+                                </option>
+                                <option value="alignright"
+                                <?php if($format_options['thumb_align'] == 'alignright') {echo "selected";} ?>>
+                                    <?php _e('right', 'sspdt'); ?>
+                                </option>
+                        </select>
+                        </td>
+                        <td><input id="thumb_caption" name="thumb_caption" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['thumb_caption'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                    </tr>
+                    <tr valign="middle">
+                        <th scope="row"><img class="sspdt_handling_icon"
+                            src="<?php echo $imdir . 'large.png'?>" width="20" height="20"
+                            alt="icon" /> <label for="sspdt_large"><?php _e('Image', 'sspdt'); ?>
+                        </label>
+                        </th>
+                        <td><input id="large_width" name="large_width" type="text"
+                            size="4" value="<?php echo $format_options['large_width']; ?>" />
+                        </td>
+                        <td><input id="large_height" name="large_height" type="text"
+                            size="4" value="<?php echo $format_options['large_height']; ?>" />
+                        </td>
+                        <td><input id="large_quality" name="large_quality" type="text"
+                            size="4" value="<?php echo $format_options['large_quality']; ?>" />
+                        </td>
+                        <td><input id="large_crop" name="large_crop" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['large_crop'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td><input id="large_sharpen" name="large_sharpen" type="checkbox"
+                            value="1"
+                            <?php if ( $format_options['large_sharpen'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                        <td></td>
+                        <td><input id="titleShow" name="titleShow" type="checkbox"
+                            value="1"
+                            <?php if ( $fb['titleShow'] == '1') { echo "checked = 'checked'";}  ?> />
+                        </td>
+                    </tr>
+
+                </tbody>
+                <tfoot>
+                    <tr valign="middle">
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                </tfoot>
+            </table>
+
+            <h3>
+            <?php _e('Photo Grid Defaults', 'sspdt'); ?>
+            </h3>
+            <p>
+                <i><?php _e('Default settings for SSP Director Photo Grids.', 'sspdt'); ?><br />
+                <?php _e('These settings can be overridden by the photo grid shortcode [sspd] attributes.', 'sspdt'); ?>
+                </i>
+            </p>
+            <table class="form-table">
+                <tr valign="middle">
+                    <th scope="row"><label for="model"><?php _e('Scope', 'sspdt'); ?> </label>
+                    </th>
+                    <td><select id="model" name="model" style="min-width: 120px;"
+                        onchange="model_on_change();">
+                            <option value="null"
+                            <?php if($defaults['model'] == 'null') {echo "selected";} ?>>
+                                <?php _e('-- Not specified --', 'sspdt')?>
+                            </option>
+                            <option value="gallery"
+                            <?php if($defaults['model'] == 'gallery') {echo "selected";} ?>>
+                                <?php _e('Gallery', 'sspdt'); ?>
+                            </option>
+                            <option value="album"
+                            <?php if($defaults['model'] == 'album') {echo "selected";} ?>>
+                                <?php _e('Album', 'sspdt'); ?>
+                            </option>
+                    </select> ID <input id="model_id" name="model_id" size="4"
+                        type="text" value="<?php echo $defaults['model_id']; ?>"
+                        <?php if($defaults['model'] == null || $defaults['model'] == 'null') {echo "disabled";} ?> />
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="limit"><?php _e('Limit', 'sspdt'); ?> </label>
+                    </th>
+                    <td><input id="limit" name="limit" type="text" size="4"
+                        value="<?php echo $defaults['limit']; ?>" /><br/><i><?php _e('Leave blank if no limit should be specified.', 'sspdt');?>
+                    </i>
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="tags"><?php _e('Tags', 'sspdt'); ?> </label>
+                    </th>
+                    <td><input id="tags" name="tags" type="text" size="40"
+                        value="<?php echo $defaults['tags']; ?>"
+                        onkeypress="tags_on_change();" onblur="tags_on_change();" /> <select
+                        id="tagmode" name="tagmode"
+                        <?php if($defaults['tags'] == null || $defaults['tags'] == '') {echo "disabled";} ?>>
+                            <option value="all"
+                            <?php if($defaults['tagmode'] == 'all') {echo "selected";} ?>>
+                                <?php _e('all', 'sspdt'); ?>
+                            </option>
+                            <option value="one"
+                            <?php if($defaults['tagmode'] == 'one') {echo "selected";} ?>>
+                                <?php _e('one', 'sspdt'); ?>
+                            </option>
+                    </select><br/><i><?php _e('Leave blank if no tags should be specified.', 'sspdt'); ?>
+                    </i>
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="sort_on"><?php _e('Sort', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><select id="sort_on" name="sort_on" style="min-width: 120px;"
+                        onchange="sort_on_change();">
+                            <option value="null"
+                            <?php if($defaults['sort_on'] == 'null') {echo "selected";} ?>>
+                                <?php _e('-- Not specified --', 'sspdt'); ?>
+                            </option>
+                            <option value="created_on"
+                            <?php if($defaults['sort_on'] == 'created_on') {echo "selected";} ?>>
+                                <?php _e('Creation Date', 'sspdt'); ?>
+                            </option>
+                            <option value="captured_on"
+                            <?php if($defaults['sort_on'] == 'captured_on') {echo "selected";} ?>>
+                                <?php _e('Capture Date', 'sspdt'); ?>
+                            </option>
+                            <option value="modified_on"
+                            <?php if($defaults['sort_on'] == 'modified_on') {echo "selected";} ?>>
+                                <?php _e('Modification Date', 'sspdt'); ?>
+                            </option>
+                            <option value="filename"
+                            <?php if($defaults['sort_on'] == 'filename') {echo "selected";} ?>>
+                                <?php _e('File Name', 'sspdt'); ?>
+                            </option>
+                            <option value="random"
+                            <?php if($defaults['sort_on'] == 'random') {echo "selected";} ?>>
+                                <?php _e('Random', 'sspdt'); ?>
+                            </option>
+                    </select> <select id="sort_direction" name="sort_direction"
+                        style="min-width: 80px;"
+                                <?php if($defaults['sort_on'] == 'null' || $defaults['sort_on'] == null || $defaults['sort_on'] == 'random') {echo "disabled";} ?>>
+                            <option value="ASC"
+                            <?php if($defaults['sort_direction'] == 'ASC') {echo "selected";} ?>>
+                                <?php _e('ascending', 'sspdt'); ?>
+                            </option>
+                            <option value="DESC"
+                            <?php if($defaults['sort_direction'] == 'DESC') {echo "selected";} ?>>
+                                <?php _e('descending', 'sspdt'); ?>
+                            </option>
                     </select>
-                    <span style="margin-left: 20px;"><?php _e('Speed:', 'sspdt'); ?> </span>
-                    <input id="speedIn" name="speedIn" type="text" size="4" value="<?php echo $fb['speedIn']; ?>" />ms
-                    <span style="margin-left: 20px;"><?php _e('Easing:', 'sspdt'); ?> </span>
-                    <select id="easingIn" name="easingIn">
-                        <option value="linear" <?php if($fb['easingIn'] == 'linear') {echo "selected";} ?>><?php _e('Linear', 'sspdt'); ?></option>
-                        <option value="swing" <?php if($fb['easingIn'] == 'swing') {echo "selected";} ?>><?php _e('Swing', 'sspdt'); ?></option>
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="rss"><?php _e('Photo Feed', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><input id="rss" name="rss" type="checkbox" value="1"
+                    <?php if($defaults['rss'] == "1")  { echo "checked = 'checked'";} ?> />
+                    <?php _e('Show a link to a photo feed for gallery images.', 'sspdt'); ?>
+                    </td>
+                </tr>
+            </table>
+
+            <h3>
+            <?php _e('Presentation', 'sspdt'); ?>
+            </h3>
+            <p>
+                <i><?php _e('FancyBox settings for image presentation.', 'sspdt'); ?>
+                </i>
+            </p>
+            <table class="form-table">
+                <tr valign="middle">
+                    <th scope="row"><label><?php _e('Box', 'sspdt'); ?> </label>
+                    </th>
+                    <td><?php _e('Padding', 'sspdt');?> <input id="padding"
+                        name="padding" type="text" size="2"
+                        value="<?php echo $fb['padding']; ?>" />px <span
+                        style="margin-left: 20px;"><?php _e('Margin', 'sspdt'); ?> </span>
+                        <input id="margin" name="margin" type="text" size="2"
+                        value="<?php echo $fb['margin']; ?>" />px</td>
+                </tr>
+                <tr valign="middle">
+                    <th scope="row"><label for="fb_title"><?php _e('Caption', 'sspdt'); ?>
+                    </label>
+                    </th>
+                    <td><?php _e('Position:', 'sspdt'); ?> <select id="titlePosition"
+                        name="titlePosition">
+                            <option value="outside"
+                            <?php if($fb['titlePosition'] == 'outside') {echo "selected";} ?>>
+                                <?php _e('outside frame', 'sspdt'); ?>
+                            </option>
+                            <option value="inside"
+                            <?php if($fb['titlePosition'] == 'inside') {echo "selected";} ?>>
+                                <?php _e('inside frame', 'sspdt'); ?>
+                            </option>
+                            <option value="over"
+                            <?php if($fb['titlePosition'] == 'over') {echo "selected";} ?>>
+                                <?php _e('over image', 'sspdt'); ?>
+                            </option>
                     </select>
-                    </p><p>
-                    <?php _e('Out:', 'sspdt'); ?>
-                    <select id="transitionOut" name="transitionOut">
-                        <option value="none" <?php if($fb['transitionOut'] == 'none') {echo "selected";} ?>><?php _e('none', 'sspdt'); ?></option>
-                        <option value="fade" <?php if($fb['transitionOut'] == 'fade') {echo "selected";} ?>><?php _e('fade', 'sspdt'); ?></option>
-                        <option value="elastic" <?php if($fb['transitionOut'] == 'elastic') {echo "selected";} ?>><?php _e('elastic', 'sspdt'); ?></option>
-                    </select>
-                    <span style="margin-left: 20px;"><?php _e('Speed:', 'sspdt'); ?> </span>
-                    <input id="speedOut" name="speedOut" type="text" size="4" value="<?php echo $fb['speedOut']; ?>" />ms
-                    <span style="margin-left: 20px;"><?php _e('Easing:', 'sspdt'); ?> </span>
-                    <select id="easingOut" name="easingOut">
-                        <option value="linear" <?php if($fb['easingOut'] == 'linear') {echo "selected";} ?>><?php _e('Linear', 'sspdt'); ?></option>
-                        <option value="swing" <?php if($fb['easingOut'] == 'swing') {echo "selected";} ?>><?php _e('Swing', 'sspdt'); ?></option>
-                    </select>
-                    </p><p>
-                    <?php _e('Change speed:', 'sspdt'); ?>
-                    <input id="changeSpeed" name="changeSpeed" type="text" size="4" value="<?php echo $fb['changeSpeed']; ?>" />ms <i style="margin-left: 20px;"><?php _e('Speed of resizing when changing gallery items, in milliseconds', 'sspdt'); ?></i>
-                    </p>
-            </td>
-        </tr>
-        
-    </table>
-
-
-    <p class="submit"><input type="submit" name="submit" class="button-primary" value="<?php _e('Update settings', 'sspdt'); ?>" /></p>
-</form>
-
-</div>
-
-    
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th><label for="fb_overlay"><?php _e('Overlay', 'sspdt'); ?> </label>
+                    </th>
+                    <td><input id="overlayShow" name="overlayShow" type="checkbox"
+                        value="1"
+                        <?php if($fb['overlayShow'] == "1")  { echo "checked = 'checked'";} ?> />
+                        <?php _e('Show overlay', 'sspdt'); ?> <span
+                        style="margin-left: 20px;"><?php _e('Opacity:', 'sspdt'); ?> </span>
+                        <select id="overlayOpacity" name="overlayOpacity">
+                            <option value="0"
+                            <?php if($fb['overlayOpacity'] == '0') {echo "selected";} ?>>0</option>
+                            <option value="0.1"
+                            <?php if($fb['overlayOpacity'] == '0.1') {echo "selected";} ?>>0.1</option>
+                            <option value="0.2"
+                            <?php if($fb['overlayOpacity'] == '0.2') {echo "selected";} ?>>0.2</option>
+                            <option value="0.3"
+                            <?php if($fb['overlayOpacity'] == '0.3') {echo "selected";} ?>>0.3</option>
+                            <option value="0.4"
+                            <?php if($fb['overlayOpacity'] == '0.4') {echo "selected";} ?>>0.4</option>
+                            <option value="0.5"
+                            <?php if($fb['overlayOpacity'] == '0.5') {echo "selected";} ?>>0.5</option>
+                            <option value="0.6"
+                            <?php if($fb['overlayOpacity'] == '0.6') {echo "selected";} ?>>0.6</option>
+                            <option value="0.7"
+                            <?php if($fb['overlayOpacity'] == '0.7') {echo "selected";} ?>>0.7</option>
+                            <option value="0.8"
+                            <?php if($fb['overlayOpacity'] == '0.8') {echo "selected";} ?>>0.8</option>
+                            <option value="0.9"
+                            <?php if($fb['overlayOpacity'] == '0.9') {echo "selected";} ?>>0.9</option>
+                            <option value="1"
+                            <?php if($fb['overlayOpacity'] == '1') {echo "selected";} ?>>1</option>
+                    </select> <span style="margin-left: 20px;"><?php _e('Color:', 'sspdt'); ?>
+                    </span> <input type="text" id="overlayColor" name="overlayColor"
+                        value="<?php echo $fb['overlayColor'];?>" size="8" />
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th><label><?php _e('Navigation', 'sspdt'); ?> </label>
+                    </th>
+                    <td>
+                        <p>
+                            <input type="checkbox" id="cyclic" name="cyclic" value="1"
+                            <?php if($fb['cyclic'] == "1")  { echo "checked = 'checked'";} ?> />
+                            <?php _e('Cyclic navigation', 'sspdt'); ?>
+                        </p>
+                        <p>
+                            <input type="checkbox" id="showCloseButton"
+                                name="showCloseButton" value="1"
+                                <?php if($fb['showCloseButton'] == "1")  { echo "checked = 'checked'";} ?> />
+                                <?php _e('Show close button', 'sspdt'); ?>
+                        </p>
+                        <p>
+                            <input type="checkbox" id="showNavArrows" name="showNavArrows"
+                                value="1"
+                                <?php if($fb['showNavArrows'] == "1")  { echo "checked = 'checked'";} ?> />
+                                <?php _e('Show navigation arrows', 'sspdt'); ?>
+                        </p>
+                        <p>
+                            <input type="checkbox" id="enableEscapeButton"
+                                name="enableEscapeButton" value="1"
+                                <?php if($fb['enableEscapeButton'] == "1")  { echo "checked = 'checked'";} ?> />
+                                <?php _e('Enable ESC key', 'sspdt'); ?>
+                        </p>
+                    </td>
+                </tr>
+                <tr valign="middle">
+                    <th><label><?php _e('Transitions', 'sspdt'); ?> </label>
+                    </th>
+                    <td>
+                        <p>
+                        <?php _e('In:', 'sspdt'); ?>
+                            <select id="transitionIn" name="transitionIn">
+                                <option value="none"
+                                <?php if($fb['transitionIn'] == 'none') {echo "selected";} ?>>
+                                    <?php _e('none', 'sspdt'); ?>
+                                </option>
+                                <option value="fade"
+                                <?php if($fb['transitionIn'] == 'fade') {echo "selected";} ?>>
+                                    <?php _e('fade', 'sspdt'); ?>
+                                </option>
+                                <option value="elastic"
+                                <?php if($fb['transitionIn'] == 'elastic') {echo "selected";} ?>>
+                                    <?php _e('elastic', 'sspdt'); ?>
+                                </option>
+                            </select> <span style="margin-left: 20px;"><?php _e('Speed:', 'sspdt'); ?>
+                            </span> <input id="speedIn" name="speedIn" type="text" size="4"
+                                value="<?php echo $fb['speedIn']; ?>" />ms <span
+                                style="margin-left: 20px;"><?php _e('Easing:', 'sspdt'); ?> </span>
+                            <select id="easingIn" name="easingIn">
+                                <option value="linear"
+                                <?php if($fb['easingIn'] == 'linear') {echo "selected";} ?>>
+                                    <?php _e('Linear', 'sspdt'); ?>
+                                </option>
+                                <option value="swing"
+                                <?php if($fb['easingIn'] == 'swing') {echo "selected";} ?>>
+                                    <?php _e('Swing', 'sspdt'); ?>
+                                </option>
+                            </select>
+                        </p>
+                        <p>
+                            <?php _e('Out:', 'sspdt'); ?>
+                            <select id="transitionOut" name="transitionOut">
+                                <option value="none"
+                                <?php if($fb['transitionOut'] == 'none') {echo "selected";} ?>>
+                                    <?php _e('none', 'sspdt'); ?>
+                                </option>
+                                <option value="fade"
+                                <?php if($fb['transitionOut'] == 'fade') {echo "selected";} ?>>
+                                    <?php _e('fade', 'sspdt'); ?>
+                                </option>
+                                <option value="elastic"
+                                <?php if($fb['transitionOut'] == 'elastic') {echo "selected";} ?>>
+                                    <?php _e('elastic', 'sspdt'); ?>
+                                </option>
+                            </select> <span style="margin-left: 20px;"><?php _e('Speed:', 'sspdt'); ?>
+                            </span> <input id="speedOut" name="speedOut" type="text" size="4"
+                                value="<?php echo $fb['speedOut']; ?>" />ms <span
+                                style="margin-left: 20px;"><?php _e('Easing:', 'sspdt'); ?> </span>
+                            <select id="easingOut" name="easingOut">
+                                <option value="linear"
+                                <?php if($fb['easingOut'] == 'linear') {echo "selected";} ?>>
+                                    <?php _e('Linear', 'sspdt'); ?>
+                                </option>
+                                <option value="swing"
+                                <?php if($fb['easingOut'] == 'swing') {echo "selected";} ?>>
+                                    <?php _e('Swing', 'sspdt'); ?>
+                                </option>
+                            </select>
+                        </p>
+                        <p>
+                            <?php _e('Change speed:', 'sspdt'); ?>
+                            <input id="changeSpeed" name="changeSpeed" type="text" size="4"
+                                value="<?php echo $fb['changeSpeed']; ?>" />ms <i
+                                style="margin-left: 20px;"><?php _e('Speed of resizing when changing gallery items, in milliseconds', 'sspdt'); ?>
+                            </i>
+                        </p>
+                    </td>
+                </tr>
+
+            </table>
+
+
+            <p class="submit">
+                <input type="submit" name="submit" class="button-primary"
+                    value="<?php _e('Update settings', 'sspdt'); ?>" />
+            </p>
+        </form>
+
+    </div>
+
 
 </div>
 <?php
-} ?>
+}
+?>

ssp-director-tools/trunk/js/fancybox/jquery.fancybox-1.3.4.css

@@ -15 +15 @@
  *   http://www.gnu.org/licenses/gpl.html
  */
-
 #fancybox-loading {
     position: fixed;
@@ -131 +130 @@
 }
 
-#fancybox-left, #fancybox-right {
+#fancybox-left,#fancybox-right {
     position: absolute;
     bottom: 0px;
@@ -151 +150 @@
 }
 
-#fancybox-left-ico, #fancybox-right-ico {
+#fancybox-left-ico,#fancybox-right-ico {
     position: absolute;
     top: 50%;
@@ -173 +172 @@
 }
 
-#fancybox-left:hover, #fancybox-right:hover {
+#fancybox-left:hover,#fancybox-right:hover {
     visibility: visible; /* IE6 */
 }
@@ -222 +221 @@
     right: -20px;
     background-image: url('fancybox.png');
-    background-position: -40px -182px; 
+    background-position: -40px -182px;
 }
 
@@ -324 +323 @@
 
 /* IE6 */
-
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_close.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
-.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_main.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
-    height: expression(this.parentNode.clientHeight + "px");
+.fancybox-ie6 #fancybox-close {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_close.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-left-ico {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_nav_left.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-right-ico {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_nav_right.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-title-over {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_title_over.png', sizingMethod = 'scale' );
+    zoom: 1;
+}
+
+.fancybox-ie6 #fancybox-title-float-left {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_title_left.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-title-float-main {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_title_main.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-title-float-right {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_title_right.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie6 #fancybox-bg-w,.fancybox-ie6 #fancybox-bg-e,.fancybox-ie6 #fancybox-left,.fancybox-ie6 #fancybox-right,#fancybox-hide-sel-frame
+    {
+    height: expression(this.parentNode.clientHeight +   "px");
 }
 
 #fancybox-loading.fancybox-ie6 {
-    position: absolute; margin-top: 0;
-    top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
-}
-
-#fancybox-loading.fancybox-ie6 div  { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_loading.png', sizingMethod='scale'); }
+    position: absolute;
+    margin-top: 0;
+    top: expression(( -20 +   ( document.documentElement.clientHeight ?  
+        document.documentElement.clientHeight/ 2 :  
+        document.body.clientHeight/ 2) +   (   ignoreMe =  
+        document.documentElement.scrollTop ?  
+        document.documentElement.scrollTop :   document.body.scrollTop ) ) +  
+        'px' );
+}
+
+#fancybox-loading.fancybox-ie6 div {
+    background: transparent;
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_loading.png', sizingMethod = 'scale' );
+}
 
 /* IE6, IE7, IE8 */
-
-.fancybox-ie .fancybox-bg { background: transparent !important; }
-
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }
+.fancybox-ie .fancybox-bg {
+    background: transparent !important;
+}
+
+.fancybox-ie #fancybox-bg-n {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_n.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-ne {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_ne.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-e {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_e.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-se {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_se.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-s {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_s.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-sw {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_sw.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-w {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_w.png', sizingMethod = 'scale' );
+}
+
+.fancybox-ie #fancybox-bg-nw {
+    filter: progid : DXImageTransform.Microsoft.AlphaImageLoader ( src =
+        'fancybox/fancy_shadow_nw.png', sizingMethod = 'scale' );
+}

ssp-director-tools/trunk/languages/sspdt-de_DE.po

@@ -3 +3 @@
 "Project-Id-Version: SSP Director Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-08 18:18+0100\n"
-"PO-Revision-Date: 2011-07-08 18:21+0100\n"
+"POT-Creation-Date: 2011-07-13 15:35+0100\n"
+"PO-Revision-Date: 2011-07-13 15:37+0100\n"
 "Last-Translator: Matthias Scheidl <[email protected]>\n"
 "Language-Team: Matthias Scheidl <[email protected]>\n"
@@ -21 +21 @@
 msgstr "Schummeln Sie etwa?"
 
-#: ../includes/sspdt-options-page.php:19
+#: ../includes/sspdt-options-page.php:22
 msgid "Settings have been saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: ../includes/sspdt-options-page.php:28
+#: ../includes/sspdt-options-page.php:38
 msgid "API Settings seem wrong. Please double check them."
 msgstr "Die API Einstellungen sind offensichtlich nicht korrekt. Bitte überprüfen Sie sie."
 
-#: ../includes/sspdt-options-page.php:110
+#: ../includes/sspdt-options-page.php:123
 msgid "You must define the API settings. Otherwise this plugin won't work."
 msgstr "Sie müssen die API Einstellungen festlegen, sonst funktioniert dieses Plugin nicht."
 
-#: ../includes/sspdt-options-page.php:211
+#: ../includes/sspdt-options-page.php:212
 msgid "Your PHP version is too old."
 msgstr "Die Version von PHP auf diesem Server ist zu alt."
 
-#: ../includes/sspdt-options-page.php:212
+#: ../includes/sspdt-options-page.php:215
 msgid "The DirectorPHP API needs at least PHP 5. Please install it or get in touch with your internet provider or system administrator"
 msgstr "Die DirectorPHP API benötigt mindestens PHP 5. Bitte installieren sie PHP 5."
 
-#: ../includes/sspdt-options-page.php:219
+#: ../includes/sspdt-options-page.php:224
 msgid "php_curl is not installed."
 msgstr "php_curl ist nicht installiert."
 
-#: ../includes/sspdt-options-page.php:220
+#: ../includes/sspdt-options-page.php:227
 msgid "SSP Director Tools need php_curl be installed to work properly."
 msgstr "php_curl muss installiert sein, damit SSP Director Tools korrekt funktionieren."
 
-#: ../includes/sspdt-options-page.php:246
+#: ../includes/sspdt-options-page.php:255
 msgid "SlideShowPro Director Tools"
 msgstr "SlideShowPro Director Tools"
 
-#: ../includes/sspdt-options-page.php:252
+#: ../includes/sspdt-options-page.php:263
 msgid "API Settings"
 msgstr "API Einstellungen"
 
-#: ../includes/sspdt-options-page.php:253
+#: ../includes/sspdt-options-page.php:266
 msgid "The settings can be found on the \"System Info\" page of your SlideShowPro Director installation."
 msgstr "Die entsprechenden Werte finden Sie auf der Seite \"System Informationen\" Ihrer SlideShowPro Director Installation."
 
-#: ../includes/sspdt-options-page.php:258
+#: ../includes/sspdt-options-page.php:272
 msgid "API Key"
 msgstr "API Schlüssel"
 
-#: ../includes/sspdt-options-page.php:265
+#: ../includes/sspdt-options-page.php:280
 msgid "API Path"
 msgstr "API Pfad"
 
-#: ../includes/sspdt-options-page.php:276
+#: ../includes/sspdt-options-page.php:293
 msgid "Caching disabled"
 msgstr "Caching deaktiviert"
 
-#: ../includes/sspdt-options-page.php:278
+#: ../includes/sspdt-options-page.php:295
 #, php-format
 msgid "Your cache directory %s is not writable."
 msgstr "Ihr Cache Verzeichnis %s ist nicht beschreibbar."
 
-#: ../includes/sspdt-options-page.php:280
+#: ../includes/sspdt-options-page.php:297
 msgid "You must allow your web server to write to it in order to enable caching."
 msgstr "Um das Caching zu aktivieren, müssen Sie dem Web-Server Schreibrecht auf diesem Verzeichnis geben."
 
-#: ../includes/sspdt-options-page.php:287
+#: ../includes/sspdt-options-page.php:303
 msgid "API Cache"
 msgstr "API Cache"
 
-#: ../includes/sspdt-options-page.php:291
+#: ../includes/sspdt-options-page.php:311
 msgid "API Cache activated"
 msgstr "API Cache aktiviert"
 
-#: ../includes/sspdt-options-page.php:291
+#: ../includes/sspdt-options-page.php:312
 msgid "The API cache can improve performance dramatically."
 msgstr "Der API Cache kann die Performanz deutlich steigern."
 
-#: ../includes/sspdt-options-page.php:296
+#: ../includes/sspdt-options-page.php:319
 msgid "Photo Feed Options"
 msgstr "Foto Feed Einstellungen"
 
-#: ../includes/sspdt-options-page.php:297
+#: ../includes/sspdt-options-page.php:322
 msgid "Needed, if you want to use the photo feed functionality."
 msgstr "Wird benötigt, falls Sie die Foto Feed Funktionalität verwenden möchten."
 
-#: ../includes/sspdt-options-page.php:300
+#: ../includes/sspdt-options-page.php:327
 msgid "Photo Feed URL"
 msgstr "Foto Feed URL"
 
-#: ../includes/sspdt-options-page.php:304
+#: ../includes/sspdt-options-page.php:330
+msgid "Path to the photo feed installation with tailing slash."
+msgstr "Pfad zur Foto Feed Installation (mit abschließsendem Schrägstrich)."
+
+#: ../includes/sspdt-options-page.php:333
 msgid "Secret"
 msgstr "Secret"
 
-#: ../includes/sspdt-options-page.php:309
+#: ../includes/sspdt-options-page.php:336
+msgid "Enter the same secret as in the config.php file of your photo feed installation."
+msgstr "Geben Sie dasselbe Secret ein wie in der config.php Datei Ihrer Foto Feed Installation."
+
+#: ../includes/sspdt-options-page.php:341
 msgid "Image Sizes an Handling"
 msgstr "Bildgrössen und -handhabung"
 
-#: ../includes/sspdt-options-page.php:310
+#: ../includes/sspdt-options-page.php:344
 msgid "Define image sizes, quality and cropping."
 msgstr "Bildgrößen, Qualität und Zuschnitt festlegen."
 
-#: ../includes/sspdt-options-page.php:315
+#: ../includes/sspdt-options-page.php:351
 msgid "Width"
 msgstr "Breite"
 
-#: ../includes/sspdt-options-page.php:316
+#: ../includes/sspdt-options-page.php:352
 msgid "Height"
 msgstr "Höhe"
 
-#: ../includes/sspdt-options-page.php:317
+#: ../includes/sspdt-options-page.php:353
 msgid "Quality"
 msgstr "Qualität"
 
-#: ../includes/sspdt-options-page.php:318
+#: ../includes/sspdt-options-page.php:354
 msgid "Cropping"
 msgstr "Zuschnitt"
 
-#: ../includes/sspdt-options-page.php:319
+#: ../includes/sspdt-options-page.php:355
 msgid "Sharpening"
 msgstr "Schärfung"
 
-#: ../includes/sspdt-options-page.php:320
+#: ../includes/sspdt-options-page.php:356
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../includes/sspdt-options-page.php:321
-#: ../includes/sspdt-options-page.php:502
+#: ../includes/sspdt-options-page.php:357
+#: ../includes/sspdt-options-page.php:612
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../includes/sspdt-options-page.php:327
+#: ../includes/sspdt-options-page.php:364
 msgid "Grid"
 msgstr "Bildraster"
 
-#: ../includes/sspdt-options-page.php:349
+#: ../includes/sspdt-options-page.php:390
 msgid "Thumbnail"
 msgstr "Vorschau"
 
-#: ../includes/sspdt-options-page.php:368
-#: ../includes/sspdt-options-page.php:557
-#: ../includes/sspdt-options-page.php:571
+#: ../includes/sspdt-options-page.php:413
+#: ../includes/sspdt-options-page.php:706
+#: ../includes/sspdt-options-page.php:736
 msgid "none"
 msgstr "keine"
 
-#: ../includes/sspdt-options-page.php:369
+#: ../includes/sspdt-options-page.php:417
 msgid "left"
 msgstr "links"
 
-#: ../includes/sspdt-options-page.php:370
+#: ../includes/sspdt-options-page.php:421
 msgid "center"
 msgstr "zentriert"
 
-#: ../includes/sspdt-options-page.php:371
+#: ../includes/sspdt-options-page.php:425
 msgid "right"
 msgstr "rechts"
 
-#: ../includes/sspdt-options-page.php:380
+#: ../includes/sspdt-options-page.php:437
 msgid "Image"
 msgstr "Präsentation"
 
-#: ../includes/sspdt-options-page.php:418
+#: ../includes/sspdt-options-page.php:480
 msgid "Photo Grid Defaults"
 msgstr "Foto Grid Standardeinstellungen"
 
-#: ../includes/sspdt-options-page.php:419
+#: ../includes/sspdt-options-page.php:483
 msgid "Default settings for SSP Director Photo Grids."
 msgstr "Standardeinstellungen für SSP Director Foto Grids"
 
-#: ../includes/sspdt-options-page.php:420
+#: ../includes/sspdt-options-page.php:484
 msgid "These settings can be overridden by the photo grid shortcode [sspd] attributes."
 msgstr "Diese Einstellungen können mit den Attributen des Foto Grid Shortcodes [sspd] überschrieben werden."
 
-#: ../includes/sspdt-options-page.php:424
-#: ../includes/SSPDT_Widget.php:66
+#: ../includes/sspdt-options-page.php:489
+#: ../includes/SSPDT_Widget.php:75
 msgid "Scope"
 msgstr "Quelle"
 
-#: ../includes/sspdt-options-page.php:428
-#: ../includes/sspdt-options-page.php:463
-#: ../includes/SSPDT_Widget.php:68
-#: ../includes/SSPDT_Widget.php:86
+#: ../includes/sspdt-options-page.php:495
+#: ../includes/sspdt-options-page.php:546
+#: ../includes/SSPDT_Widget.php:80
+#: ../includes/SSPDT_Widget.php:119
 msgid "-- Not specified --"
 msgstr "-- Ohne Angabe --"
 
-#: ../includes/sspdt-options-page.php:429
-#: ../includes/SSPDT_Widget.php:69
+#: ../includes/sspdt-options-page.php:499
+#: ../includes/SSPDT_Widget.php:84
 msgid "Gallery"
 msgstr "Galerie"
 
-#: ../includes/sspdt-options-page.php:430
-#: ../includes/SSPDT_Widget.php:70
+#: ../includes/sspdt-options-page.php:503
+#: ../includes/SSPDT_Widget.php:88
 msgid "Album"
 msgstr "Album"
 
-#: ../includes/sspdt-options-page.php:437
+#: ../includes/sspdt-options-page.php:511
 msgid "Limit"
 msgstr "Maximale Anzahl"
 
-#: ../includes/sspdt-options-page.php:441
+#: ../includes/sspdt-options-page.php:514
 msgid "Leave blank if no limit should be specified."
 msgstr "Lassen SIe das Feld leer, wenn Sie die Zahl der Bilder nicht begrenzen wollen."
 
-#: ../includes/sspdt-options-page.php:446
-#: ../includes/SSPDT_Widget.php:77
+#: ../includes/sspdt-options-page.php:519
+#: ../includes/SSPDT_Widget.php:98
 msgid "Tags"
 msgstr "Schlüsselwörter"
 
-#: ../includes/sspdt-options-page.php:451
-#: ../includes/SSPDT_Widget.php:80
+#: ../includes/sspdt-options-page.php:528
+#: ../includes/SSPDT_Widget.php:104
 msgid "all"
 msgstr "alle"
 
-#: ../includes/sspdt-options-page.php:452
-#: ../includes/SSPDT_Widget.php:81
+#: ../includes/sspdt-options-page.php:532
+#: ../includes/SSPDT_Widget.php:108
 msgid "one"
 msgstr "eines"
 
-#: ../includes/sspdt-options-page.php:454
+#: ../includes/sspdt-options-page.php:534
 msgid "Leave blank if no tags should be specified."
 msgstr "Lassen Sie das Feld leer, wenn Sie keine Schlüsselwörter spezifizieren wollen."
 
-#: ../includes/sspdt-options-page.php:459
+#: ../includes/sspdt-options-page.php:539
 msgid "Sort"
 msgstr "Sortierung"
 
-#: ../includes/sspdt-options-page.php:464
-#: ../includes/SSPDT_Widget.php:87
+#: ../includes/sspdt-options-page.php:550
+#: ../includes/SSPDT_Widget.php:123
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-#: ../includes/sspdt-options-page.php:465
-#: ../includes/SSPDT_Widget.php:88
+#: ../includes/sspdt-options-page.php:554
+#: ../includes/SSPDT_Widget.php:127
 msgid "Capture Date"
 msgstr "Aufnahmedatum"
 
-#: ../includes/sspdt-options-page.php:466
-#: ../includes/SSPDT_Widget.php:89
+#: ../includes/sspdt-options-page.php:558
+#: ../includes/SSPDT_Widget.php:131
 msgid "Modification Date"
 msgstr "Änderungsdatum"
 
-#: ../includes/sspdt-options-page.php:467
-#: ../includes/SSPDT_Widget.php:90
+#: ../includes/sspdt-options-page.php:562
+#: ../includes/SSPDT_Widget.php:135
 msgid "File Name"
 msgstr "Dateiname"
 
-#: ../includes/sspdt-options-page.php:468
-#: ../includes/SSPDT_Widget.php:91
+#: ../includes/sspdt-options-page.php:566
+#: ../includes/SSPDT_Widget.php:139
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../includes/sspdt-options-page.php:471
-#: ../includes/SSPDT_Widget.php:94
+#: ../includes/sspdt-options-page.php:573
+#: ../includes/SSPDT_Widget.php:147
 msgid "ascending"
 msgstr "aufsteigend"
 
-#: ../includes/sspdt-options-page.php:472
-#: ../includes/SSPDT_Widget.php:95
+#: ../includes/sspdt-options-page.php:577
+#: ../includes/SSPDT_Widget.php:151
 msgid "descending"
 msgstr "absteigend"
 
-#: ../includes/sspdt-options-page.php:478
+#: ../includes/sspdt-options-page.php:583
 msgid "Photo Feed"
 msgstr "Foto Feed"
 
-#: ../includes/sspdt-options-page.php:481
+#: ../includes/sspdt-options-page.php:588
 msgid "Show a link to a photo feed for gallery images."
 msgstr "Einen Foto-Feed Link für die Galerie-Bilder anzeigen."
 
-#: ../includes/sspdt-options-page.php:486
+#: ../includes/sspdt-options-page.php:594
 msgid "Presentation"
 msgstr "Darstellung"
 
-#: ../includes/sspdt-options-page.php:487
+#: ../includes/sspdt-options-page.php:597
 msgid "FancyBox settings for image presentation."
 msgstr "FancyBox Einstellungen für die Bild-Darstellung"
 
-#: ../includes/sspdt-options-page.php:491
+#: ../includes/sspdt-options-page.php:602
 msgid "Box"
 msgstr "Rahmen"
 
-#: ../includes/sspdt-options-page.php:494
+#: ../includes/sspdt-options-page.php:604
 msgid "Padding"
 msgstr "Innenabstand"
 
-#: ../includes/sspdt-options-page.php:496
+#: ../includes/sspdt-options-page.php:607
 msgid "Margin"
 msgstr "Ränder"
 
-#: ../includes/sspdt-options-page.php:505
+#: ../includes/sspdt-options-page.php:615
 msgid "Position:"
 msgstr "Position:"
 
-#: ../includes/sspdt-options-page.php:507
+#: ../includes/sspdt-options-page.php:619
 msgid "outside frame"
 msgstr "außerhalb des Rahmens"
 
-#: ../includes/sspdt-options-page.php:508
+#: ../includes/sspdt-options-page.php:623
 msgid "inside frame"
 msgstr "innerhalb des Rahmens"
 
-#: ../includes/sspdt-options-page.php:509
+#: ../includes/sspdt-options-page.php:627
 msgid "over image"
 msgstr "über dem Bild"
 
-#: ../includes/sspdt-options-page.php:515
+#: ../includes/sspdt-options-page.php:633
 msgid "Overlay"
 msgstr "Overlay"
 
-#: ../includes/sspdt-options-page.php:519
+#: ../includes/sspdt-options-page.php:638
 msgid "Show overlay"
 msgstr "Overlay anzeigen"
 
-#: ../includes/sspdt-options-page.php:520
+#: ../includes/sspdt-options-page.php:639
 msgid "Opacity:"
 msgstr "Deckkraft:"
 
-#: ../includes/sspdt-options-page.php:534
+#: ../includes/sspdt-options-page.php:663
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../includes/sspdt-options-page.php:540
+#: ../includes/sspdt-options-page.php:669
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../includes/sspdt-options-page.php:543
+#: ../includes/sspdt-options-page.php:675
 msgid "Cyclic navigation"
 msgstr "Zyklische Navigation"
 
-#: ../includes/sspdt-options-page.php:544
+#: ../includes/sspdt-options-page.php:681
 msgid "Show close button"
 msgstr "Schließen-Button anzeigen"
 
-#: ../includes/sspdt-options-page.php:545
+#: ../includes/sspdt-options-page.php:687
 msgid "Show navigation arrows"
 msgstr "Navigations-Pfeile anzeigen"
 
-#: ../includes/sspdt-options-page.php:546
+#: ../includes/sspdt-options-page.php:693
 msgid "Enable ESC key"
 msgstr "Schließen mit ESC-Taste aktivieren"
 
-#: ../includes/sspdt-options-page.php:551
+#: ../includes/sspdt-options-page.php:698
 msgid "Transitions"
 msgstr "Übergänge"
 
-#: ../includes/sspdt-options-page.php:555
+#: ../includes/sspdt-options-page.php:702
 msgid "In:"
 msgstr "Einwärts:"
 
-#: ../includes/sspdt-options-page.php:558
-#: ../includes/sspdt-options-page.php:572
+#: ../includes/sspdt-options-page.php:710
+#: ../includes/sspdt-options-page.php:740
 msgid "fade"
 msgstr "Überblenden"
 
-#: ../includes/sspdt-options-page.php:559
-#: ../includes/sspdt-options-page.php:573
+#: ../includes/sspdt-options-page.php:714
+#: ../includes/sspdt-options-page.php:744
 msgid "elastic"
 msgstr "Elastisch"
 
-#: ../includes/sspdt-options-page.php:561
-#: ../includes/sspdt-options-page.php:575
+#: ../includes/sspdt-options-page.php:716
+#: ../includes/sspdt-options-page.php:746
 msgid "Speed:"
 msgstr "Dauer:"
 
-#: ../includes/sspdt-options-page.php:563
-#: ../includes/sspdt-options-page.php:577
+#: ../includes/sspdt-options-page.php:719
+#: ../includes/sspdt-options-page.php:749
 msgid "Easing:"
 msgstr "Easing"
 
-#: ../includes/sspdt-options-page.php:565
-#: ../includes/sspdt-options-page.php:579
+#: ../includes/sspdt-options-page.php:723
+#: ../includes/sspdt-options-page.php:753
 msgid "Linear"
 msgstr "Linear"
 
-#: ../includes/sspdt-options-page.php:566
-#: ../includes/sspdt-options-page.php:580
+#: ../includes/sspdt-options-page.php:727
+#: ../includes/sspdt-options-page.php:757
 msgid "Swing"
 msgstr "Swing"
 
-#: ../includes/sspdt-options-page.php:569
+#: ../includes/sspdt-options-page.php:732
 msgid "Out:"
 msgstr "Auswärts:"
 
-#: ../includes/sspdt-options-page.php:583
+#: ../includes/sspdt-options-page.php:762
 msgid "Change speed:"
 msgstr "Dauer des Bildwechsels"
 
-#: ../includes/sspdt-options-page.php:584
+#: ../includes/sspdt-options-page.php:765
 msgid "Speed of resizing when changing gallery items, in milliseconds"
 msgstr "Dauer des Bildwechsels in Millisekunden"
 
-#: ../includes/sspdt-options-page.php:592
+#: ../includes/sspdt-options-page.php:776
 msgid "Update settings"
 msgstr "Einstellungen speichern"
 
-#: ../includes/SSPDT.php:146
+#: ../includes/SSPDT.php:150
 msgid "Aquire these images as photo feed."
 msgstr "Diese Bilder als Foto-Feed beziehen."
@@ -424 +432 @@
 
 #: ../includes/SSPDT_Widget.php:33
-#: ../includes/SSPDT_Widget.php:56
+#: ../includes/SSPDT_Widget.php:57
 msgid "Title"
 msgstr "Titel"
 
-#: ../includes/SSPDT_Widget.php:59
+#: ../includes/SSPDT_Widget.php:63
 msgid "Surrounding HTML Element"
 msgstr "Umschließendes HTML Element"
 
-#: ../includes/SSPDT_Widget.php:75
+#: ../includes/SSPDT_Widget.php:95
 #, php-format
 msgid "Limit to <input name=\"%s\" type=\"text\" size=\"3\" value=\"%s\"/> images."
 msgstr "Auf <input name=\"%s\" type=\"text\" size=\"3\" value=\"%s\"/> Bilder begrenzen."
 
-#: ../includes/SSPDT_Widget.php:84
+#: ../includes/SSPDT_Widget.php:113
 msgid "Sort by"
 msgstr "Sortierung"
+
+#~ msgid "Incorrect feed parameters."
+#~ msgstr "Falsche Feed"
 
 #~ msgid "Gallery Defaults"

ssp-director-tools/trunk/readme.txt

@@ -3 +3 @@
 Tags: SlideShowPro, images, gallery, album, photos, fancybox, API, SSP, SSP Director, widget, shortcode
 Requires at least: 3.0
-Tested up to: 3.2
-Stable tag: 1.0
+Tested up to: 3.2.1
+Stable tag: 1.0.1
 
 SSP Director Tools give you means for integrating SlideShowPro Director content into a WordPress blog.
@@ -35 +35 @@
 * It is recommended to copy the `feed` directory to a directory outside of your WordPress installation.
 * You might consider to copy it to the server hosting your director installation, e.g. to `http://director.myserver.com/feed/`.
-* Then, enter the path to the `feed.php` into the SSP Director Toos Options page, e.g. `http://director.mysserver.com/feed/feed.php`.
+* Then, enter the path to the feed installation into the SSP Director Toos Options page, e.g. `http://director.mysserver.com/feed/`.
 * Define a secret for your photo feed installation, enter it into the SSP Director Tools Options page and set the `$sspdt_secret`variable in the `config.php`file to the same value.
 * Finally, set the `$sspd_api_key`and `$sspd_api_path` variables in the `config.php`file to the values for your SSP Director installation.
@@ -56 +56 @@
 
 == Changelog ==
+
+= 1.0.1 =
+* Fixed de_DE localization
+* Some maintenance fixes
 
 = 1.0 =
@@ -79 +83 @@
 * `tagmode`: Mode in which the tag filter works. Match all tags or any out of the list (all|one, default: one).
 * `sort_on`: The sort field (null|created_on|captured_on|modified_on|filename|random, default: null).
-* `sort_direction`: The sort order (ASC|DESC, default: ASC).
+* `sort_direction`: The sort order (ASC|DESC, default: DESC).
 * `rss`: Whether or not to show a RSS photo feed link below the photo grid (yes|1|no|0, default: 1).
 
@@ -92 +96 @@
 
 * A bug in the Director API v. 1.5.0 beta generates a wrong result when a query with multiple tags is done. See [SSP Director Forum](http://forums.slideshowpro.net/viewtopic.php?id=29339).
+* The plugin currently doesn't check if the photo feed feature is installed correctly.

ssp-director-tools/trunk/ssp-director-tools.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: SSP Director Tools
-Description: SSP Director Tools help you to link content from a SlideShowPro Director installation to WordPress posts and pages. 
-Version: 1.0
-Text Domain: sspdt
-Author: Matthias Scheidl <matthias@scheidl.name>
-*/
+ Plugin Name: SSP Director Tools
+ Description: SSP Director Tools help you to link content from a SlideShowPro Director installation to WordPress posts and pages.
+ Version: 1.0.1
+ Text Domain: sspdt
+ Author: Matthias Scheidl <dev@scheidl.name>
+ */
 
-/*  Copyright 2010-2011  Matthias Scheidl  (email : matthias@scheidl.name)
+/*  Copyright 2010-2011  Matthias Scheidl  (email : dev@scheidl.name)
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License, version 2, as 
-    published by the Free Software Foundation.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2, as
+published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -64 +64 @@
     if(!is_admin()) {
         wp_deregister_script( 'jquery' );
-        wp_register_script( 'jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js');
-        wp_enqueue_script( 'jquery' );
+        wp_register_script( 'jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js');
+        wp_enqueue_script( 'jquery' );
         wp_register_script('sspdt_fancybox_js', plugins_url('/js/fancybox/jquery.fancybox-1.3.4.pack.js', __FILE__));
         wp_enqueue_script('sspdt_fancybox_js');
@@ -80 +80 @@
         echo '  $j(document).ready(function() {';
         echo '      $j("a.fancybox").fancybox({"type" : "image"';
-        
+
         if( isset( $fb['padding'] ) ) echo ', "padding" : ' . (int) $fb['padding'];
         if( isset( $fb['margin'] ) ) echo ', "margin" : ' . (int) $fb['margin'];
@@ -86 +86 @@
         if( isset( $fb['titlePosition'] ) && $fb['titlePosition'] != 'outside' ) echo ', "titlePosition" : "' . $fb['titlePosition'] . '"';
         /*if( $fb['counterShow'] == '1' && $fb['titlePosition'] == 'inside')  echo ', "titleFormat" : function (title, currentArray, currentIndex, currentOpts) {
-    return "<div id=\'tip7-title\' style=\'text-align:left\'>" + (title && title.length ? + title + : "" ) + "Image " + (currentIndex + 1) + " of " + currentArray.length + "</div>";
-};';*/
+         return "<div id=\'tip7-title\' style=\'text-align:left\'>" + (title && title.length ? + title + : "" ) + "Image " + (currentIndex + 1) + " of " + currentArray.length + "</div>";
+         };';*/
         echo ( $fb['overlayShow'] === '1' ? ', "overlayShow" : true' : ', "overlayShow" : false');
         if( isset( $fb['overlayOpacity'] ) && $fb['overlayShow'] === '1') echo ', "overlayOpacity" : ' . (float) $fb['overlayOpacity'] ;
@@ -95 +95 @@
         echo ( $fb['showCloseButton'] === '1' ? ', "showCloseButton" : true' : ', "showCloseButton" : false');
         echo ( $fb['enableEscapeButton'] === '1' ? ', "enableEscapeButton" : true' : ', "enableEscapeButton" : false');
-        
+
         if( isset( $fb['transitionIn'] ) ) echo ', "transitionIn" : "' . $fb['transitionIn'] . '"';
         if( isset( $fb['speedIn'] ) && $fb['transitionIn'] != 'none') echo ', "speedIn" : ' . (int) $fb['speedIn'];
@@ -103 +103 @@
         if( isset( $fb['easingOut'] ) && $fb['transitionOut'] == 'easing' ) echo ', "easingOut" : "' . $fb['easingOut'] . '"';
         if( isset( $fb['changeSpeed'] ) ) echo ', "changeSpeed" : ' . (int) $fb['changeSpeed'];
-        
+
         echo '      });';
         echo '  });';
@@ -152 +152 @@
 add_action( 'widgets_init', 'sspdt_register_widget' );
 function sspdt_register_widget() {
-    register_widget( 'SSPDT_Widget' );
+    register_widget( 'SSPDT_Widget' );
 }
 
-
 ?>