Changeset 196034

Timestamp:

01/21/2010 04:07:31 AM (16 years ago)

Author:

malcalevak

Message:

Removed XSS Vulnerability and fixed rare failure to update issue.
Resolved JS issue with IE installs.

Location:

wp-slimbox2/trunk

Files:

• adminpage.php (modified) (3 diffs)
• javascript/slimbox2_autoload.js (modified) (1 diff)
• javascript/src/slimbox2_autoload.js (modified) (2 diffs)

wp-slimbox2/trunk/adminpage.php

@@ -4 +4 @@
     $msArray = array(1,100,200,300,400,500,600,700,800,900,1000);
     $captions = array('a-title','img-alt','img-title','href','None');
-?>
+
+    ?>
 <div class="wrap">
-    <form method="post" action="<?php echo $_SERVER['PHP_SELF']?>?page=slimbox2options" id="options"><?php  echo wp_nonce_field('update-options','wp_slimbox_wpnonce'); ?><h2><?php _e('WP Slimbox2 Plugin', 'wp-slimbox2'); ?></h2>
+    <form method="post" action="" id="options"><?php    echo wp_nonce_field('update-options','wp_slimbox_wpnonce'); ?><h2><?php _e('WP Slimbox2 Plugin', 'wp-slimbox2'); ?></h2>
 <?php
     if(isset($_POST['action']) && wp_verify_nonce($_POST['wp_slimbox_wpnonce'], 'update-options')) {
@@ -306 +307 @@
     <h2><?php _e('Notes', 'wp-slimbox2');?></h2>
     <table class="widefat" cellspacing="0" id="active-plugins-table">
+        <tfoot>
+        <tr>
+            <th scope="col"></th>
+        </tr>
+
+        </tfoot>
         <tbody class="plugins">
             <tr class="inactive">
@@ -324 +331 @@
         </tbody>
     </table>
-
 </div>

wp-slimbox2/trunk/javascript/slimbox2_autoload.js

@@ -1 @@
-jQuery(document).ready(function(a){if(slimbox2_options.mobile||!/android|iphone|ipod|series60|symbian|windows ce|blackberry/i.test(navigator.userAgent)){slimbox_CSS();load_slimbox()}});function slimbox_CSS(){jQuery(function(a){a("#lbOverlay").css("background-color",slimbox2_options.overlayColor);if(slimbox2_options.LTR=="RTL"){a("#lbPrevLink").addClass("next");a("#lbNextLink").addClass("prev");a(".next").attr("id","lbNextLink");a(".prev").attr("id","lbPrevLink")}a("#lbPrevLink").hover(function(){a(this).css("background-image","url("+slimbox2_options.prev+")")},function(){a(this).css("background-image","")});a("#lbNextLink").hover(function(){a(this).css("background-image","url("+slimbox2_options.next+")")},function(){a(this).css("background-image","")});a("#lbCloseLink").css("background","transparent url("+slimbox2_options.close+") no-repeat center")})}function load_slimbox(){jQuery(function($){var options={loop:slimbox2_options.loop,overlayOpacity:slimbox2_options.overlayOpacity,overlayFadeDuration:parseInt(slimbox2_options.overlayFadeDuration),resizeDuration:parseInt(slimbox2_options.resizeDuration),resizeEasing:slimbox2_options.resizeEasing,initialWidth:parseInt(slimbox2_options.initialWidth),initialHeight:parseInt(slimbox2_options.initialHeight),imageFadeDuration:parseInt(slimbox2_options.imageFadeDuration),captionAnimationDuration:parseInt(slimbox2_options.captionAnimationDuration),counterText:slimbox2_options.counterText,closeKeys:slimbox2_options.closeKeys.split(",").map(Number),previousKeys:slimbox2_options.previousKeys.split(",").map(Number),nextKeys:slimbox2_options.nextKeys.split(",").map(Number)};if(slimbox2_options.autoload){$("a[href]").filter(function(){return/\.(jpeg|bmp|jpg|png|gif)(\?[\d\w=&]*)?$/i.test(this.href)}).unbind("click").slimbox(options,function(el){return[el.href,(slimbox2_options.url)?'<a href="'+el.href+'">'+eval(slimbox2_options.caption)+"</a>":eval(slimbox2_options.caption)]},function(el){return(this==el)||($(this).closest(slimbox2_options.selector)[0]&&($(this).closest(slimbox2_options.selector)[0]==$(el).closest(slimbox2_options.selector)[0]))})}else{$("a[rel^='lightbox']").unbind("click").slimbox(options,function(el){return[el.href,(slimbox2_options.url)?'<a href="'+el.href+'">'+eval(slimbox2_options.caption)+"</a>":eval(slimbox2_options.caption)]},function(el){return(this==el)||((this.rel.length>8)&&(this.rel==el.rel))})}if(slimbox2_options.picasaweb){$("a[href^='http://picasaweb.google.'] > img:first-child[src]").parent().unbind("click").slimbox(options,function(el){return[el.firstChild.src.replace(/\/s\d+(?:\-c)?\/([^\/]+)$/,"/s640/$2"),(el.title||el.firstChild.alt)+'<br /><a href="'+el.href+'">Picasa Web Albums page</a>']})}if(slimbox2_options.flickr){$("a[href^='http://www.flickr.com/photos/'] > img:first-child[src]").parent().unbind("click").slimbox(options,function(el){return[el.firstChild.src.replace(/_[mts]\.(\w+)$/,".$1"),(el.title||el.firstChild.alt)+'<br /><a href="'+el.href+'">Flickr page</a>']})}})};
+jQuery(document).ready(function(b){if(slimbox2_options.mobile||!/android|iphone|ipod|series60|symbian|windows ce|blackberry/i.test(navigator.userAgent)){slimbox_CSS();closeKeys=slimbox2_options.closeKeys.split(",");previousKeys=slimbox2_options.previousKeys.split(",");nextKeys=slimbox2_options.nextKeys.split(",");for(var a in closeKeys){closeKeys[a]=parseInt(closeKeys[a])}for(var a in previousKeys){previousKeys[a]=parseInt(previousKeys[a])}for(var a in nextKeys){nextKeys[a]=parseInt(nextKeys[a])}load_slimbox()}});function slimbox_CSS(){jQuery(function(a){a("#lbOverlay").css("background-color",slimbox2_options.overlayColor);if(slimbox2_options.LTR=="RTL"){a("#lbPrevLink").addClass("next");a("#lbNextLink").addClass("prev");a(".next").attr("id","lbNextLink");a(".prev").attr("id","lbPrevLink")}a("#lbPrevLink").hover(function(){a(this).css("background-image","url("+slimbox2_options.prev+")")},function(){a(this).css("background-image","")});a("#lbNextLink").hover(function(){a(this).css("background-image","url("+slimbox2_options.next+")")},function(){a(this).css("background-image","")});a("#lbCloseLink").css("background","transparent url("+slimbox2_options.close+") no-repeat center")})}function load_slimbox(){jQuery(function($){var options={loop:slimbox2_options.loop,overlayOpacity:slimbox2_options.overlayOpacity,overlayFadeDuration:parseInt(slimbox2_options.overlayFadeDuration),resizeDuration:parseInt(slimbox2_options.resizeDuration),resizeEasing:slimbox2_options.resizeEasing,initialWidth:parseInt(slimbox2_options.initialWidth),initialHeight:parseInt(slimbox2_options.initialHeight),imageFadeDuration:parseInt(slimbox2_options.imageFadeDuration),captionAnimationDuration:parseInt(slimbox2_options.captionAnimationDuration),counterText:slimbox2_options.counterText,closeKeys:closeKeys,previousKeys:previousKeys,nextKeys:nextKeys};if(slimbox2_options.autoload){$("a[href]").filter(function(){return/\.(jpeg|bmp|jpg|png|gif)(\?[\d\w=&]*)?$/i.test(this.href)}).unbind("click").slimbox(options,function(el){return[el.href,(slimbox2_options.url)?'<a href="'+el.href+'">'+eval(slimbox2_options.caption)+"</a>":eval(slimbox2_options.caption)]},function(el){return(this==el)||($(this).closest(slimbox2_options.selector)[0]&&($(this).closest(slimbox2_options.selector)[0]==$(el).closest(slimbox2_options.selector)[0]))})}else{$("a[rel^='lightbox']").unbind("click").slimbox(options,function(el){return[el.href,(slimbox2_options.url)?'<a href="'+el.href+'">'+eval(slimbox2_options.caption)+"</a>":eval(slimbox2_options.caption)]},function(el){return(this==el)||((this.rel.length>8)&&(this.rel==el.rel))})}if(slimbox2_options.picasaweb){$("a[href^='http://picasaweb.google.'] > img:first-child[src]").parent().unbind("click").slimbox(options,function(el){return[el.firstChild.src.replace(/\/s\d+(?:\-c)?\/([^\/]+)$/,"/s640/$2"),(el.title||el.firstChild.alt)+'<br /><a href="'+el.href+'">Picasa Web Albums page</a>']})}if(slimbox2_options.flickr){$("a[href^='http://www.flickr.com/photos/'] > img:first-child[src]").parent().unbind("click").slimbox(options,function(el){return[el.firstChild.src.replace(/_[mts]\.(\w+)$/,".$1"),(el.title||el.firstChild.alt)+'<br /><a href="'+el.href+'">Flickr page</a>']})}})};

wp-slimbox2/trunk/javascript/src/slimbox2_autoload.js

@@ -1 @@
-//pack for final release
 jQuery(document).ready(function($) {
     if(slimbox2_options['mobile'] || !/android|iphone|ipod|series60|symbian|windows ce|blackberry/i.test(navigator.userAgent)){
         slimbox_CSS();
+        closeKeys = slimbox2_options['closeKeys'].split(',');
+        previousKeys = slimbox2_options['previousKeys'].split(',');
+        nextKeys = slimbox2_options['nextKeys'].split(',');
+        for ( var i in closeKeys) closeKeys[i] = parseInt(closeKeys[i]);
+        for ( var i in previousKeys) previousKeys[i] = parseInt(previousKeys[i]);
+        for ( var i in nextKeys) nextKeys[i] = parseInt(nextKeys[i]);
         load_slimbox();
     }
@@ -49 +54 @@
                     captionAnimationDuration: parseInt(slimbox2_options['captionAnimationDuration']),
                     counterText: slimbox2_options['counterText'],
-                    closeKeys: slimbox2_options['closeKeys'].split(',').map(Number),
-                    previousKeys: slimbox2_options['previousKeys'].split(',').map(Number),
-                    nextKeys: slimbox2_options['nextKeys'].split(',').map(Number) 
+                    closeKeys: closeKeys,
+                    previousKeys: previousKeys,
+                    nextKeys: nextKeys
                 }
         if(slimbox2_options['autoload']) {