WP Photo Album Plus - Version 6.4.09

Version Description

Download this release

Release Info

Developer opajaap
Plugin Icon wp plugin WP Photo Album Plus
Version 6.4.09
Comparing to
See all releases

Code changes from version 6.4.08 to 6.4.09

js/wppa-lightbox.js CHANGED
@@ -3,7 +3,7 @@
3
  // Conatins lightbox modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
- var wppaLightboxVersion = '6.4.08';
7
 
8
  // Global inits
9
  var wppaNormsBtnOpac = 1;
@@ -11,6 +11,8 @@ var wppaIsVideo = false;
11
  var wppaHasAudio = false;
12
  var wppaOvlImgs = [];
13
  var wppaKbHandlerInstalled = false;
 
 
14
 
15
  // Global size specs
16
  var wppaSavedContainerWidth;
@@ -31,7 +33,7 @@ jQuery( window ).resize(function() {
31
  height:window.innerHeight,
32
  width:window.innerWidth,
33
  });
34
- wppaOvlResize( 10 );
35
  });
36
 
37
  // Keyboard handler
@@ -101,14 +103,16 @@ function wppaOvlKeyboardHandler( e ) {
101
  }
102
 
103
  // Switch to fullscreen mode
104
- function wppaOvlFull() {
105
  wppaConsoleLog( 'wppaOvlFull' );
106
 
107
  var oldMode = wppaOvlMode;
108
- wppaOvlStepMode();
 
 
109
  var elem = document.getElementById('wppa-overlay-ic');
110
  if ( ! elem ) return;
111
- if ( oldMode == 'normal' ) {
112
  if (elem.requestFullscreen) {
113
  elem.requestFullscreen();
114
  } else if (elem.mozRequestFullScreen) {
@@ -142,7 +146,10 @@ wppaConsoleLog( 'wppaOvlNorm' );
142
  } else if (document.webkitCancelFullScreen) {
143
  document.webkitCancelFullScreen();
144
  }
145
- if ( exit ) return;
 
 
 
146
 
147
  setTimeout( 'wppaOvlShow( '+wppaOvlIdx+' )', 1000 );
148
  }
@@ -169,17 +176,22 @@ wppaConsoleLog( 'wppaOvlShow arg='+arg );
169
  }
170
 
171
  // Stop all slideshows
172
- var occ = 0;
173
- while ( occ < wppaTopMoc ) {
174
- occ++;
175
- wppaStopShow( occ );
176
- }
177
 
178
  // Adjust background size
179
  jQuery( '#wppa-overlay-bg' ).css({
180
  width:window.innerWidth,
181
  height:window.innerHeight,
182
  });
 
 
 
 
 
183
  }
184
 
185
  // If arg = 'this', setup the array of data
@@ -272,12 +284,8 @@ wppaConsoleLog( 'wppaOvlShow arg='+arg );
272
  }
273
 
274
  // Now start the actual function
275
- // if ( wppaOvlFirst ) {
276
- setTimeout( function(){ _wppaOvlShow( wppaOvlIdx )}, 100 );
277
- // }
278
- // else {
279
- // _wppaOvlShow( wppaOvlIdx );
280
- // }
281
  }
282
 
283
  // Show the lightbox overlay.
@@ -285,6 +293,9 @@ wppaConsoleLog( 'wppaOvlShow arg='+arg );
285
  function _wppaOvlShow( idx ) {
286
  wppaConsoleLog( '_wppaOvlShow, idx='+idx );
287
 
 
 
 
288
  // Show spinner
289
  jQuery( '#wppa-overlay-sp' ).css( { visibility: 'visible' } );
290
 
@@ -294,7 +305,7 @@ wppaConsoleLog( '_wppaOvlShow, idx='+idx );
294
 
295
  // Preload current image
296
  // Not an empty url, and do not wait infinitely for a possibly non-existend posterimage
297
- if ( wppaOvlUrls[idx].length > 0 && ! wppaIsVideo ) {
298
  wppaOvlImgs[idx] = new Image();
299
  wppaOvlImgs[idx].src = wppaOvlUrls[idx]; // Preload
300
  wppaConsoleLog( 'Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)' );
@@ -308,7 +319,7 @@ wppaConsoleLog( '_wppaOvlShow, idx='+idx );
308
  var next;
309
  var prev;
310
 
311
- // Preload next
312
  if ( wppaOvlIdx == ( wppaOvlUrls.length-1 ) ) {
313
  next = 0;
314
  }
@@ -596,7 +607,9 @@ wppaConsoleLog( '_wppaOvlShow, idx='+idx );
596
  ' />';
597
 
598
  // The start/stop button
599
- if ( wppaOvlShowStartStop && ! wppaOvlIsSingle ) {
 
 
600
  html += '<img' +
601
  ' id="wppa-ovl-start-stop-btn"' +
602
  ' class="wppa-ovl-nav-btn"' +
@@ -748,9 +761,9 @@ wppaConsoleLog( 'wppaOvlSize' );
748
  var cw, nw, nh;
749
 
750
  if ( wppaOvlIsVideo ) {
751
- cw = 640;
752
- nw = 640;
753
- nh = 480;
754
  }
755
  else {
756
  cw = img.clientWidth;
@@ -819,6 +832,8 @@ wppaConsoleLog( 'wppaOvlSize' );
819
  done = false;
820
  }
821
 
 
 
822
  wppaSavedImageWidth = wid;
823
  wppaSavedImageHeight = wid * nh / nw;
824
  wppaSavedMarginLeft = - ( wid / 2 + wppaOvlBorderWidth );
@@ -861,7 +876,7 @@ wppaConsoleLog( 'wppaOvlSize' );
861
 
862
  // Show fullscreen lightbox image
863
  function wppaOvlFormatFull() {
864
- wppaConsoleLog( 'wppaOvlFormatFull' );
865
 
866
  var img;
867
  var natWidth;
@@ -933,12 +948,12 @@ wppaConsoleLog( 'wppaOvlFormatFull' );
933
  case 'realsize':
934
  margLeft = ( jQuery( window ).width() - natWidth ) / 2;
935
  if ( margLeft < 0 ) {
936
- scrollLeft = - margLeft;
937
  margLeft = 0;
938
  }
939
  margTop = ( jQuery( window ).height() - natHeight ) / 2;
940
  if ( margTop < 0 ) {
941
- scrollTop = - margTop;
942
  margTop = 0;
943
  }
944
  imgHeight = natHeight;
@@ -951,7 +966,7 @@ wppaConsoleLog( 'wppaOvlFormatFull' );
951
  imgHeight = parseInt( imgHeight );
952
  imgWidth = parseInt( imgWidth );
953
 
954
- jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0});
955
  jQuery(img).css({visibility:'visible'});
956
  jQuery( '#wppa-ovl-full-bg' ).css({overflow:Overflow});
957
  jQuery( '#wppa-ovl-full-bg' ).scrollTop( scrollTop );
@@ -1127,7 +1142,7 @@ wppaConsoleLog( 'wppaOvlHide' );
1127
  // Reset switches
1128
  wppaOvlFirst = true;
1129
  wppaOvlRunning = false;
1130
- wppaOvlMode = 'normal';
1131
  jQuery( '#wppa-overlay-sp' ).css({visibility:'hidden'});
1132
  }
1133
 
@@ -1159,6 +1174,7 @@ wppaConsoleLog( 'wppaOvlOnClick' );
1159
  function wppaInitOverlay() {
1160
  wppaConsoleLog( 'wppaInitOverlay' );
1161
 
 
1162
  var anchors = jQuery( 'a' );
1163
  var anchor;
1164
  var i;
@@ -1166,6 +1182,7 @@ wppaConsoleLog( 'wppaInitOverlay' );
1166
 
1167
  wppaOvlFsPhotoId = 0; // Reset ovl fullscreen photo id
1168
  wppaPhotoId = 0;
 
1169
 
1170
  wppaSavedContainerWidth = 240 + 2 * wppaOvlBorderWidth;
1171
  wppaSavedContainerHeight = 180 + 3 * wppaOvlBorderWidth + 20 + ( wppaOvlTxtHeight == 'auto' ? 50 : wppaOvlTxtHeight );
3
  // Conatins lightbox modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
+ var wppaLightboxVersion = '6.4.09';
7
 
8
  // Global inits
9
  var wppaNormsBtnOpac = 1;
11
  var wppaHasAudio = false;
12
  var wppaOvlImgs = [];
13
  var wppaKbHandlerInstalled = false;
14
+ var wppaOvlMode = 'normal';
15
+ var wppaOvlCurIdx = 0;
16
 
17
  // Global size specs
18
  var wppaSavedContainerWidth;
33
  height:window.innerHeight,
34
  width:window.innerWidth,
35
  });
36
+ wppaOvlResize();
37
  });
38
 
39
  // Keyboard handler
103
  }
104
 
105
  // Switch to fullscreen mode
106
+ function wppaOvlFull(init) {
107
  wppaConsoleLog( 'wppaOvlFull' );
108
 
109
  var oldMode = wppaOvlMode;
110
+ if (!init) {
111
+ wppaOvlStepMode();
112
+ }
113
  var elem = document.getElementById('wppa-overlay-ic');
114
  if ( ! elem ) return;
115
+ if ( init || oldMode == 'normal' ) {
116
  if (elem.requestFullscreen) {
117
  elem.requestFullscreen();
118
  } else if (elem.mozRequestFullScreen) {
146
  } else if (document.webkitCancelFullScreen) {
147
  document.webkitCancelFullScreen();
148
  }
149
+ if ( exit ) {
150
+ wppaOvlMode = wppaOvlModeInitial; //'stretched';//'normal';
151
+ return;
152
+ }
153
 
154
  setTimeout( 'wppaOvlShow( '+wppaOvlIdx+' )', 1000 );
155
  }
176
  }
177
 
178
  // Stop all slideshows
179
+ // var occ = 0;
180
+ // while ( occ < wppaTopMoc ) {
181
+ // occ++;
182
+ // wppaStopShow( occ );
183
+ // }
184
 
185
  // Adjust background size
186
  jQuery( '#wppa-overlay-bg' ).css({
187
  width:window.innerWidth,
188
  height:window.innerHeight,
189
  });
190
+
191
+ // Jump to fullscreen if initially wanted
192
+ if ( wppaOvlModeInitial != 'normal' ) {
193
+ wppaOvlFull( true );
194
+ }
195
  }
196
 
197
  // If arg = 'this', setup the array of data
284
  }
285
 
286
  // Now start the actual function
287
+ setTimeout( function(){ _wppaOvlShow( wppaOvlIdx )}, 100 );
288
+
 
 
 
 
289
  }
290
 
291
  // Show the lightbox overlay.
293
  function _wppaOvlShow( idx ) {
294
  wppaConsoleLog( '_wppaOvlShow, idx='+idx );
295
 
296
+ // Globalize indesx
297
+ wppaOvlCurIdx = idx;
298
+
299
  // Show spinner
300
  jQuery( '#wppa-overlay-sp' ).css( { visibility: 'visible' } );
301
 
305
 
306
  // Preload current image
307
  // Not an empty url, and do not wait infinitely for a possibly non-existend posterimage
308
+ if ( wppaOvlUrls[idx].length > 0 && ! wppaIsVideo ) {
309
  wppaOvlImgs[idx] = new Image();
310
  wppaOvlImgs[idx].src = wppaOvlUrls[idx]; // Preload
311
  wppaConsoleLog( 'Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)' );
319
  var next;
320
  var prev;
321
 
322
+ // Preload next
323
  if ( wppaOvlIdx == ( wppaOvlUrls.length-1 ) ) {
324
  next = 0;
325
  }
607
  ' />';
608
 
609
  // The start/stop button
610
+ // Only if in a set
611
+ // Not on a video to avoid confusion with the start video button
612
+ if ( wppaOvlShowStartStop && ! wppaOvlIsSingle && ! wppaIsVideo ) {
613
  html += '<img' +
614
  ' id="wppa-ovl-start-stop-btn"' +
615
  ' class="wppa-ovl-nav-btn"' +
761
  var cw, nw, nh;
762
 
763
  if ( wppaOvlIsVideo ) {
764
+ cw = img.clientWidth;//640;
765
+ nw = wppaOvlVideoNaturalWidths[wppaOvlCurIdx];//640;
766
+ nh = wppaOvlVideoNaturalHeights[wppaOvlCurIdx];//480;
767
  }
768
  else {
769
  cw = img.clientWidth;
832
  done = false;
833
  }
834
 
835
+ wid = parseInt(wid);
836
+
837
  wppaSavedImageWidth = wid;
838
  wppaSavedImageHeight = wid * nh / nw;
839
  wppaSavedMarginLeft = - ( wid / 2 + wppaOvlBorderWidth );
876
 
877
  // Show fullscreen lightbox image
878
  function wppaOvlFormatFull() {
879
+ wppaConsoleLog( 'wppaOvlFormatFull '+wppaOvlMode );
880
 
881
  var img;
882
  var natWidth;
948
  case 'realsize':
949
  margLeft = ( jQuery( window ).width() - natWidth ) / 2;
950
  if ( margLeft < 0 ) {
951
+ scrollLeft = parseInt( - margLeft );
952
  margLeft = 0;
953
  }
954
  margTop = ( jQuery( window ).height() - natHeight ) / 2;
955
  if ( margTop < 0 ) {
956
+ scrollTop = parseInt( - margTop );
957
  margTop = 0;
958
  }
959
  imgHeight = natHeight;
966
  imgHeight = parseInt( imgHeight );
967
  imgWidth = parseInt( imgWidth );
968
 
969
+ jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0,maxWidth:10000});
970
  jQuery(img).css({visibility:'visible'});
971
  jQuery( '#wppa-ovl-full-bg' ).css({overflow:Overflow});
972
  jQuery( '#wppa-ovl-full-bg' ).scrollTop( scrollTop );
1142
  // Reset switches
1143
  wppaOvlFirst = true;
1144
  wppaOvlRunning = false;
1145
+ wppaOvlMode = wppaOvlModeInitial;//'stretched';//'normal';
1146
  jQuery( '#wppa-overlay-sp' ).css({visibility:'hidden'});
1147
  }
1148
 
1174
  function wppaInitOverlay() {
1175
  wppaConsoleLog( 'wppaInitOverlay' );
1176
 
1177
+ wppaOvlMode = wppaOvlModeInitial;
1178
  var anchors = jQuery( 'a' );
1179
  var anchor;
1180
  var i;
1182
 
1183
  wppaOvlFsPhotoId = 0; // Reset ovl fullscreen photo id
1184
  wppaPhotoId = 0;
1185
+ wppaOvlCurIdx = 0;
1186
 
1187
  wppaSavedContainerWidth = 240 + 2 * wppaOvlBorderWidth;
1188
  wppaSavedContainerHeight = 180 + 3 * wppaOvlBorderWidth + 20 + ( wppaOvlTxtHeight == 'auto' ? 50 : wppaOvlTxtHeight );
js/wppa-lightbox.min.js CHANGED
@@ -4,21 +4,22 @@
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
- var wppaLightboxVersion='6.4.08';var wppaNormsBtnOpac=1;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaSavedContainerWidth;var wppaSavedContainerHeight;var wppaSavedMarginLeft;var wppaSavedMarginTop;var wppaSavedImageWidth;var wppaSavedImageHeight;jQuery(document).ready(function(e){wppaInitOverlay();});jQuery(window).resize(function(){jQuery("#wppa-overlay-bg").css({height:window.innerHeight,width:window.innerWidth,});wppaOvlResize(10);});function wppaOvlKeyboardHandler(e){var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
8
  var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
9
  wppaOvlHide();break;case 37:wppaOvlShowPrev();break;case 39:wppaOvlShowNext();break;}
10
  switch(key){case'p':wppaOvlShowPrev();break;case'n':wppaOvlShowNext();break;case's':wppaOvlStartStop();break;case'd':jQuery('#wppa-ovl-legenda-1').css('visibility','hidden');jQuery('#wppa-ovl-legenda-2').css('visibility','hidden');wppaShowLegenda='hidden';break;case'f':wppaOvlFull();break;case'q':case'x':wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
11
  wppaOvlHide();break;}
12
  return false;}
13
- function wppaOvlFull(){wppaConsoleLog('wppaOvlFull');var oldMode=wppaOvlMode;wppaOvlStepMode();var elem=document.getElementById('wppa-overlay-ic');if(!elem)return;if(oldMode=='normal'){if(elem.requestFullscreen){elem.requestFullscreen();}else if(elem.mozRequestFullScreen){elem.mozRequestFullScreen();}else if(elem.webkitRequestFullscreen){elem.webkitRequestFullscreen();}
 
14
  setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
15
  if(wppaOvlMode=='normal'){if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}}
16
  jQuery('#wppa-ovl-legenda-1').html('');}
17
  function wppaOvlNorm(exit){wppaConsoleLog('wppaOvlNorm');wppaOvlMode='normal';if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}
18
- if(exit)return;setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
 
19
  function wppaOvlShow(arg){wppaConsoleLog('wppaOvlShow arg='+arg);if(wppaOvlFirst){jQuery('#weaver-final').removeClass('wvr-hide-bang');jQuery('#wppa-overlay-bg').fadeTo(3,wppaOvlOpacity);if(!wppaKbHandlerInstalled){jQuery(document).on('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=true;}
20
- var occ=0;while(occ<wppaTopMoc){occ++;wppaStopShow(occ);}
21
- jQuery('#wppa-overlay-bg').css({width:window.innerWidth,height:window.innerHeight,});}
22
  if(typeof(arg)=='object'){wppaOvlUrls=[];wppaOvlTitles=[];wppaOvlVideoHtmls=[];wppaOvlAudioHtmls=[];wppaOvlVideoNaturalWidths=[];wppaOvlVideoNaturalHeights=[];wppaOvlImgs=[];wppaOvlIdx=0;var rel;if(arg.rel){rel=arg.rel;}
23
  else if(jQuery(arg).attr('data-rel')){rel=jQuery(arg).attr('data-rel');}
24
  else{rel=false;}
@@ -34,7 +35,7 @@ wppaOvlVideoHtmls[0]=jQuery(arg).attr('data-videohtml')?decodeURI(jQuery(arg).at
34
  wppaOvlIdx=0;}}
35
  else{wppaOvlIdx=arg;}
36
  setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
37
- function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);jQuery('#wppa-overlay-sp').css({visibility:'visible'});wppaIsVideo=wppaOvlVideoHtmls[idx]!='';wppaHasAudio=wppaOvlAudioHtmls[idx]!='';if(wppaOvlUrls[idx].length>0&&!wppaIsVideo){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying preload current image');setTimeout('_wppaOvlShow('+idx+')',100);return;}}
38
  var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
39
  else{next=wppaOvlIdx+1;}
40
  if(wppaOvlVideoHtmls[next]==''){wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));}
@@ -63,7 +64,7 @@ wppaOvlAudioHtmls[idx]+'</audio>';}
63
  wppaOvlIsVideo=false;}
64
  html+='<img'+' id="wppa-overlay-qt-img"'+' class="wppa-ovl-nav-btn"'+' src="'+wppaStopSymbolUrl+'"'+' style="'+'position:absolute;'+'z-index:100101;'+'right:'+wppaOvlBorderWidth+'px;'+'top:'+wppaOvlBorderWidth+'px;'+'box-shadow:none;'+'cursor:pointer;'+'height:'+wppaStopSymbolSize+'px;'+
65
  (wppaStopSumbolBradius>0?'border-radius:'+wppaStopSumbolBradius+'px;':'')+
66
- (wppaOvlFirst?'opacity:1;':'opacity:0;')+'"'+' onclick="wppaOvlHide()"'+' ontouchend="wppaOvlHide()"'+' onmouseover="jQuery(this).stop().fadeTo(200,1);"'+' onmouseout="jQuery(this).stop().fadeTo(200,0);"'+' ontouchstart="jQuery(this).stop().fadeTo(200,1);"'+' onload="jQuery(this).stop().fadeTo(5000,0);"'+' />';if(wppaOvlShowStartStop&&!wppaOvlIsSingle){html+='<img'+' id="wppa-ovl-start-stop-btn"'+' class="wppa-ovl-nav-btn"'+' src="'+(wppaOvlRunning?wppaPauseSymbolUrl:wppaStartSymbolUrl)+'"'+' style="'+'height:'+wppaStartPauseSymbolSize+'px;'+
67
  (wppaStartPauseSymbolBradius>0?'border-radius:'+wppaStartPauseSymbolBradius+'px;':'')+'z-index:100101;'+'position:absolute;'+'top:50%;'+'margin-top:'+(-wppaStartPauseSymbolSize/2)+'px;'+'left:50%;'+'margin-left:'+(-wppaStartPauseSymbolSize/2)+'px;'+
68
  (wppaOvlIdx==-1?'visibility:hidden;':'')+'box-shadow:none;'+
69
  (wppaOvlFirst?'opacity:1;':'opacity:0;')+'"'+' onclick="wppaOvlStartStop()"'+' ontouchend="wppaOvlStartStop()"'+' onmouseover="jQuery(this).stop().fadeTo(200,1);"'+' onmouseout="jQuery(this).stop().fadeTo(200,0);"'+' ontouchstart="jQuery(this).stop().fadeTo(200,1);"'+' onload="jQuery(this).stop().fadeTo(5000,0);"'+' />';}
@@ -78,7 +79,7 @@ html+='</div>';var showCounter=!wppaOvlIsSingle&&wppaOvlShowCounter;html+='<div
78
  wppaOvlTitles[idx]+'</div>';'</div>';jQuery('#wppa-overlay-ic').html(html);wppaOvlResize();return false;}}
79
  function wppaOvlSize(speed){wppaConsoleLog('wppaOvlSize');var img=document.getElementById('wppa-overlay-img');var txt=document.getElementById('wppa-overlay-txt');if(!img||!txt||jQuery('#wppa-overlay-bg').css('display')=='none'){wppaConsoleLog('Lb quitted');return;}
80
  if(wppaOvlMode!='normal'){wppaOvlFormatFull();return;}
81
- var iw=jQuery(window).width();var ih=jQuery(window).height();var cw,nw,nh;if(wppaOvlIsVideo){cw=640;nw=640;nh=480;}
82
  else{cw=img.clientWidth;nw=img.naturalWidth;nh=img.naturalHeight;}
83
  var fakt1;var fakt2;var fakt;if(typeof(nw)=='undefined'){nw=img.clientWidth;nh=img.clientHeight;fakt1=(iw-100)/nw;fakt2=ih/nh;if(fakt1<fakt2)fakt=fakt1;else fakt=fakt2;if(true){nw=parseInt(nw*fakt);nh=parseInt(nh*fakt);}}
84
  else{fakt1=(iw-100)/nw;fakt2=ih/nh;if(fakt1<fakt2)fakt=fakt1;else fakt=fakt2;if(fakt<1.0){nw=parseInt(nw*fakt);nh=parseInt(nh*fakt);}}
@@ -86,20 +87,20 @@ var mh;var tch=jQuery('#wppa-overlay-txt').height();if(wppaOvlTxtHeight=='auto')
86
  else{mh=ih-wppaOvlTxtHeight-20-2*wppaOvlBorderWidth;}
87
  var mw=parseInt(mh*nw/nh);var pt=wppaOvlPadTop;var lft=parseInt((iw-mw)/2);var wid=mw;if(nh<mh){pt=wppaOvlPadTop+(mh-nh)/2;lft=parseInt((iw-nw)/2);wid=nw;}
88
  var done=(wppaSavedImageWidth-wid<3&&wid-wppaSavedImageWidth<3);if(wid<=10){wid=240;nh=180;nw=240;done=false;}
89
- wppaSavedImageWidth=wid;wppaSavedImageHeight=wid*nh/nw;wppaSavedMarginLeft=-(wid/2+wppaOvlBorderWidth);wppaSavedContainerWidth=wid+2*wppaOvlBorderWidth;wppaSavedContainerHeight=wppaSavedImageHeight+wppaOvlBorderWidth+jQuery('#wppa-overlay-txt-container').height()+20;wppaSavedMarginTop=-wppaSavedContainerHeight/2;jQuery('#wppa-overlay-img').animate({width:wppaSavedImageWidth,height:wppaSavedImageHeight,},speed);jQuery('#wppa-overlay-ic').animate({width:wppaSavedContainerWidth,marginLeft:wppaSavedMarginLeft,marginTop:wppaSavedMarginTop,},speed);if(!done){setTimeout(function(){wppaOvlSize(wppaOvlAnimSpeed)},speed+100);wppaConsoleLog('Not done '+wppaOvlIdx+' saved='+wppaSavedImageWidth+', wid='+wid+', cw='+cw+', nw='+nw+', img complete='+document.getElementById('wppa-overlay-img').complete);}
90
  else{jQuery('#wppa-overlay-sp').css({visibility:'hidden'});wppaConsoleLog('Done '+wppaOvlIdx);wppaOvlFirst=false;}
91
  return true;}
92
- function wppaOvlFormatFull(){wppaConsoleLog('wppaOvlFormatFull');var img;var natWidth;var natHeight;if(wppaOvlIsVideo){img=document.getElementById('wppa-overlay-img');natWidth=wppaOvlVideoNaturalWidths[wppaOvlIdx];natHeight=wppaOvlVideoNaturalHeights[wppaOvlIdx];}
93
  else{img=document.getElementById('wppa-overlay-img');if(!img||!img.complete){setTimeout('wppaOvlFormatFull()',100);return;}
94
  natWidth=img.naturalWidth;natHeight=img.naturalHeight;}
95
  var screenRatio=jQuery(window).width()/jQuery(window).height();var imageRatio=natWidth/natHeight;var margLeft=0;var margTop=0;var imgHeight=0;var imgWidth=0;var scrollTop=0;var scrollLeft=0;var Overflow='hidden';switch(wppaOvlMode){case'padded':if(screenRatio>imageRatio){margLeft=(jQuery(window).width()-jQuery(window).height()*imageRatio)/2;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).height()*imageRatio;}
96
  else{margLeft=0;margTop=(jQuery(window).height()-jQuery(window).width()/imageRatio)/2;imgHeight=jQuery(window).width()/imageRatio;imgWidth=jQuery(window).width();}
97
  break;case'stretched':margLeft=0;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).width();break;case'clipped':if(screenRatio>imageRatio){margLeft=0;margTop=(jQuery(window).height()-jQuery(window).width()/imageRatio)/2;imgHeight=jQuery(window).width()/imageRatio;imgWidth=jQuery(window).width();}
98
  else{margLeft=(jQuery(window).width()-jQuery(window).height()*imageRatio)/2;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).height()*imageRatio;}
99
- break;case'realsize':margLeft=(jQuery(window).width()-natWidth)/2;if(margLeft<0){scrollLeft=-margLeft;margLeft=0;}
100
- margTop=(jQuery(window).height()-natHeight)/2;if(margTop<0){scrollTop=-margTop;margTop=0;}
101
  imgHeight=natHeight;imgWidth=natWidth;Overflow='auto';break;}
102
- margLeft=parseInt(margLeft);margTop=parseInt(margTop);imgHeight=parseInt(imgHeight);imgWidth=parseInt(imgWidth);jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0});jQuery(img).css({visibility:'visible'});jQuery('#wppa-ovl-full-bg').css({overflow:Overflow});jQuery('#wppa-ovl-full-bg').scrollTop(scrollTop);jQuery('#wppa-ovl-full-bg').scrollLeft(scrollLeft);jQuery('#wppa-overlay-sp').css({visibility:'hidden'});return true;}
103
  function wppaOvlUpdateFsId(){wppaConsoleLog('wppaOvlUpdateFsId');wppaOvlFsPhotoId=wppaPhotoId;}
104
  function wppaOvlStartAudio(){wppaConsoleLog('wppaOvlStartAudio');var elm=document.getElementById('wppa-overlay-audio');if(elm){if(typeof(elm.play)=='function'){elm.play();wppaConsoleLog('Audio play '+'wppa-overlay-audio');}}}
105
  function wppaOvlStepMode(){wppaConsoleLog('wppaOvlStepMode from '+wppaOvlMode);var modes=new Array('normal','padded','stretched','clipped','realsize','padded');var i=0;while(i<modes.length){if(wppaOvlMode==modes[i]){wppaOvlMode=modes[i+1];wppaOvlShow(wppaOvlIdx);return;}
@@ -114,11 +115,11 @@ function wppaOvlShowPrev(){wppaConsoleLog('wppaOvlShowPrev');wppaOvlFsPhotoId=0;
114
  wppaOvlShow(wppaOvlIdx-1);return false;}
115
  function wppaOvlShowNext(){wppaConsoleLog('wppaOvlShowNext');wppaOvlFsPhotoId=0;wppaPhotoId=0;if(wppaOvlIsSingle)return false;if(wppaOvlIdx>=(wppaOvlUrls.length-1)){wppaOvlIdx=-1;}
116
  wppaOvlShow(wppaOvlIdx+1);return false;}
117
- function wppaOvlHide(){wppaConsoleLog('wppaOvlHide');wppaStopAudio();jQuery('#wppa-overlay-ic').html('');jQuery('#wppa-overlay-bg').fadeOut(300);jQuery(document).off('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=false;wppaOvlFirst=true;wppaOvlRunning=false;wppaOvlMode='normal';jQuery('#wppa-overlay-sp').css({visibility:'hidden'});}
118
  function wppaOvlOnclick(event){wppaConsoleLog('wppaOvlOnClick');switch(wppaOvlOnclickType){case'none':break;case'close':if(wppaOvlMode=='normal'){wppaOvlHide();}
119
  break;case'browse':var x=event.screenX-window.screenX;if(x<jQuery(window).width()/2)wppaOvlShowPrev();else wppaOvlShowNext();break;default:alert('Unimplemented action: '+wppaOvlOnclickType);break;}
120
  return true;}
121
- function wppaInitOverlay(){wppaConsoleLog('wppaInitOverlay');var anchors=jQuery('a');var anchor;var i;var temp=[];wppaOvlFsPhotoId=0;wppaPhotoId=0;wppaSavedContainerWidth=240+2*wppaOvlBorderWidth;wppaSavedContainerHeight=180+3*wppaOvlBorderWidth+20+(wppaOvlTxtHeight=='auto'?50:wppaOvlTxtHeight);wppaSavedMarginLeft=-(120+wppaOvlBorderWidth);wppaSavedMarginTop=-(90+wppaOvlBorderWidth+10+(wppaOvlTxtHeight=='auto'?25:wppaOvlTxtHeight/2));wppaSavedImageWidth=240;wppaSavedImageHeight=180+wppaOvlBorderWidth;for(i=0;i<anchors.length;i++){anchor=anchors[i];if(jQuery(anchor).attr('data-rel')){temp=jQuery(anchor).attr('data-rel').split("[");}
122
  else if(anchor.rel){temp=anchor.rel.split("[");}
123
  else{temp[0]='';}
124
  if(temp[0]=='wppa'){wppaWppaOverlayActivated=true;jQuery(anchor).click(function(event){wppaOvlShow(this);event.preventDefault();});jQuery(anchor).on("touchstart",function(event){wppaOvlShow(this);});}}}
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
+ var wppaLightboxVersion='6.4.09';var wppaNormsBtnOpac=1;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaOvlMode='normal';var wppaOvlCurIdx=0;var wppaSavedContainerWidth;var wppaSavedContainerHeight;var wppaSavedMarginLeft;var wppaSavedMarginTop;var wppaSavedImageWidth;var wppaSavedImageHeight;jQuery(document).ready(function(e){wppaInitOverlay();});jQuery(window).resize(function(){jQuery("#wppa-overlay-bg").css({height:window.innerHeight,width:window.innerWidth,});wppaOvlResize();});function wppaOvlKeyboardHandler(e){var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
8
  var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
9
  wppaOvlHide();break;case 37:wppaOvlShowPrev();break;case 39:wppaOvlShowNext();break;}
10
  switch(key){case'p':wppaOvlShowPrev();break;case'n':wppaOvlShowNext();break;case's':wppaOvlStartStop();break;case'd':jQuery('#wppa-ovl-legenda-1').css('visibility','hidden');jQuery('#wppa-ovl-legenda-2').css('visibility','hidden');wppaShowLegenda='hidden';break;case'f':wppaOvlFull();break;case'q':case'x':wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
11
  wppaOvlHide();break;}
12
  return false;}
13
+ function wppaOvlFull(init){wppaConsoleLog('wppaOvlFull');var oldMode=wppaOvlMode;if(!init){wppaOvlStepMode();}
14
+ var elem=document.getElementById('wppa-overlay-ic');if(!elem)return;if(init||oldMode=='normal'){if(elem.requestFullscreen){elem.requestFullscreen();}else if(elem.mozRequestFullScreen){elem.mozRequestFullScreen();}else if(elem.webkitRequestFullscreen){elem.webkitRequestFullscreen();}
15
  setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
16
  if(wppaOvlMode=='normal'){if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}}
17
  jQuery('#wppa-ovl-legenda-1').html('');}
18
  function wppaOvlNorm(exit){wppaConsoleLog('wppaOvlNorm');wppaOvlMode='normal';if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}
19
+ if(exit){wppaOvlMode=wppaOvlModeInitial;return;}
20
+ setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
21
  function wppaOvlShow(arg){wppaConsoleLog('wppaOvlShow arg='+arg);if(wppaOvlFirst){jQuery('#weaver-final').removeClass('wvr-hide-bang');jQuery('#wppa-overlay-bg').fadeTo(3,wppaOvlOpacity);if(!wppaKbHandlerInstalled){jQuery(document).on('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=true;}
22
+ jQuery('#wppa-overlay-bg').css({width:window.innerWidth,height:window.innerHeight,});if(wppaOvlModeInitial!='normal'){wppaOvlFull(true);}}
 
23
  if(typeof(arg)=='object'){wppaOvlUrls=[];wppaOvlTitles=[];wppaOvlVideoHtmls=[];wppaOvlAudioHtmls=[];wppaOvlVideoNaturalWidths=[];wppaOvlVideoNaturalHeights=[];wppaOvlImgs=[];wppaOvlIdx=0;var rel;if(arg.rel){rel=arg.rel;}
24
  else if(jQuery(arg).attr('data-rel')){rel=jQuery(arg).attr('data-rel');}
25
  else{rel=false;}
35
  wppaOvlIdx=0;}}
36
  else{wppaOvlIdx=arg;}
37
  setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
38
+ function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);wppaOvlCurIdx=idx;jQuery('#wppa-overlay-sp').css({visibility:'visible'});wppaIsVideo=wppaOvlVideoHtmls[idx]!='';wppaHasAudio=wppaOvlAudioHtmls[idx]!='';if(wppaOvlUrls[idx].length>0&&!wppaIsVideo){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying preload current image');setTimeout('_wppaOvlShow('+idx+')',100);return;}}
39
  var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
40
  else{next=wppaOvlIdx+1;}
41
  if(wppaOvlVideoHtmls[next]==''){wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));}
64
  wppaOvlIsVideo=false;}
65
  html+='<img'+' id="wppa-overlay-qt-img"'+' class="wppa-ovl-nav-btn"'+' src="'+wppaStopSymbolUrl+'"'+' style="'+'position:absolute;'+'z-index:100101;'+'right:'+wppaOvlBorderWidth+'px;'+'top:'+wppaOvlBorderWidth+'px;'+'box-shadow:none;'+'cursor:pointer;'+'height:'+wppaStopSymbolSize+'px;'+
66
  (wppaStopSumbolBradius>0?'border-radius:'+wppaStopSumbolBradius+'px;':'')+
67
+ (wppaOvlFirst?'opacity:1;':'opacity:0;')+'"'+' onclick="wppaOvlHide()"'+' ontouchend="wppaOvlHide()"'+' onmouseover="jQuery(this).stop().fadeTo(200,1);"'+' onmouseout="jQuery(this).stop().fadeTo(200,0);"'+' ontouchstart="jQuery(this).stop().fadeTo(200,1);"'+' onload="jQuery(this).stop().fadeTo(5000,0);"'+' />';if(wppaOvlShowStartStop&&!wppaOvlIsSingle&&!wppaIsVideo){html+='<img'+' id="wppa-ovl-start-stop-btn"'+' class="wppa-ovl-nav-btn"'+' src="'+(wppaOvlRunning?wppaPauseSymbolUrl:wppaStartSymbolUrl)+'"'+' style="'+'height:'+wppaStartPauseSymbolSize+'px;'+
68
  (wppaStartPauseSymbolBradius>0?'border-radius:'+wppaStartPauseSymbolBradius+'px;':'')+'z-index:100101;'+'position:absolute;'+'top:50%;'+'margin-top:'+(-wppaStartPauseSymbolSize/2)+'px;'+'left:50%;'+'margin-left:'+(-wppaStartPauseSymbolSize/2)+'px;'+
69
  (wppaOvlIdx==-1?'visibility:hidden;':'')+'box-shadow:none;'+
70
  (wppaOvlFirst?'opacity:1;':'opacity:0;')+'"'+' onclick="wppaOvlStartStop()"'+' ontouchend="wppaOvlStartStop()"'+' onmouseover="jQuery(this).stop().fadeTo(200,1);"'+' onmouseout="jQuery(this).stop().fadeTo(200,0);"'+' ontouchstart="jQuery(this).stop().fadeTo(200,1);"'+' onload="jQuery(this).stop().fadeTo(5000,0);"'+' />';}
79
  wppaOvlTitles[idx]+'</div>';'</div>';jQuery('#wppa-overlay-ic').html(html);wppaOvlResize();return false;}}
80
  function wppaOvlSize(speed){wppaConsoleLog('wppaOvlSize');var img=document.getElementById('wppa-overlay-img');var txt=document.getElementById('wppa-overlay-txt');if(!img||!txt||jQuery('#wppa-overlay-bg').css('display')=='none'){wppaConsoleLog('Lb quitted');return;}
81
  if(wppaOvlMode!='normal'){wppaOvlFormatFull();return;}
82
+ var iw=jQuery(window).width();var ih=jQuery(window).height();var cw,nw,nh;if(wppaOvlIsVideo){cw=img.clientWidth;nw=wppaOvlVideoNaturalWidths[wppaOvlCurIdx];nh=wppaOvlVideoNaturalHeights[wppaOvlCurIdx];}
83
  else{cw=img.clientWidth;nw=img.naturalWidth;nh=img.naturalHeight;}
84
  var fakt1;var fakt2;var fakt;if(typeof(nw)=='undefined'){nw=img.clientWidth;nh=img.clientHeight;fakt1=(iw-100)/nw;fakt2=ih/nh;if(fakt1<fakt2)fakt=fakt1;else fakt=fakt2;if(true){nw=parseInt(nw*fakt);nh=parseInt(nh*fakt);}}
85
  else{fakt1=(iw-100)/nw;fakt2=ih/nh;if(fakt1<fakt2)fakt=fakt1;else fakt=fakt2;if(fakt<1.0){nw=parseInt(nw*fakt);nh=parseInt(nh*fakt);}}
87
  else{mh=ih-wppaOvlTxtHeight-20-2*wppaOvlBorderWidth;}
88
  var mw=parseInt(mh*nw/nh);var pt=wppaOvlPadTop;var lft=parseInt((iw-mw)/2);var wid=mw;if(nh<mh){pt=wppaOvlPadTop+(mh-nh)/2;lft=parseInt((iw-nw)/2);wid=nw;}
89
  var done=(wppaSavedImageWidth-wid<3&&wid-wppaSavedImageWidth<3);if(wid<=10){wid=240;nh=180;nw=240;done=false;}
90
+ wid=parseInt(wid);wppaSavedImageWidth=wid;wppaSavedImageHeight=wid*nh/nw;wppaSavedMarginLeft=-(wid/2+wppaOvlBorderWidth);wppaSavedContainerWidth=wid+2*wppaOvlBorderWidth;wppaSavedContainerHeight=wppaSavedImageHeight+wppaOvlBorderWidth+jQuery('#wppa-overlay-txt-container').height()+20;wppaSavedMarginTop=-wppaSavedContainerHeight/2;jQuery('#wppa-overlay-img').animate({width:wppaSavedImageWidth,height:wppaSavedImageHeight,},speed);jQuery('#wppa-overlay-ic').animate({width:wppaSavedContainerWidth,marginLeft:wppaSavedMarginLeft,marginTop:wppaSavedMarginTop,},speed);if(!done){setTimeout(function(){wppaOvlSize(wppaOvlAnimSpeed)},speed+100);wppaConsoleLog('Not done '+wppaOvlIdx+' saved='+wppaSavedImageWidth+', wid='+wid+', cw='+cw+', nw='+nw+', img complete='+document.getElementById('wppa-overlay-img').complete);}
91
  else{jQuery('#wppa-overlay-sp').css({visibility:'hidden'});wppaConsoleLog('Done '+wppaOvlIdx);wppaOvlFirst=false;}
92
  return true;}
93
+ function wppaOvlFormatFull(){wppaConsoleLog('wppaOvlFormatFull '+wppaOvlMode);var img;var natWidth;var natHeight;if(wppaOvlIsVideo){img=document.getElementById('wppa-overlay-img');natWidth=wppaOvlVideoNaturalWidths[wppaOvlIdx];natHeight=wppaOvlVideoNaturalHeights[wppaOvlIdx];}
94
  else{img=document.getElementById('wppa-overlay-img');if(!img||!img.complete){setTimeout('wppaOvlFormatFull()',100);return;}
95
  natWidth=img.naturalWidth;natHeight=img.naturalHeight;}
96
  var screenRatio=jQuery(window).width()/jQuery(window).height();var imageRatio=natWidth/natHeight;var margLeft=0;var margTop=0;var imgHeight=0;var imgWidth=0;var scrollTop=0;var scrollLeft=0;var Overflow='hidden';switch(wppaOvlMode){case'padded':if(screenRatio>imageRatio){margLeft=(jQuery(window).width()-jQuery(window).height()*imageRatio)/2;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).height()*imageRatio;}
97
  else{margLeft=0;margTop=(jQuery(window).height()-jQuery(window).width()/imageRatio)/2;imgHeight=jQuery(window).width()/imageRatio;imgWidth=jQuery(window).width();}
98
  break;case'stretched':margLeft=0;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).width();break;case'clipped':if(screenRatio>imageRatio){margLeft=0;margTop=(jQuery(window).height()-jQuery(window).width()/imageRatio)/2;imgHeight=jQuery(window).width()/imageRatio;imgWidth=jQuery(window).width();}
99
  else{margLeft=(jQuery(window).width()-jQuery(window).height()*imageRatio)/2;margTop=0;imgHeight=jQuery(window).height();imgWidth=jQuery(window).height()*imageRatio;}
100
+ break;case'realsize':margLeft=(jQuery(window).width()-natWidth)/2;if(margLeft<0){scrollLeft=parseInt(-margLeft);margLeft=0;}
101
+ margTop=(jQuery(window).height()-natHeight)/2;if(margTop<0){scrollTop=parseInt(-margTop);margTop=0;}
102
  imgHeight=natHeight;imgWidth=natWidth;Overflow='auto';break;}
103
+ margLeft=parseInt(margLeft);margTop=parseInt(margTop);imgHeight=parseInt(imgHeight);imgWidth=parseInt(imgWidth);jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0,maxWidth:10000});jQuery(img).css({visibility:'visible'});jQuery('#wppa-ovl-full-bg').css({overflow:Overflow});jQuery('#wppa-ovl-full-bg').scrollTop(scrollTop);jQuery('#wppa-ovl-full-bg').scrollLeft(scrollLeft);jQuery('#wppa-overlay-sp').css({visibility:'hidden'});return true;}
104
  function wppaOvlUpdateFsId(){wppaConsoleLog('wppaOvlUpdateFsId');wppaOvlFsPhotoId=wppaPhotoId;}
105
  function wppaOvlStartAudio(){wppaConsoleLog('wppaOvlStartAudio');var elm=document.getElementById('wppa-overlay-audio');if(elm){if(typeof(elm.play)=='function'){elm.play();wppaConsoleLog('Audio play '+'wppa-overlay-audio');}}}
106
  function wppaOvlStepMode(){wppaConsoleLog('wppaOvlStepMode from '+wppaOvlMode);var modes=new Array('normal','padded','stretched','clipped','realsize','padded');var i=0;while(i<modes.length){if(wppaOvlMode==modes[i]){wppaOvlMode=modes[i+1];wppaOvlShow(wppaOvlIdx);return;}
115
  wppaOvlShow(wppaOvlIdx-1);return false;}
116
  function wppaOvlShowNext(){wppaConsoleLog('wppaOvlShowNext');wppaOvlFsPhotoId=0;wppaPhotoId=0;if(wppaOvlIsSingle)return false;if(wppaOvlIdx>=(wppaOvlUrls.length-1)){wppaOvlIdx=-1;}
117
  wppaOvlShow(wppaOvlIdx+1);return false;}
118
+ function wppaOvlHide(){wppaConsoleLog('wppaOvlHide');wppaStopAudio();jQuery('#wppa-overlay-ic').html('');jQuery('#wppa-overlay-bg').fadeOut(300);jQuery(document).off('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=false;wppaOvlFirst=true;wppaOvlRunning=false;wppaOvlMode=wppaOvlModeInitial;jQuery('#wppa-overlay-sp').css({visibility:'hidden'});}
119
  function wppaOvlOnclick(event){wppaConsoleLog('wppaOvlOnClick');switch(wppaOvlOnclickType){case'none':break;case'close':if(wppaOvlMode=='normal'){wppaOvlHide();}
120
  break;case'browse':var x=event.screenX-window.screenX;if(x<jQuery(window).width()/2)wppaOvlShowPrev();else wppaOvlShowNext();break;default:alert('Unimplemented action: '+wppaOvlOnclickType);break;}
121
  return true;}
122
+ function wppaInitOverlay(){wppaConsoleLog('wppaInitOverlay');wppaOvlMode=wppaOvlModeInitial;var anchors=jQuery('a');var anchor;var i;var temp=[];wppaOvlFsPhotoId=0;wppaPhotoId=0;wppaOvlCurIdx=0;wppaSavedContainerWidth=240+2*wppaOvlBorderWidth;wppaSavedContainerHeight=180+3*wppaOvlBorderWidth+20+(wppaOvlTxtHeight=='auto'?50:wppaOvlTxtHeight);wppaSavedMarginLeft=-(120+wppaOvlBorderWidth);wppaSavedMarginTop=-(90+wppaOvlBorderWidth+10+(wppaOvlTxtHeight=='auto'?25:wppaOvlTxtHeight/2));wppaSavedImageWidth=240;wppaSavedImageHeight=180+wppaOvlBorderWidth;for(i=0;i<anchors.length;i++){anchor=anchors[i];if(jQuery(anchor).attr('data-rel')){temp=jQuery(anchor).attr('data-rel').split("[");}
123
  else if(anchor.rel){temp=anchor.rel.split("[");}
124
  else{temp[0]='';}
125
  if(temp[0]=='wppa'){wppaWppaOverlayActivated=true;jQuery(anchor).click(function(event){wppaOvlShow(this);event.preventDefault();});jQuery(anchor).on("touchstart",function(event){wppaOvlShow(this);});}}}
js/wppa-slideshow.js CHANGED
@@ -3,7 +3,7 @@
3
  // Contains slideshow modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
- var wppaJsSlideshowVersion = '6.4.08';
7
 
8
  // This is an entrypoint to load the slide data
9
  function wppaStoreSlideInfo(
@@ -993,12 +993,12 @@ function wppaMakeTheSlideHtml( mocc, bgfg, idx ) {
993
  // Link url explicitly given ?
994
  if ( _wppaLinkUrl[mocc][idx] != '' ) {
995
  if ( wppaSlideToFullpopup ) {
996
- theHtml = '<a onclick="wppaStopAudio();'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+
997
  '<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+
998
  '</a>';
999
  }
1000
  else {
1001
- theHtml = '<a onclick="wppaStopAudio();" href="'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+
1002
  '<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+
1003
  '</a>';
1004
  }
@@ -1051,7 +1051,7 @@ function wppaMakeTheSlideHtml( mocc, bgfg, idx ) {
1051
  }
1052
 
1053
  html += '<a href="'+url+'"' +
1054
- ' onclick="wppaStopAudio();"' +
1055
  ' target="'+_wppaLinkTarget[mocc][idx]+'"' +
1056
  ( ( _wppaIsVideo[mocc][i] ) ?
1057
  ' data-videonatwidth="'+_wppaVideoNatWidth[mocc][idx]+'"' +
3
  // Contains slideshow modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
+ var wppaJsSlideshowVersion = '6.4.09';
7
 
8
  // This is an entrypoint to load the slide data
9
  function wppaStoreSlideInfo(
993
  // Link url explicitly given ?
994
  if ( _wppaLinkUrl[mocc][idx] != '' ) {
995
  if ( wppaSlideToFullpopup ) {
996
+ theHtml = '<a onclick="wppaStopAudio();wppaStopShow('+mocc+');'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+
997
  '<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+
998
  '</a>';
999
  }
1000
  else {
1001
+ theHtml = '<a onclick="wppaStopAudio();wppaStopShow('+mocc+');" href="'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+
1002
  '<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+
1003
  '</a>';
1004
  }
1051
  }
1052
 
1053
  html += '<a href="'+url+'"' +
1054
+ ' onclick="wppaStopAudio();wppaStopShow('+mocc+');"' +
1055
  ' target="'+_wppaLinkTarget[mocc][idx]+'"' +
1056
  ( ( _wppaIsVideo[mocc][i] ) ?
1057
  ' data-videonatwidth="'+_wppaVideoNatWidth[mocc][idx]+'"' +
js/wppa-slideshow.min.js CHANGED
@@ -4,7 +4,7 @@
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
- var wppaJsSlideshowVersion='6.4.08';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]||'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;}
8
  cursor='default';if(linkurl!=''){cursor='pointer';}
9
  else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10
  _wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+wppaTrimAlt(name)+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}}
@@ -94,8 +94,8 @@ else{result='';}}
94
  else{result='<a title="Download" style="cursor:pointer;" onclick="wppaAjaxMakeOrigName( '+mocc+', \''+_wppaId[mocc][_wppaCurIdx[mocc]]+'\' );" ontouchstart="wppaAjaxMakeOrigName( '+mocc+', \''+_wppaId[mocc][_wppaCurIdx[mocc]]+'\' );">'+wppaDownLoad+': '+_wppaFullNames[mocc][_wppaCurIdx[mocc]]+'</a>';}
95
  break;case'none':result=_wppaFullNames[mocc][_wppaCurIdx[mocc]];break;default:result='';}
96
  return wppaRepairBrTags(result);}
97
- function wppaMakeTheSlideHtml(mocc,bgfg,idx){var imgVideo=(_wppaIsVideo[mocc][idx])?'video':'img';var theHtml;var url;var theTitle='title';if(wppaLightBox[mocc]=='wppa')theTitle='data-lbtitle';var mmEvents=wppaLightBox[mocc]==''?' onpause="wppaVideoPlaying['+mocc+'] = false;" onplay="wppaVideoPlaying['+mocc+'] = true;"':'';if(_wppaLinkUrl[mocc][idx]!=''){if(wppaSlideToFullpopup){theHtml='<a onclick="wppaStopAudio();'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';}
98
- else{theHtml='<a onclick="wppaStopAudio();" href="'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';}}
99
  else{if(wppaLightBox[mocc]==''){theHtml='<'+imgVideo+mmEvents+' title="'+_wppaNames[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx];}
100
  else{var html='';var i=0;var set=wppaLightboxSingle[mocc]?'':'[slide-'+mocc+'-'+bgfg+']';while(i<idx){if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][i];}
101
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][i]);}
@@ -104,7 +104,7 @@ html+='<a href="'+url+'"'+
104
  ((_wppaAudioHtml[mocc][i]!='')?' data-audiohtml="'+encodeURI(_wppaAudioHtml[mocc][i])+'"':'')+' '+theTitle+'="'+_wppaLbTitle[mocc][i]+'"'+' '+wppaRel+'="'+wppaLightBox[mocc]+set+'"></a>';i++;}
105
  if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][idx];}
106
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][idx]);}
107
- html+='<a href="'+url+'"'+' onclick="wppaStopAudio();"'+' target="'+_wppaLinkTarget[mocc][idx]+'"'+
108
  ((_wppaIsVideo[mocc][i])?' data-videonatwidth="'+_wppaVideoNatWidth[mocc][idx]+'"'+' data-videonatheight="'+_wppaVideoNatHeight[mocc][idx]+'"'+' data-videohtml="'+encodeURI(_wppaVideoHtml[mocc][idx])+'"':'')+
109
  ((_wppaAudioHtml[mocc][i]!='')?' data-audiohtml="'+encodeURI(_wppaAudioHtml[mocc][idx])+'"':'')+' '+theTitle+'="'+_wppaLbTitle[mocc][idx]+'"'+' '+wppaRel+'="'+wppaLightBox[mocc]+set+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';i=idx+1;while(i<_wppaUrl[mocc].length){if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][i];}
110
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][i]);}
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
+ var wppaJsSlideshowVersion='6.4.09';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]||'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;}
8
  cursor='default';if(linkurl!=''){cursor='pointer';}
9
  else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10
  _wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+wppaTrimAlt(name)+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}}
94
  else{result='<a title="Download" style="cursor:pointer;" onclick="wppaAjaxMakeOrigName( '+mocc+', \''+_wppaId[mocc][_wppaCurIdx[mocc]]+'\' );" ontouchstart="wppaAjaxMakeOrigName( '+mocc+', \''+_wppaId[mocc][_wppaCurIdx[mocc]]+'\' );">'+wppaDownLoad+': '+_wppaFullNames[mocc][_wppaCurIdx[mocc]]+'</a>';}
95
  break;case'none':result=_wppaFullNames[mocc][_wppaCurIdx[mocc]];break;default:result='';}
96
  return wppaRepairBrTags(result);}
97
+ function wppaMakeTheSlideHtml(mocc,bgfg,idx){var imgVideo=(_wppaIsVideo[mocc][idx])?'video':'img';var theHtml;var url;var theTitle='title';if(wppaLightBox[mocc]=='wppa')theTitle='data-lbtitle';var mmEvents=wppaLightBox[mocc]==''?' onpause="wppaVideoPlaying['+mocc+'] = false;" onplay="wppaVideoPlaying['+mocc+'] = true;"':'';if(_wppaLinkUrl[mocc][idx]!=''){if(wppaSlideToFullpopup){theHtml='<a onclick="wppaStopAudio();wppaStopShow('+mocc+');'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';}
98
+ else{theHtml='<a onclick="wppaStopAudio();wppaStopShow('+mocc+');" href="'+_wppaLinkUrl[mocc][idx]+'" target="'+_wppaLinkTarget[mocc][idx]+'" title="'+_wppaLinkTitle[mocc][idx]+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';}}
99
  else{if(wppaLightBox[mocc]==''){theHtml='<'+imgVideo+mmEvents+' title="'+_wppaNames[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx];}
100
  else{var html='';var i=0;var set=wppaLightboxSingle[mocc]?'':'[slide-'+mocc+'-'+bgfg+']';while(i<idx){if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][i];}
101
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][i]);}
104
  ((_wppaAudioHtml[mocc][i]!='')?' data-audiohtml="'+encodeURI(_wppaAudioHtml[mocc][i])+'"':'')+' '+theTitle+'="'+_wppaLbTitle[mocc][i]+'"'+' '+wppaRel+'="'+wppaLightBox[mocc]+set+'"></a>';i++;}
105
  if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][idx];}
106
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][idx]);}
107
+ html+='<a href="'+url+'"'+' onclick="wppaStopAudio();wppaStopShow('+mocc+');"'+' target="'+_wppaLinkTarget[mocc][idx]+'"'+
108
  ((_wppaIsVideo[mocc][i])?' data-videonatwidth="'+_wppaVideoNatWidth[mocc][idx]+'"'+' data-videonatheight="'+_wppaVideoNatHeight[mocc][idx]+'"'+' data-videohtml="'+encodeURI(_wppaVideoHtml[mocc][idx])+'"':'')+
109
  ((_wppaAudioHtml[mocc][i]!='')?' data-audiohtml="'+encodeURI(_wppaAudioHtml[mocc][idx])+'"':'')+' '+theTitle+'="'+_wppaLbTitle[mocc][idx]+'"'+' '+wppaRel+'="'+wppaLightBox[mocc]+set+'">'+'<'+imgVideo+mmEvents+' title="'+_wppaLinkTitle[mocc][idx]+'" id="theimg'+bgfg+'-'+mocc+'" '+_wppaSlides[mocc][idx]+'</a>';i=idx+1;while(i<_wppaUrl[mocc].length){if(wppaOvlHires||(wppaLightBox[mocc]!='wppa')){url=_wppaHiresUrl[mocc][i];}
110
  else{url=wppaMakeFullsizeUrl(_wppaUrl[mocc][i]);}
js/wppa.js CHANGED
@@ -2,7 +2,7 @@
2
  //
3
  // conatins common vars and functions
4
  //
5
- var wppaJsVersion = '6.4.08';
6
 
7
  // Important notice:
8
  // All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!
@@ -202,7 +202,7 @@ var wppaOvlVideoHtmls;
202
  var wppaOvlAudioHtmls;
203
  var wppaOvlVideoNaturalWidths;
204
  var wppaOvlVideoNaturalHeights;
205
- var wppaOvlMode = 'normal';
206
  var wppaOvlVideoPlaying = false;
207
  var wppaOvlAudioPlaying = false;
208
  var wppaOvlShowLegenda = true;
@@ -328,11 +328,13 @@ function wppaStopVideo( mocc ) {
328
 
329
  while ( i < 3 ) {
330
  i++;
331
- video = document.getElementById( id[i] );
332
- if ( video ) {
333
- if ( typeof( video.pause ) == 'function' ) {
334
- video.pause();
335
- wppaConsoleLog( 'Video '+id[i]+' paused', 'force' );
 
 
336
  }
337
  }
338
  }
2
  //
3
  // conatins common vars and functions
4
  //
5
+ var wppaJsVersion = '6.4.09';
6
 
7
  // Important notice:
8
  // All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!
202
  var wppaOvlAudioHtmls;
203
  var wppaOvlVideoNaturalWidths;
204
  var wppaOvlVideoNaturalHeights;
205
+ var wppaOvlModeInitial = 'normal';
206
  var wppaOvlVideoPlaying = false;
207
  var wppaOvlAudioPlaying = false;
208
  var wppaOvlShowLegenda = true;
328
 
329
  while ( i < 3 ) {
330
  i++;
331
+ if ( i != 1 || mocc == 0 ) { // Stop video on lighbox only when mocc = 0, i.e. stop all video
332
+ video = document.getElementById( id[i] );
333
+ if ( video ) {
334
+ if ( typeof( video.pause ) == 'function' ) {
335
+ video.pause();
336
+ wppaConsoleLog( 'Video '+id[i]+' paused', 'force' );
337
+ }
338
  }
339
  }
340
  }
js/wppa.min.js CHANGED
@@ -3,13 +3,13 @@
3
  // conatins common vars and functions
4
  //
5
 
6
- var wppaJsVersion='6.4.08';var wppaVersion='0';var wppaDebug;var wppaFullValign=[];var wppaFullHalign=[];var wppaFullFrameDelta=[];var wppaAnimationSpeed;var wppaImageDirectory;var wppaAutoColumnWidth=[];var wppaAutoColumnFrac=[];var wppaThumbnailAreaDelta;var wppaSlideShowTimeOut=2500;var wppaFadeInAfterFadeOut=false;var wppaTextFrameDelta=0;var wppaBoxDelta=0;var wppaPreambule;var wppaHideWhenEmpty=false;var wppaThumbnailPitch=[];var wppaFilmStripLength=[];var wppaFilmStripMargin=[];var wppaFilmStripAreaDelta=[];var wppaFilmShowGlue=false;var wppaIsMini=[];var wppaPortraitOnly=[];var wppaSlideShow;var wppaPhoto;var wppaOf;var wppaNextPhoto;var wppaPreviousPhoto;var wppaSlower;var wppaFaster;var wppaNextP;var wppaPrevP;var wppaAvgRating;var wppaMyRating;var wppaAvgRat;var wppaMyRat;var wppaDislikeMsg;var wppaMiniTreshold=300;var wppaStart='Start';var wppaStop='Stop';var wppaPleaseName;var wppaPleaseEmail;var wppaPleaseComment;var wppaRatingOnce=true;var wppaBGcolorNumbar='transparent';var wppaBcolorNumbar='transparent';var wppaBGcolorNumbarActive='transparent';var wppaBcolorNumbarActive='transparent';var wppaFontFamilyNumbar='';var wppaFontSizeNumbar='';var wppaFontColorNumbar='';var wppaFontWeightNumbar='';var wppaFontFamilyNumbarActive='';var wppaFontSizeNumbarActive='';var wppaFontColorNumbarActive='';var wppaFontWeightNumbarActive='';var wppaNumbarMax='10';var wppaAjaxUrl='';var wppaLang='';var wppaNextOnCallback=false;var wppaStarOpacity=0.2;var wppaSlideWrap=true;var wppaLightBox=[];var wppaEmailRequired='required';var wppaSlideBorderWidth=0;var wppaSlideInitRunning=[];var wppaAnimationType='fadeover';var wppaSlidePause=[];var wppaSlideBlank=[];var wppaRatingMax=5;var wppaRatingDisplayType='graphic';var wppaRatingPrec=2;var wppaFilmPageSize=[];var wppaAspectRatio=[];var wppaFullSize=[];var wppaStretch=false;var wppaThumbSpaceAuto=false;var wppaMinThumbSpace=4;var wppaMagnifierCursor='';var wppaArtMonkyLink='none';var wppaAutoOpenComments=false;var wppaUpdateAddressLine=false;var wppaFilmThumbTitle='';var wppaUploadUrl='';var wppaVoteForMe='';var wppaVotedForMe='';var wppaSlideSwipe=true;var wppaLightboxSingle=[];var wppaMaxCoverWidth=300;var wppaDownLoad='Download';var wppaSiteUrl='';var wppaWppaUrl='';var wppaIncludeUrl='';var wppaSlideToFullpopup=false;var wppaComAltSize=75;var wppaBumpViewCount=true;var wppaFotomoto=false;var wppaArtMonkeyButton=true;var wppaShortQargs=false;var wppaOvlHires=false;var wppaMasonryCols=[];var wppaVideoPlaying=[];var wppaAudioPlaying=[];var wppaSlideVideoStart=false;var wppaSlideAudioStart=false;var wppaAudioHeight=28;var wppaHis=0;var wppaStartHtml=[];var wppaCanAjaxRender=false;var wppaCanPushState=false;var wppaAllowAjax=true;var wppaMaxOccur=0;var wppaFirstOccur=0;var wppaUsePhotoNamesInUrls=false;var wppaShareHideWhenRunning=false;var wppaCommentRequiredAfterVote=true;var wppaTopMoc=0;var wppaColWidth=[];var wppaFotomotoHideWhenRunning=false;var wppaFotomotoMinWidth=400;var wppaPhotoView=[];var wppaBackgroundColorImage='';var wppaPopupLinkType='';var wppaPopupOnclick=[];var wppaThumbTargetBlank=false;var wppaRel='rel';var wppaStartSymbolUrl='';var wppaPauseSymbolUrl='';var wppaStopSymbolUrl='';var wppaStartPauseSymbolSize='64';var wppaStartPauseSymbolBradius='32';var wppaStopSymbolSize='48';var wppaStopSumbolBradius='24';var _wppaId=[];var _wppaAvg=[];var _wppaDisc=[];var _wppaMyr=[];var _wppaVRU=[];var _wppaLinkUrl=[];var _wppaLinkTitle=[];var _wppaLinkTarget=[];var _wppaCommentHtml=[];var _wppaIptcHtml=[];var _wppaExifHtml=[];var _wppaToTheSame=false;var _wppaSlides=[];var _wppaNames=[];var _wppaFullNames=[];var _wppaDsc=[];var _wppaOgDsc=[];var _wppaCurIdx=[];var _wppaNxtIdx=[];var _wppaTimeOut=[];var _wppaSSRuns=[];var _wppaFg=[];var _wppaTP=[];var _wppaIsBusy=[];var _wppaFirst=[];var _wppaVoteInProgress=false;var _wppaTextDelay;var _wppaUrl=[];var _wppaSkipRated=[];var _wppaLbTitle=[];var _wppaStateCount=0;var _wppaDidGoto=[];var _wppaShareUrl=[];var _wppaShareHtml=[];var _wppaFilmNoMove=[];var _wppaHiresUrl=[];var _wppaIsVideo=[];var _wppaVideoHtml=[];var _wppaAudioHtml=[];var _wppaVideoNatWidth=[];var _wppaVideoNatHeight=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlIdx=0;var wppaOvlFirst=true;var wppaOvlKbHandler='';var wppaOvlSizeHandler='';var wppaOvlPadTop=5;var wppaOvlIsSingle;var wppaOvlRunning=false;var wppaOvlVideoHtmls;var wppaOvlAudioHtmls;var wppaOvlVideoNaturalWidths;var wppaOvlVideoNaturalHeights;var wppaOvlMode='normal';var wppaOvlVideoPlaying=false;var wppaOvlAudioPlaying=false;var wppaOvlShowLegenda=true;var wppaOvlShowStartStop=true;var wppaOvlRadius=0;var wppaOvlBorderWidth=16;var wppaOvlLeftSymbolUrl;var wppaOvlRightSymbolUrl;var wppaLeftRightSymbolSize=32;var wppaLeftRightSymbolBradius=4;var wppaOvlTxtHeight=36;var wppaOvlOpacity=0.8;var wppaOvlOnclickType='none';var wppaOvlTheme='black';var wppaOvlAnimSpeed=300;var wppaOvlSlideSpeed=3000;var wppaVer4WindowWidth=800;var wppaVer4WindowHeight=600;var wppaOvlFontFamily='Helvetica';var wppaOvlFontSize='10';var wppaOvlFontColor='';var wppaOvlFontWeight='bold';var wppaOvlLineHeight='12';var wppaOvlShowCounter=true;var wppaOvlIsVideo=false;var wppaShowLegenda='';var wppaOvlFsPhotoId=0;var wppaPhotoId=0;var wppaOvlVideoStart=false;var wppaOvlAudioStart=false;var wppaLastIptc='';var wppaLastExif='';jQuery(document).ready(function(){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7
  _wppaTextDelay=wppaAnimationSpeed;if(wppaFadeInAfterFadeOut)_wppaTextDelay*=2;if(anyAutocol){jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}});}});jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax()){wppaCanAjaxRender=true;}
8
  if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
9
  wppaCanPushState=true;}});function wppaUpdateLightboxes(){if(typeof(wppaInitOverlay)=='function'){wppaInitOverlay();}
10
  if(typeof(myLightbox)!='undefined'){if(typeof(myLightbox.updateImageList)=='function'){myLightbox.updateImageList();}}
11
  if(jQuery().prettyPhoto){jQuery("a[rel^='prettyPhoto']").prettyPhoto({deeplinking:false,});}}
12
- function wppaStopVideo(mocc){var id=[];var video;var i;id[1]='wppa-overlay-img';id[2]='theimg0-'+mocc;id[3]='theimg1-'+mocc;i=0;while(i<3){i++;video=document.getElementById(id[i]);if(video){if(typeof(video.pause)=='function'){video.pause();wppaConsoleLog('Video '+id[i]+' paused','force');}}}}
13
  function wppaStopAudio(){var items=jQuery('audio');if(items.length>0){var i=0;while(i<items.length){if(jQuery(items[i]).attr('data-from')=='wppa'){items[i].pause();}
14
  i++;}}}
15
  function wppaMakeFullsizeUrl(url){var temp;var temp2;url=url.replace('/thumbs/','/');temp=url.split('//');if(temp[1]){temp2=temp[1].split('/');url=temp[0]+'//';}
3
  // conatins common vars and functions
4
  //
5
 
6
+ var wppaJsVersion='6.4.09';var wppaVersion='0';var wppaDebug;var wppaFullValign=[];var wppaFullHalign=[];var wppaFullFrameDelta=[];var wppaAnimationSpeed;var wppaImageDirectory;var wppaAutoColumnWidth=[];var wppaAutoColumnFrac=[];var wppaThumbnailAreaDelta;var wppaSlideShowTimeOut=2500;var wppaFadeInAfterFadeOut=false;var wppaTextFrameDelta=0;var wppaBoxDelta=0;var wppaPreambule;var wppaHideWhenEmpty=false;var wppaThumbnailPitch=[];var wppaFilmStripLength=[];var wppaFilmStripMargin=[];var wppaFilmStripAreaDelta=[];var wppaFilmShowGlue=false;var wppaIsMini=[];var wppaPortraitOnly=[];var wppaSlideShow;var wppaPhoto;var wppaOf;var wppaNextPhoto;var wppaPreviousPhoto;var wppaSlower;var wppaFaster;var wppaNextP;var wppaPrevP;var wppaAvgRating;var wppaMyRating;var wppaAvgRat;var wppaMyRat;var wppaDislikeMsg;var wppaMiniTreshold=300;var wppaStart='Start';var wppaStop='Stop';var wppaPleaseName;var wppaPleaseEmail;var wppaPleaseComment;var wppaRatingOnce=true;var wppaBGcolorNumbar='transparent';var wppaBcolorNumbar='transparent';var wppaBGcolorNumbarActive='transparent';var wppaBcolorNumbarActive='transparent';var wppaFontFamilyNumbar='';var wppaFontSizeNumbar='';var wppaFontColorNumbar='';var wppaFontWeightNumbar='';var wppaFontFamilyNumbarActive='';var wppaFontSizeNumbarActive='';var wppaFontColorNumbarActive='';var wppaFontWeightNumbarActive='';var wppaNumbarMax='10';var wppaAjaxUrl='';var wppaLang='';var wppaNextOnCallback=false;var wppaStarOpacity=0.2;var wppaSlideWrap=true;var wppaLightBox=[];var wppaEmailRequired='required';var wppaSlideBorderWidth=0;var wppaSlideInitRunning=[];var wppaAnimationType='fadeover';var wppaSlidePause=[];var wppaSlideBlank=[];var wppaRatingMax=5;var wppaRatingDisplayType='graphic';var wppaRatingPrec=2;var wppaFilmPageSize=[];var wppaAspectRatio=[];var wppaFullSize=[];var wppaStretch=false;var wppaThumbSpaceAuto=false;var wppaMinThumbSpace=4;var wppaMagnifierCursor='';var wppaArtMonkyLink='none';var wppaAutoOpenComments=false;var wppaUpdateAddressLine=false;var wppaFilmThumbTitle='';var wppaUploadUrl='';var wppaVoteForMe='';var wppaVotedForMe='';var wppaSlideSwipe=true;var wppaLightboxSingle=[];var wppaMaxCoverWidth=300;var wppaDownLoad='Download';var wppaSiteUrl='';var wppaWppaUrl='';var wppaIncludeUrl='';var wppaSlideToFullpopup=false;var wppaComAltSize=75;var wppaBumpViewCount=true;var wppaFotomoto=false;var wppaArtMonkeyButton=true;var wppaShortQargs=false;var wppaOvlHires=false;var wppaMasonryCols=[];var wppaVideoPlaying=[];var wppaAudioPlaying=[];var wppaSlideVideoStart=false;var wppaSlideAudioStart=false;var wppaAudioHeight=28;var wppaHis=0;var wppaStartHtml=[];var wppaCanAjaxRender=false;var wppaCanPushState=false;var wppaAllowAjax=true;var wppaMaxOccur=0;var wppaFirstOccur=0;var wppaUsePhotoNamesInUrls=false;var wppaShareHideWhenRunning=false;var wppaCommentRequiredAfterVote=true;var wppaTopMoc=0;var wppaColWidth=[];var wppaFotomotoHideWhenRunning=false;var wppaFotomotoMinWidth=400;var wppaPhotoView=[];var wppaBackgroundColorImage='';var wppaPopupLinkType='';var wppaPopupOnclick=[];var wppaThumbTargetBlank=false;var wppaRel='rel';var wppaStartSymbolUrl='';var wppaPauseSymbolUrl='';var wppaStopSymbolUrl='';var wppaStartPauseSymbolSize='64';var wppaStartPauseSymbolBradius='32';var wppaStopSymbolSize='48';var wppaStopSumbolBradius='24';var _wppaId=[];var _wppaAvg=[];var _wppaDisc=[];var _wppaMyr=[];var _wppaVRU=[];var _wppaLinkUrl=[];var _wppaLinkTitle=[];var _wppaLinkTarget=[];var _wppaCommentHtml=[];var _wppaIptcHtml=[];var _wppaExifHtml=[];var _wppaToTheSame=false;var _wppaSlides=[];var _wppaNames=[];var _wppaFullNames=[];var _wppaDsc=[];var _wppaOgDsc=[];var _wppaCurIdx=[];var _wppaNxtIdx=[];var _wppaTimeOut=[];var _wppaSSRuns=[];var _wppaFg=[];var _wppaTP=[];var _wppaIsBusy=[];var _wppaFirst=[];var _wppaVoteInProgress=false;var _wppaTextDelay;var _wppaUrl=[];var _wppaSkipRated=[];var _wppaLbTitle=[];var _wppaStateCount=0;var _wppaDidGoto=[];var _wppaShareUrl=[];var _wppaShareHtml=[];var _wppaFilmNoMove=[];var _wppaHiresUrl=[];var _wppaIsVideo=[];var _wppaVideoHtml=[];var _wppaAudioHtml=[];var _wppaVideoNatWidth=[];var _wppaVideoNatHeight=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlIdx=0;var wppaOvlFirst=true;var wppaOvlKbHandler='';var wppaOvlSizeHandler='';var wppaOvlPadTop=5;var wppaOvlIsSingle;var wppaOvlRunning=false;var wppaOvlVideoHtmls;var wppaOvlAudioHtmls;var wppaOvlVideoNaturalWidths;var wppaOvlVideoNaturalHeights;var wppaOvlModeInitial='normal';var wppaOvlVideoPlaying=false;var wppaOvlAudioPlaying=false;var wppaOvlShowLegenda=true;var wppaOvlShowStartStop=true;var wppaOvlRadius=0;var wppaOvlBorderWidth=16;var wppaOvlLeftSymbolUrl;var wppaOvlRightSymbolUrl;var wppaLeftRightSymbolSize=32;var wppaLeftRightSymbolBradius=4;var wppaOvlTxtHeight=36;var wppaOvlOpacity=0.8;var wppaOvlOnclickType='none';var wppaOvlTheme='black';var wppaOvlAnimSpeed=300;var wppaOvlSlideSpeed=3000;var wppaVer4WindowWidth=800;var wppaVer4WindowHeight=600;var wppaOvlFontFamily='Helvetica';var wppaOvlFontSize='10';var wppaOvlFontColor='';var wppaOvlFontWeight='bold';var wppaOvlLineHeight='12';var wppaOvlShowCounter=true;var wppaOvlIsVideo=false;var wppaShowLegenda='';var wppaOvlFsPhotoId=0;var wppaPhotoId=0;var wppaOvlVideoStart=false;var wppaOvlAudioStart=false;var wppaLastIptc='';var wppaLastExif='';jQuery(document).ready(function(){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7
  _wppaTextDelay=wppaAnimationSpeed;if(wppaFadeInAfterFadeOut)_wppaTextDelay*=2;if(anyAutocol){jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}});}});jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax()){wppaCanAjaxRender=true;}
8
  if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
9
  wppaCanPushState=true;}});function wppaUpdateLightboxes(){if(typeof(wppaInitOverlay)=='function'){wppaInitOverlay();}
10
  if(typeof(myLightbox)!='undefined'){if(typeof(myLightbox.updateImageList)=='function'){myLightbox.updateImageList();}}
11
  if(jQuery().prettyPhoto){jQuery("a[rel^='prettyPhoto']").prettyPhoto({deeplinking:false,});}}
12
+ function wppaStopVideo(mocc){var id=[];var video;var i;id[1]='wppa-overlay-img';id[2]='theimg0-'+mocc;id[3]='theimg1-'+mocc;i=0;while(i<3){i++;if(i!=1||mocc==0){video=document.getElementById(id[i]);if(video){if(typeof(video.pause)=='function'){video.pause();wppaConsoleLog('Video '+id[i]+' paused','force');}}}}}
13
  function wppaStopAudio(){var items=jQuery('audio');if(items.length>0){var i=0;while(i<items.length){if(jQuery(items[i]).attr('data-from')=='wppa'){items[i].pause();}
14
  i++;}}}
15
  function wppaMakeFullsizeUrl(url){var temp;var temp2;url=url.replace('/thumbs/','/');temp=url.split('//');if(temp[1]){temp2=temp[1].split('/');url=temp[0]+'//';}
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: opajaap
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4
  Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5
- Version: 6.4.08
6
- Stable tag: 6.4.07
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
9
  Requires at least: 3.9
@@ -180,6 +180,26 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
180
 
181
  See for additional information: http://wppa.opajaap.nl/changelog/
182
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
183
  = 6.4.08 =
184
 
185
  = Bug Fixes =
2
  Contributors: opajaap
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4
  Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5
+ Version: 6.4.09
6
+ Stable tag: 6.4.08
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
9
  Requires at least: 3.9
180
 
181
  See for additional information: http://wppa.opajaap.nl/changelog/
182
 
183
+ = 6.4.09 =
184
+
185
+ = Bug Fixes =
186
+
187
+ * Fixed wrong aspect ratios of videos on lightbox. Make sure you set ether the default size values correct in Table I-H or on the individual edit photo pages.
188
+ * Auto started video on lightbox is no longer stopped by other running slideshows.
189
+ * Links with spaces not worked correctly when pretty links are enabled. Fixed.
190
+ * The Upload photo dislog on thumbnail areas of real albums now do no longer display an album selection list, but upload takes place to the album involved.
191
+
192
+ = New Features =
193
+
194
+ * Table IV-G9 allows you to select a starting mode for lightbox: normal or one of the fullsceen modes.
195
+
196
+ = Other Changes =
197
+
198
+ * The cached options are checked for validity by means of a hash check. This will fix spurious unexplainable changing settings.
199
+ * Fixed spurious error messages.
200
+ * Videos on lightbox in a set no longer display the start/stop running slideshow button to avoid confusion with the start video button.
201
+ * Opening lightbox now only stops the running slideshow where it is initiated from. Previously all shows were stopped, leading to unwanted behaviour in case of running filmonly as a banner applications.
202
+
203
  = 6.4.08 =
204
 
205
  = Bug Fixes =
wppa-common-functions.php CHANGED
@@ -2,7 +2,7 @@
2
  /* wppa-common-functions.php
3
  *
4
  * Functions used in admin and in themes
5
- * Version 6.4.07
6
  *
7
  */
8
 
@@ -34,8 +34,20 @@ global $wppa_defaults;
34
  wppa_reset_occurrance();
35
  }
36
 
 
37
  $wppa_opt = get_option( 'wppa_cached_options', false );
 
 
 
 
 
 
 
 
 
 
38
 
 
39
  if ( ! is_array( $wppa_opt ) ) {
40
  wppa_set_defaults();
41
  $wppa_opt = $wppa_defaults;
@@ -46,6 +58,7 @@ global $wppa_defaults;
46
  }
47
  }
48
  update_option( 'wppa_cached_options', $wppa_opt );
 
49
  }
50
 
51
  if ( isset( $_GET['debug'] ) && wppa_switch( 'allow_debug' ) ) {
2
  /* wppa-common-functions.php
3
  *
4
  * Functions used in admin and in themes
5
+ * Version 6.4.09
6
  *
7
  */
8
 
34
  wppa_reset_occurrance();
35
  }
36
 
37
+ // Get the cache version of all settings
38
  $wppa_opt = get_option( 'wppa_cached_options', false );
39
+
40
+ // Check for validity
41
+ if ( md5( serialize( $wppa_opt ) ) != get_option( 'wppa_md5_options', 'nil' ) ) {
42
+ $wppa_opt = false;
43
+
44
+ // Report fix only if not intentional
45
+ if ( ! $force ) {
46
+ wppa_log( 'Fix', 'Option cache' );
47
+ }
48
+ }
49
 
50
+ // Rebuild cached options
51
  if ( ! is_array( $wppa_opt ) ) {
52
  wppa_set_defaults();
53
  $wppa_opt = $wppa_defaults;
58
  }
59
  }
60
  update_option( 'wppa_cached_options', $wppa_opt );
61
+ update_option( 'wppa_md5_options', md5( serialize( $wppa_opt ) ) );
62
  }
63
 
64
  if ( isset( $_GET['debug'] ) && wppa_switch( 'allow_debug' ) ) {
wppa-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various funcions
6
- * Version 6.4.08
7
  *
8
  */
9
 
@@ -1140,6 +1140,11 @@ global $wppa_session;
1140
  $album_clause = ' `album` IN ( ' . implode( ',', $ids ) . ' )';
1141
  }
1142
 
 
 
 
 
 
1143
  // So far so good
1144
  // Now make the query, dependant of type of selection
1145
  // Init
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various funcions
6
+ * Version 6.4.09
7
  *
8
  */
9
 
1140
  $album_clause = ' `album` IN ( ' . implode( ',', $ids ) . ' )';
1141
  }
1142
 
1143
+ // For upload link on thumbarea: if startalbum is a single real album, put it in current album
1144
+ if ( wppa_is_int( wppa( 'start_album' ) ) ) {
1145
+ wppa( 'current_album', wppa( 'start_album' ) );
1146
+ }
1147
+
1148
  // So far so good
1149
  // Now make the query, dependant of type of selection
1150
  // Init
wppa-non-admin.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
- * Version 6.4.08
7
  *
8
  */
9
 
@@ -416,6 +416,7 @@ global $wppa_session;
416
  echo '
417
  <script type="text/javascript">
418
  jQuery("#wppa-overlay-bg").css({height:window.innerHeight});
 
419
  wppaOvlTxtHeight = "'.$ovlh.'";
420
  wppaOvlOpacity = '.(wppa_opt( 'ovl_opacity' )/100).';
421
  wppaOvlOnclickType = "'.wppa_opt( 'ovl_onclick' ).'";
@@ -525,19 +526,19 @@ function wppa_redirect() {
525
  $wppapos = stripos( $uri, '/wppaspec/' );
526
 
527
  if ( $wppapos && get_option('permalink_structure') ) {
528
-
529
  // old style solution, still required when qTranslate is active
530
  $plugins = implode( ',', get_option( 'active_plugins' ) );
531
  if ( stripos( $plugins, 'qtranslate' ) !== false ) {
532
 
533
  $newuri = wppa_convert_from_pretty( $uri );
534
  if ( $newuri == $uri ) return;
535
-
536
  // Although the url is urlencoded it is damaged by wp_redirect when it contains chars like �, so we do a header() call
537
  header( 'Location: '.$newuri, true, 302 );
538
  exit;
539
  }
540
-
541
  // New style solution
542
  $newuri = wppa_convert_from_pretty($uri);
543
  if ( $newuri == $uri ) return;
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
+ * Version 6.4.09
7
  *
8
  */
9
 
416
  echo '
417
  <script type="text/javascript">
418
  jQuery("#wppa-overlay-bg").css({height:window.innerHeight});
419
+ wppaOvlModeInitial = "'.wppa_opt( 'ovl_mode_initial' ).'";
420
  wppaOvlTxtHeight = "'.$ovlh.'";
421
  wppaOvlOpacity = '.(wppa_opt( 'ovl_opacity' )/100).';
422
  wppaOvlOnclickType = "'.wppa_opt( 'ovl_onclick' ).'";
526
  $wppapos = stripos( $uri, '/wppaspec/' );
527
 
528
  if ( $wppapos && get_option('permalink_structure') ) {
529
+
530
  // old style solution, still required when qTranslate is active
531
  $plugins = implode( ',', get_option( 'active_plugins' ) );
532
  if ( stripos( $plugins, 'qtranslate' ) !== false ) {
533
 
534
  $newuri = wppa_convert_from_pretty( $uri );
535
  if ( $newuri == $uri ) return;
536
+
537
  // Although the url is urlencoded it is damaged by wp_redirect when it contains chars like �, so we do a header() call
538
  header( 'Location: '.$newuri, true, 302 );
539
  exit;
540
  }
541
+
542
  // New style solution
543
  $newuri = wppa_convert_from_pretty($uri);
544
  if ( $newuri == $uri ) return;
wppa-session.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all session routines
6
- * Version 6.4.00
7
  *
8
  * Firefox modifies data in the superglobal $_SESSION.
9
  * See https://bugzilla.mozilla.org/show_bug.cgi?id=991019
@@ -165,6 +165,8 @@ static $last_query;
165
 
166
  // Only update if data differs from previous update
167
  if ( $query != $last_query ) {
 
 
168
  $iret = $wpdb->query( $query );
169
 
170
  // Remember last successfull query
@@ -173,11 +175,13 @@ static $last_query;
173
  return true;
174
  }
175
 
176
- // Report failure
177
- else {
178
- wppa_log( 'Dbg', 'Unable to save session. Expected id:'.wppa_get_session_id() );
179
- return false;
180
- }
 
 
181
  }
182
 
183
  // No error return
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all session routines
6
+ * Version 6.4.09
7
  *
8
  * Firefox modifies data in the superglobal $_SESSION.
9
  * See https://bugzilla.mozilla.org/show_bug.cgi?id=991019
165
 
166
  // Only update if data differs from previous update
167
  if ( $query != $last_query ) {
168
+
169
+ // Do the query
170
  $iret = $wpdb->query( $query );
171
 
172
  // Remember last successfull query
175
  return true;
176
  }
177
 
178
+ // No luck, maybe attemt to save a session that never started. Start new session
179
+ wppa_log('Dbg', 'Attempt to save a session that was not started. ip='.$_SERVER['REMOTE_ADDR'], true);
180
+ $wppa_session = false;
181
+ $last_query = false;
182
+ wppa_session_start();
183
+
184
+ return false;
185
  }
186
 
187
  // No error return
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 6.4.08
7
  *
8
  */
9
 
@@ -4463,6 +4463,28 @@ global $wppa_tags;
4463
  $clas = '';
4464
  $tags = 'lightbox,audio';
4465
  wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4466
  }
4467
  ?>
4468
  </tbody>
@@ -8888,7 +8910,7 @@ global $wppa_tags;
8888
  <td><small><?php _e('Albums db table name.', 'wp-photo-album-plus') ?></small></td>
8889
  <td><?php echo(WPPA_ALBUMS) ?></td>
8890
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8891
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_ALBUMS . '\')" >' .
8892
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_ALBUMS . '.csv' .
8893
  '</a> ' .
8894
  '<img id="' . WPPA_ALBUMS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8900,7 +8922,7 @@ global $wppa_tags;
8900
  <td><small><?php _e('Photos db table name.', 'wp-photo-album-plus') ?></small></td>
8901
  <td><?php echo(WPPA_PHOTOS) ?></td>
8902
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8903
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_PHOTOS . '\')" >' .
8904
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_PHOTOS . '.csv' .
8905
  '</a> ' .
8906
  '<img id="' . WPPA_PHOTOS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8912,7 +8934,7 @@ global $wppa_tags;
8912
  <td><small><?php _e('Rating db table name.', 'wp-photo-album-plus') ?></small></td>
8913
  <td><?php echo(WPPA_RATING) ?></td>
8914
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8915
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_RATING . '\')" >' .
8916
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_RATING . '.csv' .
8917
  '</a> ' .
8918
  '<img id="' . WPPA_RATING . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8924,7 +8946,7 @@ global $wppa_tags;
8924
  <td><small><?php _e('Comments db table name.', 'wp-photo-album-plus') ?></small></td>
8925
  <td><?php echo(WPPA_COMMENTS) ?></td>
8926
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8927
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_COMMENTS . '\')" >' .
8928
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_COMMENTS . '.csv' .
8929
  '</a> ' .
8930
  '<img id="' . WPPA_COMMENTS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8936,7 +8958,7 @@ global $wppa_tags;
8936
  <td><small><?php _e('IPTC db table name.', 'wp-photo-album-plus') ?></small></td>
8937
  <td><?php echo(WPPA_IPTC) ?></td>
8938
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8939
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_IPTC . '\')" >' .
8940
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_IPTC . '.csv' .
8941
  '</a> ' .
8942
  '<img id="' . WPPA_IPTC . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8948,7 +8970,7 @@ global $wppa_tags;
8948
  <td><small><?php _e('EXIF db table name.', 'wp-photo-album-plus') ?></small></td>
8949
  <td><?php echo(WPPA_EXIF) ?></td>
8950
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8951
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_EXIF . '\')" >' .
8952
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_EXIF . '.csv' .
8953
  '</a> ' .
8954
  '<img id="' . WPPA_EXIF . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8960,7 +8982,7 @@ global $wppa_tags;
8960
  <td><small><?php _e('Index db table name.', 'wp-photo-album-plus') ?></small></td>
8961
  <td><?php echo(WPPA_INDEX) ?></td>
8962
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8963
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_INDEX . '\')" >' .
8964
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_INDEX . '.csv' .
8965
  '</a> ' .
8966
  '<img id="' . WPPA_INDEX . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
@@ -8972,7 +8994,7 @@ global $wppa_tags;
8972
  <td><small><?php _e('Index db table name.', 'wp-photo-album-plus') ?></small></td>
8973
  <td><?php echo(WPPA_SESSION) ?></td>
8974
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8975
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_SESSION . '\')" >' .
8976
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_SESSION . '.csv' .
8977
  '</a> ' .
8978
  '<img id="' . WPPA_SESSION . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 6.4.09
7
  *
8
  */
9
 
4463
  $clas = '';
4464
  $tags = 'lightbox,audio';
4465
  wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
4466
+
4467
+ $name = __('Lightbox start mode', 'wp-photo-album-plus');
4468
+ $desc = __('The mode lightbox starts in.', 'wp-photo-album-plus');
4469
+ $help = '';
4470
+ $slug = 'wppa_ovl_mode_initial';
4471
+ $opts = array( __('Normal', 'wp-photo-album-plus'),
4472
+ __('Padded', 'wp-photo-album-plus'),
4473
+ __('Sttetched', 'wp-photo-album-plus'),
4474
+ __('Clipped', 'wp-photo-album-plus'),
4475
+ __('Real size', 'wp-photo-album-plus'),
4476
+ );
4477
+ $vals = array( 'normal',
4478
+ 'padded',
4479
+ 'stretched',
4480
+ 'clipped',
4481
+ 'realsize',
4482
+ );
4483
+ $html = wppa_select($slug,$opts,$vals);
4484
+ $clas = '';
4485
+ $tags = 'lightbox,layout';
4486
+ wppa_setting($slug, '9', $name, $desc, $html, $help, $clas, $tags);
4487
+
4488
  }
4489
  ?>
4490
  </tbody>
8910
  <td><small><?php _e('Albums db table name.', 'wp-photo-album-plus') ?></small></td>
8911
  <td><?php echo(WPPA_ALBUMS) ?></td>
8912
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8913
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_ALBUMS . '\')" >' .
8914
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_ALBUMS . '.csv' .
8915
  '</a> ' .
8916
  '<img id="' . WPPA_ALBUMS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8922
  <td><small><?php _e('Photos db table name.', 'wp-photo-album-plus') ?></small></td>
8923
  <td><?php echo(WPPA_PHOTOS) ?></td>
8924
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8925
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_PHOTOS . '\')" >' .
8926
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_PHOTOS . '.csv' .
8927
  '</a> ' .
8928
  '<img id="' . WPPA_PHOTOS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8934
  <td><small><?php _e('Rating db table name.', 'wp-photo-album-plus') ?></small></td>
8935
  <td><?php echo(WPPA_RATING) ?></td>
8936
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8937
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_RATING . '\')" >' .
8938
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_RATING . '.csv' .
8939
  '</a> ' .
8940
  '<img id="' . WPPA_RATING . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8946
  <td><small><?php _e('Comments db table name.', 'wp-photo-album-plus') ?></small></td>
8947
  <td><?php echo(WPPA_COMMENTS) ?></td>
8948
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8949
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_COMMENTS . '\')" >' .
8950
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_COMMENTS . '.csv' .
8951
  '</a> ' .
8952
  '<img id="' . WPPA_COMMENTS . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8958
  <td><small><?php _e('IPTC db table name.', 'wp-photo-album-plus') ?></small></td>
8959
  <td><?php echo(WPPA_IPTC) ?></td>
8960
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8961
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_IPTC . '\')" >' .
8962
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_IPTC . '.csv' .
8963
  '</a> ' .
8964
  '<img id="' . WPPA_IPTC . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8970
  <td><small><?php _e('EXIF db table name.', 'wp-photo-album-plus') ?></small></td>
8971
  <td><?php echo(WPPA_EXIF) ?></td>
8972
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8973
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_EXIF . '\')" >' .
8974
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_EXIF . '.csv' .
8975
  '</a> ' .
8976
  '<img id="' . WPPA_EXIF . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8982
  <td><small><?php _e('Index db table name.', 'wp-photo-album-plus') ?></small></td>
8983
  <td><?php echo(WPPA_INDEX) ?></td>
8984
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8985
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_INDEX . '\')" >' .
8986
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_INDEX . '.csv' .
8987
  '</a> ' .
8988
  '<img id="' . WPPA_INDEX . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
8994
  <td><small><?php _e('Index db table name.', 'wp-photo-album-plus') ?></small></td>
8995
  <td><?php echo(WPPA_SESSION) ?></td>
8996
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
8997
+ echo '<a onclick="wppaExportDbTable(\'' . WPPA_SESSION . '\')" >' .
8998
  __('Download', 'wp-photo-album-plus') . ' ' . WPPA_SESSION . '.csv' .
8999
  '</a> ' .
9000
  '<img id="' . WPPA_SESSION . '-spin" src="' . wppa_get_imgdir( 'wpspin.gif' ) . '" style="display:none;" />';
wppa-setup.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
- * Version 6.4.08
7
  *
8
  */
9
 
@@ -34,7 +34,7 @@ global $silent;
34
  global $wppa_error;
35
 
36
  $old_rev = get_option('wppa_revision', '100');
37
-
38
  // If not a new install, remove obsolete tempfiles
39
  if ( $old_rev > '100' ) {
40
  wppa_delete_obsolete_tempfiles();
@@ -1045,6 +1045,7 @@ Hide Camera info
1045
  'wppa_lb_hres' => 'no',
1046
  'wppa_ovl_video_start' => 'yes',
1047
  'wppa_ovl_audio_start' => 'yes',
 
1048
 
1049
  // Table V: Fonts
1050
  'wppa_fontfamily_title' => '',
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
+ * Version 6.4.09
7
  *
8
  */
9
 
34
  global $wppa_error;
35
 
36
  $old_rev = get_option('wppa_revision', '100');
37
+
38
  // If not a new install, remove obsolete tempfiles
39
  if ( $old_rev > '100' ) {
40
  wppa_delete_obsolete_tempfiles();
1045
  'wppa_lb_hres' => 'no',
1046
  'wppa_ovl_video_start' => 'yes',
1047
  'wppa_ovl_audio_start' => 'yes',
1048
+ 'wppa_ovl_mode_initial' => 'normal',
1049
 
1050
  // Table V: Fonts
1051
  'wppa_fontfamily_title' => '',
wppa-source.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains photo source file management routines
6
- * Version 6.3.11
7
  *
8
  */
9
 
@@ -84,9 +84,14 @@ global $wppa_supported_photo_extensions;
84
 
85
  foreach( $supext as $ext ) {
86
  if ( is_file( $frompath.'.'.$ext ) ) {
87
- @ rename( $frompath.'.'.$ext, $topath.'.'.$ext ); // will fail if target already exists
88
- @ unlink( $frompath.'.'.$ext ); // therefor attempt delete
89
- @ rmdir( wppa_get_source_album_dir( $from ) ); // remove dir when empty Ignore error
 
 
 
 
 
90
  }
91
  }
92
  }
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains photo source file management routines
6
+ * Version 6.4.09
7
  *
8
  */
9
 
84
 
85
  foreach( $supext as $ext ) {
86
  if ( is_file( $frompath.'.'.$ext ) ) {
87
+
88
+ // rename. Will fail if target already exists
89
+ @ rename( $frompath.'.'.$ext, $topath.'.'.$ext );
90
+
91
+ // therefor delete if still exists
92
+ if ( is_file( $frompath.'.'.$ext ) ) {
93
+ @ unlink( $frompath.'.'.$ext );
94
+ }
95
  }
96
  }
97
  }
wppa-thumbnails.php CHANGED
@@ -5,7 +5,7 @@
5
  * Various funcions to display a thumbnail image
6
  * Contains all possible frontend thumbnail types
7
  *
8
- * Version 6.4.06
9
  *
10
  */
11
 
@@ -1159,7 +1159,7 @@ global $wpdb;
1159
  'id' => $id,
1160
  // 'width' => $imgwidth,
1161
  // 'height' => $imgheight,
1162
- 'controls' => false,
1163
  'margin_top' => '0',
1164
  'margin_bottom' => '0',
1165
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
@@ -1196,7 +1196,7 @@ global $wpdb;
1196
  'id' => $id,
1197
  // 'width' => $imgwidth,
1198
  // 'height' => $imgheight,
1199
- 'controls' => false,
1200
  'margin_top' => '0',
1201
  'margin_bottom' => '0',
1202
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
@@ -1248,7 +1248,7 @@ global $wpdb;
1248
  if ( $is_video ) {
1249
  $result .= wppa_get_video_html( array(
1250
  'id' => $id,
1251
- 'controls' => false,
1252
  'margin_top' => '0',
1253
  'margin_bottom' => '0',
1254
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
@@ -1290,7 +1290,7 @@ global $wpdb;
1290
  'id' => $id,
1291
  // 'width' => $imgwidth,
1292
  // 'height' => $imgheight,
1293
- 'controls' => false,
1294
  'margin_top' => '0',
1295
  'margin_bottom' => '0',
1296
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
5
  * Various funcions to display a thumbnail image
6
  * Contains all possible frontend thumbnail types
7
  *
8
+ * Version 6.4.09
9
  *
10
  */
11
 
1159
  'id' => $id,
1160
  // 'width' => $imgwidth,
1161
  // 'height' => $imgheight,
1162
+ 'controls' => wppa_switch( 'thumb_video' ),
1163
  'margin_top' => '0',
1164
  'margin_bottom' => '0',
1165
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
1196
  'id' => $id,
1197
  // 'width' => $imgwidth,
1198
  // 'height' => $imgheight,
1199
+ 'controls' => wppa_switch( 'thumb_video' ),
1200
  'margin_top' => '0',
1201
  'margin_bottom' => '0',
1202
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
1248
  if ( $is_video ) {
1249
  $result .= wppa_get_video_html( array(
1250
  'id' => $id,
1251
+ 'controls' => wppa_switch( 'thumb_video' ),
1252
  'margin_top' => '0',
1253
  'margin_bottom' => '0',
1254
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
1290
  'id' => $id,
1291
  // 'width' => $imgwidth,
1292
  // 'height' => $imgheight,
1293
+ 'controls' => wppa_switch( 'thumb_video' ),
1294
  'margin_top' => '0',
1295
  'margin_bottom' => '0',
1296
  'tagid' => 'i-'.$xid.'-'.wppa( 'mocc' ),
wppa-utils.php CHANGED
@@ -3108,6 +3108,9 @@ function wppa_convert_uri_to_get( $uri ) {
3108
  if ( ! isset( $arg[1] ) ) {
3109
  $arg[1] = null;
3110
  }
 
 
 
3111
  $_GET[$arg[0]] = $arg[1];
3112
  $_REQUEST[$arg[0]] = $arg[1];
3113
  // wppa_log('dbg',$item);
3108
  if ( ! isset( $arg[1] ) ) {
3109
  $arg[1] = null;
3110
  }
3111
+ else {
3112
+ $arg[1] = urldecode( $arg[1] );
3113
+ }
3114
  $_GET[$arg[0]] = $arg[1];
3115
  $_REQUEST[$arg[0]] = $arg[1];
3116
  // wppa_log('dbg',$item);
wppa.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
- * Version: 6.4.08
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
@@ -29,12 +29,12 @@ global $wpdb;
29
  /* when new options are added and when the wppa_setup() routine
30
  /* must be called right after update for any other reason.
31
  */
32
- global $wppa_revno; $wppa_revno = '6408';
33
 
34
  /* This is the api interface version number
35
  /* It is incremented at any code change.
36
  */
37
- global $wppa_api_version; $wppa_api_version = '6-4-08-008';
38
 
39
  /* start timers */
40
  global $wppa_starttime; $wppa_starttime = microtime(true);
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
+ * Version: 6.4.09
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
29
  /* when new options are added and when the wppa_setup() routine
30
  /* must be called right after update for any other reason.
31
  */
32
+ global $wppa_revno; $wppa_revno = '6409';
33
 
34
  /* This is the api interface version number
35
  /* It is incremented at any code change.
36
  */
37
+ global $wppa_api_version; $wppa_api_version = '6-4-09-007';
38
 
39
  /* start timers */
40
  global $wppa_starttime; $wppa_starttime = microtime(true);