WP Photo Album Plus - Version 6.6.28

Version Description

Download this release

Release Info

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

Code changes from version 6.6.27 to 6.6.28

js/wppa-admin-scripts.js CHANGED
@@ -2366,7 +2366,7 @@ function wppaGetSelEnumToId( cls, id ) {
2366
  }
2367
  i++;
2368
  }
2369
- jQuery( '#'+id ).attr( 'value', wppaArrayToEnum( pararr, '.' ) );
2370
  }
2371
 
2372
  function wppaGetSelectionEnumByClass( clas, sep ) {
2366
  }
2367
  i++;
2368
  }
2369
+ jQuery( '#'+id ).val( wppaArrayToEnum( pararr, '.' ) );
2370
  }
2371
 
2372
  function wppaGetSelectionEnumByClass( clas, sep ) {
js/wppa-ajax-front.js CHANGED
@@ -3,7 +3,7 @@
3
  // Contains frontend ajax modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
- var wppaJsAjaxVersion = '6.6.21';
7
 
8
  var wppaRenderAdd = false;
9
  var wppaWaitForCounter = 0;
@@ -157,9 +157,6 @@ function wppaDoAjaxRender( mocc, ajaxurl, newurl, add, waitfor, addHilite ) {
157
  complete: function( xhr, status, newurl ) {
158
  wppaWaitForCounter++;
159
 
160
- // In case onload is not executed
161
- wppaReplaceSvg();
162
-
163
  if ( ! wppaRenderModal ) {
164
  jQuery('html, body').animate({ scrollTop: jQuery("#wppa-container-"+mocc).offset().top - 32 - wppaStickyHeaderHeight }, 1000);
165
  }
@@ -167,6 +164,8 @@ function wppaDoAjaxRender( mocc, ajaxurl, newurl, add, waitfor, addHilite ) {
167
  // Remove spinner
168
  jQuery( '#wppa-ajax-spin-'+mocc ).stop().fadeOut();
169
 
 
 
170
  }
171
  } );
172
  }
@@ -1052,9 +1051,18 @@ function wppaUpdatePhotoNew(id) {
1052
  } );
1053
  }
1054
 
 
1055
  // Get qrcode and put it as src in elm
1056
  function wppaAjaxSetQrCodeSrc( url, elm ) {
1057
 
 
 
 
 
 
 
 
 
1058
  var myData = 'action=wppa' +
1059
  '&wppa-action=getqrcode' +
1060
  '&wppa-qr-nonce=' + jQuery( '#wppa-qr-nonce' ).val() +
3
  // Contains frontend ajax modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
+ var wppaJsAjaxVersion = '6.6.28';
7
 
8
  var wppaRenderAdd = false;
9
  var wppaWaitForCounter = 0;
157
  complete: function( xhr, status, newurl ) {
158
  wppaWaitForCounter++;
159
 
 
 
 
160
  if ( ! wppaRenderModal ) {
161
  jQuery('html, body').animate({ scrollTop: jQuery("#wppa-container-"+mocc).offset().top - 32 - wppaStickyHeaderHeight }, 1000);
162
  }
164
  // Remove spinner
165
  jQuery( '#wppa-ajax-spin-'+mocc ).stop().fadeOut();
166
 
167
+ // Fake resize
168
+ setTimeout(function(){jQuery(window).trigger('resize')}, 250);
169
  }
170
  } );
171
  }
1051
  } );
1052
  }
1053
 
1054
+ var wppaLastQrcodeUrl = '';
1055
  // Get qrcode and put it as src in elm
1056
  function wppaAjaxSetQrCodeSrc( url, elm ) {
1057
 
1058
+ // Been here before with this url?
1059
+ if ( wppaLastQrcodeUrl == url ) {
1060
+ return;
1061
+ }
1062
+
1063
+ // Remember this
1064
+ wppaLastQrcodeUrl = url;
1065
+
1066
  var myData = 'action=wppa' +
1067
  '&wppa-action=getqrcode' +
1068
  '&wppa-qr-nonce=' + jQuery( '#wppa-qr-nonce' ).val() +
js/wppa-ajax-front.min.js CHANGED
@@ -4,7 +4,7 @@
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
- var wppaJsAjaxVersion='6.6.21';var wppaRenderAdd=false;var wppaWaitForCounter=0;function wppaDoAjaxRender(mocc,ajaxurl,newurl,add,waitfor,addHilite){if(parseInt(waitfor)>0&&waitfor!=wppaWaitForCounter){setTimeout('wppaDoAjaxRender( '+mocc+', \''+ajaxurl+'\', \''+newurl+'\', \''+add+'\', '+waitfor+' )',100);return;}
8
  wppaRenderAdd=add;if(wppaLang!='')ajaxurl+='&lang='+wppaLang;if(wppaAutoColumnWidth[mocc])ajaxurl+='&resp=1';if(addHilite&&_wppaCurIdx[mocc]&&_wppaId[mocc][_wppaCurIdx[mocc]])ajaxurl+='&wppa-hilite='+_wppaId[mocc][_wppaCurIdx[mocc]];if(wppaCanAjaxRender){jQuery.ajax({url:ajaxurl,async:true,type:'GET',timeout:60000,beforeSend:function(xhr){if(_wppaSSRuns[mocc])_wppaStop(mocc);jQuery('#wppa-ajax-spin-'+mocc).fadeIn();},success:function(result,status,xhr){if(wppaRenderAdd){jQuery(wppaRenderAdd+result).insertBefore('#wppa-container-'+mocc+'-end');}
9
  else{if(wppaRenderModal){var opt={modal:true,resizable:true,width:wppaGetContainerWidth(mocc),show:{effect:"fadeIn",duration:400},closeText:"",};jQuery('#wppa-modal-container-'+mocc).html(result).dialog(opt).dialog("open");jQuery('.ui-dialog').css({boxShadow:'0px 0px 5px 5px #aaaaaa',borderRadius:wppaBoxRadius+'px',padding:'8px',backgroundColor:wppaModalBgColor,boxSizing:'content-box',zIndex:100000,});jQuery('.ui-dialog-titlebar').css({lineHeight:'0px',height:'32px',});jQuery('.ui-button').css({backgroundImage:wppaModalQuitImg,padding:0,position:'absolute',right:'8px',top:'8px',width:'16px',height:'16px',});jQuery('.ui-button').attr('title','Close');jQuery('.ui-button').on('click',function(){_wppaStop(mocc);});}
10
  else{jQuery('#wppa-container-'+mocc).html(result);}}
@@ -14,8 +14,8 @@ catch(err){wppaConsoleLog('Ajax rendering: History stack update failed','force')
14
  if(wppaFirstOccur==0)wppaFirstOccur=mocc;}
15
  wppaUpdateLightboxes();if(typeof(wppaQRUpdate)!='undefined'){wppaConsoleLog('Ajax render asked qr code for '+newurl,'force');wppaQRUpdate(newurl);}
16
  wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);var scriptPos=result.indexOf('<script');var scriptPosLast=result.lastIndexOf('<script');if(scriptPos==-1){wppaConsoleLog('Ajax render did NOT contain a script tag','force');}
17
- else{wppaConsoleLog('Ajax render did contain a script tag at position '+scriptPos+' last at '+scriptPosLast,'force');}},error:function(xhr,status,error){wppaConsoleLog('wppaDoAjaxRender failed. Error = '+error+', status = '+status,'force');document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);},complete:function(xhr,status,newurl){wppaWaitForCounter++;wppaReplaceSvg();if(!wppaRenderModal){jQuery('html, body').animate({scrollTop:jQuery("#wppa-container-"+mocc).offset().top-32-wppaStickyHeaderHeight},1000);}
18
- jQuery('#wppa-ajax-spin-'+mocc).stop().fadeOut();}});}
19
  else{document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}
20
  function wppaAjaxApprovePhoto(photo){jQuery.ajax({url:wppaAjaxUrl,data:'action=wppa'+'&wppa-action=approve'+'&photo-id='+photo,async:true,type:'GET',timeout:60000,success:function(result,status,xhr){if(result=='OK'){jQuery('.wppa-approve-'+photo).css('display','none');}
21
  else{alert(result);}},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxApprovePhoto failed. Error = '+error+', status = '+status,'force');},});}
@@ -76,5 +76,6 @@ wppaOpenComments(mocc);},error:function(xhr,status,error){wppaConsoleLog('wppaAj
76
  function wppaUpdatePhotoNew(id){var myItems=['name','description','tags','custom_0','custom_1','custom_2','custom_3','custom_4','custom_5','custom_6','custom_7','custom_8','custom_9'];var myData='action=wppa'+'&wppa-action=update-photo-new'+'&photo-id='+id+'&wppa-nonce='+jQuery('#wppa-nonce-'+id).val();var i=0;while(i<myItems.length){if(typeof(jQuery('#'+myItems[i]).val())!='undefined'){myData+='&'+myItems[i]+'='+jQuery('#'+myItems[i]).val();}
77
  i++;}
78
  jQuery.ajax({url:wppaAjaxUrl,data:myData,async:false,type:'POST',timeout:10000,beforeSend:function(xhr){},success:function(result,status,xhr){if(result.length>0){alert(result);}},error:function(xhr,status,error){alert(result);wppaConsoleLog('wppaUpdatePhotoNew failed. Error = '+error+', status = '+status,'force');},complete:function(xhr,status,newurl){}});}
79
- function wppaAjaxSetQrCodeSrc(url,elm){var myData='action=wppa'+'&wppa-action=getqrcode'+'&wppa-qr-nonce='+jQuery('#wppa-qr-nonce').val()+'&url='+encodeURIComponent(url);jQuery.ajax({url:wppaAjaxUrl,data:myData,async:true,type:'POST',timeout:10000,success:function(result,status,xhr){document.getElementById(elm).src=result;wppaConsoleLog('wppaAjaxSetQrCodeSrc put '+result+' into '+elm);},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxSetQrCodeSrc failed. Error = '+error+', status = '+status,'force');}});}
 
80
  wppaConsoleLog('wppa-ajax-front.js version '+wppaJsAjaxVersion+' loaded.','force');
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
+ var wppaJsAjaxVersion='6.6.28';var wppaRenderAdd=false;var wppaWaitForCounter=0;function wppaDoAjaxRender(mocc,ajaxurl,newurl,add,waitfor,addHilite){if(parseInt(waitfor)>0&&waitfor!=wppaWaitForCounter){setTimeout('wppaDoAjaxRender( '+mocc+', \''+ajaxurl+'\', \''+newurl+'\', \''+add+'\', '+waitfor+' )',100);return;}
8
  wppaRenderAdd=add;if(wppaLang!='')ajaxurl+='&lang='+wppaLang;if(wppaAutoColumnWidth[mocc])ajaxurl+='&resp=1';if(addHilite&&_wppaCurIdx[mocc]&&_wppaId[mocc][_wppaCurIdx[mocc]])ajaxurl+='&wppa-hilite='+_wppaId[mocc][_wppaCurIdx[mocc]];if(wppaCanAjaxRender){jQuery.ajax({url:ajaxurl,async:true,type:'GET',timeout:60000,beforeSend:function(xhr){if(_wppaSSRuns[mocc])_wppaStop(mocc);jQuery('#wppa-ajax-spin-'+mocc).fadeIn();},success:function(result,status,xhr){if(wppaRenderAdd){jQuery(wppaRenderAdd+result).insertBefore('#wppa-container-'+mocc+'-end');}
9
  else{if(wppaRenderModal){var opt={modal:true,resizable:true,width:wppaGetContainerWidth(mocc),show:{effect:"fadeIn",duration:400},closeText:"",};jQuery('#wppa-modal-container-'+mocc).html(result).dialog(opt).dialog("open");jQuery('.ui-dialog').css({boxShadow:'0px 0px 5px 5px #aaaaaa',borderRadius:wppaBoxRadius+'px',padding:'8px',backgroundColor:wppaModalBgColor,boxSizing:'content-box',zIndex:100000,});jQuery('.ui-dialog-titlebar').css({lineHeight:'0px',height:'32px',});jQuery('.ui-button').css({backgroundImage:wppaModalQuitImg,padding:0,position:'absolute',right:'8px',top:'8px',width:'16px',height:'16px',});jQuery('.ui-button').attr('title','Close');jQuery('.ui-button').on('click',function(){_wppaStop(mocc);});}
10
  else{jQuery('#wppa-container-'+mocc).html(result);}}
14
  if(wppaFirstOccur==0)wppaFirstOccur=mocc;}
15
  wppaUpdateLightboxes();if(typeof(wppaQRUpdate)!='undefined'){wppaConsoleLog('Ajax render asked qr code for '+newurl,'force');wppaQRUpdate(newurl);}
16
  wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);var scriptPos=result.indexOf('<script');var scriptPosLast=result.lastIndexOf('<script');if(scriptPos==-1){wppaConsoleLog('Ajax render did NOT contain a script tag','force');}
17
+ else{wppaConsoleLog('Ajax render did contain a script tag at position '+scriptPos+' last at '+scriptPosLast,'force');}},error:function(xhr,status,error){wppaConsoleLog('wppaDoAjaxRender failed. Error = '+error+', status = '+status,'force');document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);},complete:function(xhr,status,newurl){wppaWaitForCounter++;if(!wppaRenderModal){jQuery('html, body').animate({scrollTop:jQuery("#wppa-container-"+mocc).offset().top-32-wppaStickyHeaderHeight},1000);}
18
+ jQuery('#wppa-ajax-spin-'+mocc).stop().fadeOut();setTimeout(function(){jQuery(window).trigger('resize')},250);}});}
19
  else{document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}
20
  function wppaAjaxApprovePhoto(photo){jQuery.ajax({url:wppaAjaxUrl,data:'action=wppa'+'&wppa-action=approve'+'&photo-id='+photo,async:true,type:'GET',timeout:60000,success:function(result,status,xhr){if(result=='OK'){jQuery('.wppa-approve-'+photo).css('display','none');}
21
  else{alert(result);}},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxApprovePhoto failed. Error = '+error+', status = '+status,'force');},});}
76
  function wppaUpdatePhotoNew(id){var myItems=['name','description','tags','custom_0','custom_1','custom_2','custom_3','custom_4','custom_5','custom_6','custom_7','custom_8','custom_9'];var myData='action=wppa'+'&wppa-action=update-photo-new'+'&photo-id='+id+'&wppa-nonce='+jQuery('#wppa-nonce-'+id).val();var i=0;while(i<myItems.length){if(typeof(jQuery('#'+myItems[i]).val())!='undefined'){myData+='&'+myItems[i]+'='+jQuery('#'+myItems[i]).val();}
77
  i++;}
78
  jQuery.ajax({url:wppaAjaxUrl,data:myData,async:false,type:'POST',timeout:10000,beforeSend:function(xhr){},success:function(result,status,xhr){if(result.length>0){alert(result);}},error:function(xhr,status,error){alert(result);wppaConsoleLog('wppaUpdatePhotoNew failed. Error = '+error+', status = '+status,'force');},complete:function(xhr,status,newurl){}});}
79
+ var wppaLastQrcodeUrl='';function wppaAjaxSetQrCodeSrc(url,elm){if(wppaLastQrcodeUrl==url){return;}
80
+ wppaLastQrcodeUrl=url;var myData='action=wppa'+'&wppa-action=getqrcode'+'&wppa-qr-nonce='+jQuery('#wppa-qr-nonce').val()+'&url='+encodeURIComponent(url);jQuery.ajax({url:wppaAjaxUrl,data:myData,async:true,type:'POST',timeout:10000,success:function(result,status,xhr){document.getElementById(elm).src=result;wppaConsoleLog('wppaAjaxSetQrCodeSrc put '+result+' into '+elm);},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxSetQrCodeSrc failed. Error = '+error+', status = '+status,'force');}});}
81
  wppaConsoleLog('wppa-ajax-front.js version '+wppaJsAjaxVersion+' loaded.','force');
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.6.25';
7
 
8
  // This is an entrypoint to load the slide data
9
  function wppaStoreSlideInfo(
@@ -142,11 +142,8 @@ function wppaStoreSlideInfo(
142
  _wppaOgDsc[mocc][id] = ogdsc;
143
  _wppaId[mocc][id] = photoid; // reqd for rating and comment and monkey and registering views
144
  _wppaAvg[mocc][id] = avgrat; // avg ratig value
145
- wppaConsoleLog( '_wppaAvg[mocc][id]='+_wppaAvg[mocc][id], 'force' );
146
  _wppaDisc[mocc][id] = discount; // Dislike count
147
- wppaConsoleLog( 'discount='+discount, 'force' );
148
  _wppaMyr[mocc][id] = myrat; // my rating
149
- wppaConsoleLog( 'myrat='+myrat, 'force' );
150
  _wppaVRU[mocc][id] = rateurl; // url that performs the vote and returns to the page
151
  _wppaLinkUrl[mocc][id] = linkurl;
152
  _wppaLinkTitle[mocc][id] = linktitle;
@@ -508,7 +505,7 @@ function _wppaNextSlide_2( mocc ) {
508
  if ( 1 == elm.nodeType ) { // Is html
509
  if ( 'IMG' == elm.nodeName ) { // Is an image
510
  if ( ! elm.complete ) { // Is not complete yet
511
- setTimeout( '_wppaNextSlide_2( ' + mocc + ' )', 100 ); // Try again after 100 ms
512
  wppaConsoleLog( 'Retry next2' ); // Log retry
513
  return;
514
  }
@@ -837,6 +834,8 @@ function _wppaNextSlide_5( mocc ) {
837
  }
838
  }
839
  }
 
 
840
  }
841
 
842
  // Format a slide
@@ -1527,11 +1526,13 @@ function _wppaCheckRewind( mocc ) {
1527
  }
1528
 
1529
  function _wppaSetRatingDisplay( mocc ) {
1530
- wppaConsoleLog( '_wppaSetRatingDisplay() called with arg '+mocc, 'force');
1531
- wppaConsoleLog( '_wppaAvg[mocc][_wppaCurIdx[mocc]]='+_wppaAvg[mocc][_wppaCurIdx[mocc]]+' _wppaCurIdx[mocc]='+_wppaCurIdx[mocc], 'force');
 
 
 
1532
 
1533
  var idx, avg, tmp, cnt, dsc, myr, dsctxt;
1534
- if ( ! document.getElementById( 'wppa-rating-'+mocc ) ) return; // No rating bar
1535
 
1536
  avg = _wppaAvg[mocc][_wppaCurIdx[mocc]];
1537
  if ( typeof( avg ) == 'undefined' ) return;
@@ -1560,8 +1561,6 @@ wppaConsoleLog( '_wppaAvg[mocc][_wppaCurIdx[mocc]]='+_wppaAvg[mocc][_wppaCurIdx[
1560
  dsc = _wppaDisc[mocc][_wppaCurIdx[mocc]];
1561
  myr = _wppaMyr[mocc][_wppaCurIdx[mocc]];
1562
 
1563
- wppaConsoleLog( 'avg='+avg+' cnt='+cnt+' dsc='+dsc+' myr='+myr );
1564
-
1565
  // Graphic display ?
1566
  if ( wppaRatingDisplayType == 'graphic' ) {
1567
  // Set Avg rating
@@ -1664,7 +1663,6 @@ function wppaGetDislikeText( dsc,myr,incmine ) {
1664
 
1665
  function _wppaSetRd( mocc, avg, where ) {
1666
 
1667
- wppaConsoleLog( '_wppaSetRd() called with args:'+mocc+' '+avg+' '+where, 'force' );
1668
  var idx1 = parseInt( avg );
1669
  var idx2 = idx1 + 1;
1670
  var frac = avg - idx1;
3
  // Contains slideshow modules
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
+ var wppaJsSlideshowVersion = '6.6.28';
7
 
8
  // This is an entrypoint to load the slide data
9
  function wppaStoreSlideInfo(
142
  _wppaOgDsc[mocc][id] = ogdsc;
143
  _wppaId[mocc][id] = photoid; // reqd for rating and comment and monkey and registering views
144
  _wppaAvg[mocc][id] = avgrat; // avg ratig value
 
145
  _wppaDisc[mocc][id] = discount; // Dislike count
 
146
  _wppaMyr[mocc][id] = myrat; // my rating
 
147
  _wppaVRU[mocc][id] = rateurl; // url that performs the vote and returns to the page
148
  _wppaLinkUrl[mocc][id] = linkurl;
149
  _wppaLinkTitle[mocc][id] = linktitle;
505
  if ( 1 == elm.nodeType ) { // Is html
506
  if ( 'IMG' == elm.nodeName ) { // Is an image
507
  if ( ! elm.complete ) { // Is not complete yet
508
+ setTimeout( '_wppaNextSlide_2( ' + mocc + ' )', 200 ); // Try again after 100 ms
509
  wppaConsoleLog( 'Retry next2' ); // Log retry
510
  return;
511
  }
834
  }
835
  }
836
  }
837
+
838
+ jQuery( window ).trigger( 'resize' );
839
  }
840
 
841
  // Format a slide
1526
  }
1527
 
1528
  function _wppaSetRatingDisplay( mocc ) {
1529
+
1530
+ // Rating bar present?
1531
+ if ( ! document.getElementById( 'wppa-rating-'+mocc ) ) {
1532
+ return;
1533
+ }
1534
 
1535
  var idx, avg, tmp, cnt, dsc, myr, dsctxt;
 
1536
 
1537
  avg = _wppaAvg[mocc][_wppaCurIdx[mocc]];
1538
  if ( typeof( avg ) == 'undefined' ) return;
1561
  dsc = _wppaDisc[mocc][_wppaCurIdx[mocc]];
1562
  myr = _wppaMyr[mocc][_wppaCurIdx[mocc]];
1563
 
 
 
1564
  // Graphic display ?
1565
  if ( wppaRatingDisplayType == 'graphic' ) {
1566
  // Set Avg rating
1663
 
1664
  function _wppaSetRd( mocc, avg, where ) {
1665
 
 
1666
  var idx1 = parseInt( avg );
1667
  var idx2 = idx1 + 1;
1668
  var frac = avg - idx1;
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.6.25';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,waittext,imagealt,posterurl){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;_wppaWaitTexts[mocc]=[];_wppaImageAlt[mocc]=[];}
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="'+imagealt+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}
@@ -13,7 +13,7 @@ else{_wppaSlides[mocc][id]=' src="'+url+'" alt="'+imagealt+'" class="theimg thei
13
  if(wppaSlideSwipe){_wppaSlides[mocc][id]+=' ontouchstart="wppaTouchStart( event, this.id, '+mocc+' );"'+' ontouchend="wppaTouchEnd( event );"'+' ontouchmove="wppaTouchMove( event );"'+' ontouchcancel="wppaTouchCancel( event );" ';}
14
  if(!wppaAutoColumnWidth[mocc])_wppaSlides[mocc][id]+='width="'+width+'" height="'+height+'" ';if(_wppaIsVideo[mocc][id]){var controls;controls='wppa'==wppaLightBox[mocc]?'':'controls';_wppaSlides[mocc][id]+='style="'+size+'; cursor:'+cursor+'; display:none;" '+controls+'>'+videohtml+'</video>';}
15
  else{_wppaSlides[mocc][id]+='style="'+size+'; cursor:'+cursor+'; display:none; vertical-align:middle;">';}
16
- _wppaFullNames[mocc][id]=fullname;_wppaNames[mocc][id]=name;_wppaDsc[mocc][id]=desc;_wppaOgDsc[mocc][id]=ogdsc;_wppaId[mocc][id]=photoid;_wppaAvg[mocc][id]=avgrat;wppaConsoleLog('_wppaAvg[mocc][id]='+_wppaAvg[mocc][id],'force');_wppaDisc[mocc][id]=discount;wppaConsoleLog('discount='+discount,'force');_wppaMyr[mocc][id]=myrat;wppaConsoleLog('myrat='+myrat,'force');_wppaVRU[mocc][id]=rateurl;_wppaLinkUrl[mocc][id]=linkurl;_wppaLinkTitle[mocc][id]=linktitle;if(linktarget!=''){_wppaLinkTarget[mocc][id]=linktarget;}
17
  else if(wppaSlideBlank[mocc]){_wppaLinkTarget[mocc][id]='_blank';}
18
  else{_wppaLinkTarget[mocc][id]='_self';}
19
  _wppaCommentHtml[mocc][id]=commenthtml;_wppaIptcHtml[mocc][id]=iptchtml;_wppaExifHtml[mocc][id]=exifhtml;_wppaUrl[mocc][id]=url;_wppaLbTitle[mocc][id]=wppaRepairScriptTags(lbtitle);_wppaShareUrl[mocc][id]=shareurl;_wppaShareHtml[mocc][id]=wppaRepairScriptTags(smhtml);_wppaHiresUrl[mocc][id]=hiresurl;_wppaVideoHtml[mocc][id]=videohtml;_wppaAudioHtml[mocc][id]=audiohtml;_wppaVideoNatWidth[mocc][id]=width;_wppaVideoNatHeight[mocc][id]=height;_wppaWaitTexts[mocc][id]=waittext;_wppaImageAlt[mocc][id]=imagealt;}
@@ -59,7 +59,7 @@ if(wppaIsMini[mocc]||wppaGetContainerWidth(mocc)<wppaMiniTreshold){jQuery('#wppa
59
  else{jQuery('#wppa-avg-rat-'+mocc).html(wppaAvgRating);jQuery('#wppa-my-rat-'+mocc).html(wppaMyRating);}}
60
  else{wppaMakeTheSlideHtml(mocc,bg,_wppaNxtIdx[mocc]);}
61
  _wppaLoadSpinner(mocc);_wppaFirst[mocc]=false;_wppaCheckRewind(mocc);wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);setTimeout('_wppaNextSlide_2( '+mocc+' )',10);}
62
- function _wppaNextSlide_2(mocc){var fg=_wppaFg[mocc];var bg=1-fg;var elm=document.getElementById('theimg'+bg+"-"+mocc);if(elm){if(1==elm.nodeType){if('IMG'==elm.nodeName){if(!elm.complete){setTimeout('_wppaNextSlide_2( '+mocc+' )',100);wppaConsoleLog('Retry next2');return;}}}}
63
  wppaUpdateLightboxes();_wppaUnloadSpinner(mocc);if(_wppaSSRuns[mocc]!=-1){if(!_wppaToTheSame){_wppaShowMetaData(mocc,'hide');}}
64
  _wppaFg[mocc]=1-_wppaFg[mocc];fg=_wppaFg[mocc];bg=1-fg;setTimeout('_wppaNextSlide_3( '+mocc+' )',10);}
65
  function _wppaNextSlide_3(mocc){var nw=_wppaFg[mocc];var ol=1-nw;var olIdx=_wppaCurIdx[mocc];var nwIdx=_wppaNxtIdx[mocc];var olSli="#theslide"+ol+"-"+mocc;var nwSli="#theslide"+nw+"-"+mocc;var olImg="#theimg"+ol+"-"+mocc;var nwImg="#theimg"+nw+"-"+mocc;var w=parseInt(jQuery(olSli).css('width'));var dir='nil';if(olIdx==nwIdx)dir='none';if(olIdx==nwIdx-1)dir='left';if(olIdx==nwIdx+1)dir='right';if(olIdx==_wppaSlides[mocc].length-1&&0==nwIdx&&wppaSlideWrap)dir='left';if(0==olIdx&&nwIdx==_wppaSlides[mocc].length-1&&wppaSlideWrap)dir='right';if('nil'==dir){if(olIdx<nwIdx)dir='left';else dir='right';}
@@ -82,7 +82,8 @@ if(typeof(wppaQRUpdate)!='undefined'){wppaQRUpdate(_wppaShareUrl[mocc][_wppaCurI
82
  if(_wppaSlides[mocc].length>1){wppaPushStateSlide(mocc,_wppaCurIdx[mocc],visurl);}}
83
  if(_wppaSSRuns[mocc]){setTimeout('_wppaNextSlide( '+mocc+', "auto" )',wppaGetSlideshowTimeout(mocc));}}
84
  jQuery(document).trigger('glossaryTooltipReady');_wppaDidGoto[mocc]=false;_wppaIsBusy[mocc]=false;if(!wppaIsMini[mocc]){_bumpViewCount(_wppaId[mocc][_wppaCurIdx[mocc]]);}
85
- _wppaDoAutocol(mocc);wppaStopAudio(mocc);if(wppaSlideAudioStart){var elms=jQuery('.wppa-audio-'+_wppaId[mocc][_wppaCurIdx[mocc]]+'-'+mocc);if(elms.length>0){var audio=elms[elms.length-1];if(audio){if(!wppaAudioPlaying[mocc]){audio.play();}}}}}
 
86
  function wppaFormatSlide(mocc){var imgid='theimg'+_wppaFg[mocc]+'-'+mocc;var slideid='theslide'+_wppaFg[mocc]+'-'+mocc;var frameid='slide_frame-'+mocc;var contw=wppaColWidth[mocc];var elm=document.getElementById(imgid);var audios=jQuery('.wppa-audio-'+mocc);if(!elm)return;if(typeof(contw)=='undefined'||contw==0){contw=wppaGetContainerWidth(mocc);wppaColWidth[mocc]=contw;}
87
  var natwidth=elm.naturalWidth;if(typeof(natwidth)=='undefined')natwidth=parseInt(elm.style.maxWidth);var natheight=elm.naturalHeight;if(typeof(natheight)=='undefined')natheight=parseInt(elm.style.maxHeight);var aspect=wppaAspectRatio[mocc];var fullsize=wppaFullSize[mocc];var delta=wppaFullFrameDelta[mocc];var ponly=wppaPortraitOnly[mocc];var valign=wppaFullValign[mocc];if(typeof(valign)=='undefined')valign='none';var halign=wppaFullHalign[mocc];if(typeof(halign)=='undefined')halign='none';var stretch=wppaStretch;var imgw,imgh;var margl,margt;var slidew,slideh;var framew,frameh;if(ponly){imgw=contw-delta;imgh=parseInt(imgw*natheight/natwidth);margl=0;margt=0;slidew=contw;slideh=imgh+delta;framew=contw;frameh=slideh;jQuery('#'+frameid).css({width:framew,height:frameh});jQuery('#'+slideid).css({width:slidew,height:slideh});jQuery('#'+imgid).css({width:imgw,height:imgh});}
88
  else{framew=contw;if(fullsize<contw){framew=fullsize;}
@@ -171,10 +172,11 @@ function _wppaUnloadSpinner(mocc){jQuery('#wppa-slide-spin-'+mocc).stop().fadeOu
171
  function _wppaCheckRewind(mocc){var n_images;var n_diff;var l_substrate;var x_marg;if(!document.getElementById('wppa-filmstrip-'+mocc))return;n_diff=Math.abs(_wppaCurIdx[mocc]-_wppaNxtIdx[mocc]);if(n_diff<=wppaFilmPageSize[mocc])return;var n_images=wppaFilmStripLength[mocc]/wppaThumbnailPitch[mocc];if(n_diff>=((n_images+1)/2)){l_substrate=wppaThumbnailPitch[mocc]*_wppaSlides[mocc].length;if(wppaFilmShowGlue)l_substrate+=(2+2*wppaFilmStripMargin[mocc]);x_marg=parseInt(jQuery('#wppa-filmstrip-'+mocc).css('margin-left'));if(_wppaNxtIdx[mocc]>_wppaCurIdx[mocc]){x_marg-=l_substrate;}
172
  else{x_marg+=l_substrate;}
173
  jQuery('#wppa-filmstrip-'+mocc).css('margin-left',x_marg+'px');}}
174
- function _wppaSetRatingDisplay(mocc){wppaConsoleLog('_wppaSetRatingDisplay() called with arg '+mocc,'force');wppaConsoleLog('_wppaAvg[mocc][_wppaCurIdx[mocc]]='+_wppaAvg[mocc][_wppaCurIdx[mocc]]+' _wppaCurIdx[mocc]='+_wppaCurIdx[mocc],'force');var idx,avg,tmp,cnt,dsc,myr,dsctxt;if(!document.getElementById('wppa-rating-'+mocc))return;avg=_wppaAvg[mocc][_wppaCurIdx[mocc]];if(typeof(avg)=='undefined')return;if(wppaRatingDisplayType=='likes'){var likeText=avg.split("|");jQuery('#wppa-like-'+mocc).attr('title',likeText[0]);jQuery('#wppa-liketext-'+mocc).html(likeText[1]);if(_wppaMyr[mocc][_wppaCurIdx[mocc]]=='1'){jQuery('#wppa-like-'+mocc).attr('src',wppaImageDirectory+'thumbdown.png');}
 
175
  else{jQuery('#wppa-like-'+mocc).attr('src',wppaImageDirectory+'thumbup.png');}
176
  return;}
177
- tmp=avg.split('|');avg=tmp[0];cnt=tmp[1];dsc=_wppaDisc[mocc][_wppaCurIdx[mocc]];myr=_wppaMyr[mocc][_wppaCurIdx[mocc]];wppaConsoleLog('avg='+avg+' cnt='+cnt+' dsc='+dsc+' myr='+myr);if(wppaRatingDisplayType=='graphic'){_wppaSetRd(mocc,avg,'#wppa-avg-');_wppaSetRd(mocc,myr,'#wppa-rate-');if(myr==0){jQuery('#wppa-dislike-'+mocc).css('display','inline');jQuery('#wppa-dislike-imgdiv-'+mocc).css('display','inline');if(document.getElementById('wppa-dislike-'+mocc))jQuery('#wppa-filler-'+mocc).css('display','none');jQuery('#wppa-dislike-'+mocc).stop().fadeTo(100,wppaStarOpacity);}
178
  else{jQuery('#wppa-dislike-'+mocc).css('display','none');jQuery('#wppa-dislike-imgdiv-'+mocc).css('display','none');jQuery('#wppa-filler-'+mocc).css('display','inline');jQuery('#wppa-filler-'+mocc).stop().fadeTo(100,wppaStarOpacity);jQuery('#wppa-filler-'+mocc).attr('title',dsc);}}
179
  else{jQuery('#wppa-numrate-avg-'+mocc).html(avg+' ( '+cnt+' ) ');if(wppaRatingOnce&&myr>0){jQuery('#wppa-numrate-mine-'+mocc).html(myr);}
180
  else if(myr<0){jQuery('#wppa-numrate-mine-'+mocc).html(' dislike');}
@@ -188,7 +190,7 @@ if(myr==0){jQuery('#wppa-vote-button-'+mocc).val(wppaVoteForMe);}
188
  else{jQuery('#wppa-vote-button-'+mocc).val(wppaVotedForMe);}
189
  jQuery('#wppa-vote-count-'+mocc).html(cnt);}
190
  function wppaGetDislikeText(dsc,myr,incmine){return dsc;}
191
- function _wppaSetRd(mocc,avg,where){wppaConsoleLog('_wppaSetRd() called with args:'+mocc+' '+avg+' '+where,'force');var idx1=parseInt(avg);var idx2=idx1+1;var frac=avg-idx1;var opac=wppaStarOpacity+frac*(1.0-wppaStarOpacity);var ilow=1;var ihigh=wppaRatingMax;for(idx=ilow;idx<=ihigh;idx++){if(where=='#wppa-rate-'||where=='.wppa-rate-'){if(jQuery(where+mocc+'-'+idx).attr('src')!=wppaImageDirectory+'star.ico'){jQuery(where+mocc+'-'+idx).attr('src',wppaImageDirectory+'star.ico');}}
192
  if(idx<=idx1){jQuery(where+mocc+'-'+idx).stop().fadeTo(100,1.0);}
193
  else if(idx==idx2){jQuery(where+mocc+'-'+idx).stop().fadeTo(100,opac);}
194
  else{jQuery(where+mocc+'-'+idx).stop().fadeTo(100,wppaStarOpacity);}}}
4
  // Dependancies: wppa.js and default wp jQuery library
5
  //
6
 
7
+ var wppaJsSlideshowVersion='6.6.28';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,waittext,imagealt,posterurl){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;_wppaWaitTexts[mocc]=[];_wppaImageAlt[mocc]=[];}
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="'+imagealt+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}
13
  if(wppaSlideSwipe){_wppaSlides[mocc][id]+=' ontouchstart="wppaTouchStart( event, this.id, '+mocc+' );"'+' ontouchend="wppaTouchEnd( event );"'+' ontouchmove="wppaTouchMove( event );"'+' ontouchcancel="wppaTouchCancel( event );" ';}
14
  if(!wppaAutoColumnWidth[mocc])_wppaSlides[mocc][id]+='width="'+width+'" height="'+height+'" ';if(_wppaIsVideo[mocc][id]){var controls;controls='wppa'==wppaLightBox[mocc]?'':'controls';_wppaSlides[mocc][id]+='style="'+size+'; cursor:'+cursor+'; display:none;" '+controls+'>'+videohtml+'</video>';}
15
  else{_wppaSlides[mocc][id]+='style="'+size+'; cursor:'+cursor+'; display:none; vertical-align:middle;">';}
16
+ _wppaFullNames[mocc][id]=fullname;_wppaNames[mocc][id]=name;_wppaDsc[mocc][id]=desc;_wppaOgDsc[mocc][id]=ogdsc;_wppaId[mocc][id]=photoid;_wppaAvg[mocc][id]=avgrat;_wppaDisc[mocc][id]=discount;_wppaMyr[mocc][id]=myrat;_wppaVRU[mocc][id]=rateurl;_wppaLinkUrl[mocc][id]=linkurl;_wppaLinkTitle[mocc][id]=linktitle;if(linktarget!=''){_wppaLinkTarget[mocc][id]=linktarget;}
17
  else if(wppaSlideBlank[mocc]){_wppaLinkTarget[mocc][id]='_blank';}
18
  else{_wppaLinkTarget[mocc][id]='_self';}
19
  _wppaCommentHtml[mocc][id]=commenthtml;_wppaIptcHtml[mocc][id]=iptchtml;_wppaExifHtml[mocc][id]=exifhtml;_wppaUrl[mocc][id]=url;_wppaLbTitle[mocc][id]=wppaRepairScriptTags(lbtitle);_wppaShareUrl[mocc][id]=shareurl;_wppaShareHtml[mocc][id]=wppaRepairScriptTags(smhtml);_wppaHiresUrl[mocc][id]=hiresurl;_wppaVideoHtml[mocc][id]=videohtml;_wppaAudioHtml[mocc][id]=audiohtml;_wppaVideoNatWidth[mocc][id]=width;_wppaVideoNatHeight[mocc][id]=height;_wppaWaitTexts[mocc][id]=waittext;_wppaImageAlt[mocc][id]=imagealt;}
59
  else{jQuery('#wppa-avg-rat-'+mocc).html(wppaAvgRating);jQuery('#wppa-my-rat-'+mocc).html(wppaMyRating);}}
60
  else{wppaMakeTheSlideHtml(mocc,bg,_wppaNxtIdx[mocc]);}
61
  _wppaLoadSpinner(mocc);_wppaFirst[mocc]=false;_wppaCheckRewind(mocc);wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);setTimeout('_wppaNextSlide_2( '+mocc+' )',10);}
62
+ function _wppaNextSlide_2(mocc){var fg=_wppaFg[mocc];var bg=1-fg;var elm=document.getElementById('theimg'+bg+"-"+mocc);if(elm){if(1==elm.nodeType){if('IMG'==elm.nodeName){if(!elm.complete){setTimeout('_wppaNextSlide_2( '+mocc+' )',200);wppaConsoleLog('Retry next2');return;}}}}
63
  wppaUpdateLightboxes();_wppaUnloadSpinner(mocc);if(_wppaSSRuns[mocc]!=-1){if(!_wppaToTheSame){_wppaShowMetaData(mocc,'hide');}}
64
  _wppaFg[mocc]=1-_wppaFg[mocc];fg=_wppaFg[mocc];bg=1-fg;setTimeout('_wppaNextSlide_3( '+mocc+' )',10);}
65
  function _wppaNextSlide_3(mocc){var nw=_wppaFg[mocc];var ol=1-nw;var olIdx=_wppaCurIdx[mocc];var nwIdx=_wppaNxtIdx[mocc];var olSli="#theslide"+ol+"-"+mocc;var nwSli="#theslide"+nw+"-"+mocc;var olImg="#theimg"+ol+"-"+mocc;var nwImg="#theimg"+nw+"-"+mocc;var w=parseInt(jQuery(olSli).css('width'));var dir='nil';if(olIdx==nwIdx)dir='none';if(olIdx==nwIdx-1)dir='left';if(olIdx==nwIdx+1)dir='right';if(olIdx==_wppaSlides[mocc].length-1&&0==nwIdx&&wppaSlideWrap)dir='left';if(0==olIdx&&nwIdx==_wppaSlides[mocc].length-1&&wppaSlideWrap)dir='right';if('nil'==dir){if(olIdx<nwIdx)dir='left';else dir='right';}
82
  if(_wppaSlides[mocc].length>1){wppaPushStateSlide(mocc,_wppaCurIdx[mocc],visurl);}}
83
  if(_wppaSSRuns[mocc]){setTimeout('_wppaNextSlide( '+mocc+', "auto" )',wppaGetSlideshowTimeout(mocc));}}
84
  jQuery(document).trigger('glossaryTooltipReady');_wppaDidGoto[mocc]=false;_wppaIsBusy[mocc]=false;if(!wppaIsMini[mocc]){_bumpViewCount(_wppaId[mocc][_wppaCurIdx[mocc]]);}
85
+ _wppaDoAutocol(mocc);wppaStopAudio(mocc);if(wppaSlideAudioStart){var elms=jQuery('.wppa-audio-'+_wppaId[mocc][_wppaCurIdx[mocc]]+'-'+mocc);if(elms.length>0){var audio=elms[elms.length-1];if(audio){if(!wppaAudioPlaying[mocc]){audio.play();}}}}
86
+ jQuery(window).trigger('resize');}
87
  function wppaFormatSlide(mocc){var imgid='theimg'+_wppaFg[mocc]+'-'+mocc;var slideid='theslide'+_wppaFg[mocc]+'-'+mocc;var frameid='slide_frame-'+mocc;var contw=wppaColWidth[mocc];var elm=document.getElementById(imgid);var audios=jQuery('.wppa-audio-'+mocc);if(!elm)return;if(typeof(contw)=='undefined'||contw==0){contw=wppaGetContainerWidth(mocc);wppaColWidth[mocc]=contw;}
88
  var natwidth=elm.naturalWidth;if(typeof(natwidth)=='undefined')natwidth=parseInt(elm.style.maxWidth);var natheight=elm.naturalHeight;if(typeof(natheight)=='undefined')natheight=parseInt(elm.style.maxHeight);var aspect=wppaAspectRatio[mocc];var fullsize=wppaFullSize[mocc];var delta=wppaFullFrameDelta[mocc];var ponly=wppaPortraitOnly[mocc];var valign=wppaFullValign[mocc];if(typeof(valign)=='undefined')valign='none';var halign=wppaFullHalign[mocc];if(typeof(halign)=='undefined')halign='none';var stretch=wppaStretch;var imgw,imgh;var margl,margt;var slidew,slideh;var framew,frameh;if(ponly){imgw=contw-delta;imgh=parseInt(imgw*natheight/natwidth);margl=0;margt=0;slidew=contw;slideh=imgh+delta;framew=contw;frameh=slideh;jQuery('#'+frameid).css({width:framew,height:frameh});jQuery('#'+slideid).css({width:slidew,height:slideh});jQuery('#'+imgid).css({width:imgw,height:imgh});}
89
  else{framew=contw;if(fullsize<contw){framew=fullsize;}
172
  function _wppaCheckRewind(mocc){var n_images;var n_diff;var l_substrate;var x_marg;if(!document.getElementById('wppa-filmstrip-'+mocc))return;n_diff=Math.abs(_wppaCurIdx[mocc]-_wppaNxtIdx[mocc]);if(n_diff<=wppaFilmPageSize[mocc])return;var n_images=wppaFilmStripLength[mocc]/wppaThumbnailPitch[mocc];if(n_diff>=((n_images+1)/2)){l_substrate=wppaThumbnailPitch[mocc]*_wppaSlides[mocc].length;if(wppaFilmShowGlue)l_substrate+=(2+2*wppaFilmStripMargin[mocc]);x_marg=parseInt(jQuery('#wppa-filmstrip-'+mocc).css('margin-left'));if(_wppaNxtIdx[mocc]>_wppaCurIdx[mocc]){x_marg-=l_substrate;}
173
  else{x_marg+=l_substrate;}
174
  jQuery('#wppa-filmstrip-'+mocc).css('margin-left',x_marg+'px');}}
175
+ function _wppaSetRatingDisplay(mocc){if(!document.getElementById('wppa-rating-'+mocc)){return;}
176
+ var idx,avg,tmp,cnt,dsc,myr,dsctxt;avg=_wppaAvg[mocc][_wppaCurIdx[mocc]];if(typeof(avg)=='undefined')return;if(wppaRatingDisplayType=='likes'){var likeText=avg.split("|");jQuery('#wppa-like-'+mocc).attr('title',likeText[0]);jQuery('#wppa-liketext-'+mocc).html(likeText[1]);if(_wppaMyr[mocc][_wppaCurIdx[mocc]]=='1'){jQuery('#wppa-like-'+mocc).attr('src',wppaImageDirectory+'thumbdown.png');}
177
  else{jQuery('#wppa-like-'+mocc).attr('src',wppaImageDirectory+'thumbup.png');}
178
  return;}
179
+ tmp=avg.split('|');avg=tmp[0];cnt=tmp[1];dsc=_wppaDisc[mocc][_wppaCurIdx[mocc]];myr=_wppaMyr[mocc][_wppaCurIdx[mocc]];if(wppaRatingDisplayType=='graphic'){_wppaSetRd(mocc,avg,'#wppa-avg-');_wppaSetRd(mocc,myr,'#wppa-rate-');if(myr==0){jQuery('#wppa-dislike-'+mocc).css('display','inline');jQuery('#wppa-dislike-imgdiv-'+mocc).css('display','inline');if(document.getElementById('wppa-dislike-'+mocc))jQuery('#wppa-filler-'+mocc).css('display','none');jQuery('#wppa-dislike-'+mocc).stop().fadeTo(100,wppaStarOpacity);}
180
  else{jQuery('#wppa-dislike-'+mocc).css('display','none');jQuery('#wppa-dislike-imgdiv-'+mocc).css('display','none');jQuery('#wppa-filler-'+mocc).css('display','inline');jQuery('#wppa-filler-'+mocc).stop().fadeTo(100,wppaStarOpacity);jQuery('#wppa-filler-'+mocc).attr('title',dsc);}}
181
  else{jQuery('#wppa-numrate-avg-'+mocc).html(avg+' ( '+cnt+' ) ');if(wppaRatingOnce&&myr>0){jQuery('#wppa-numrate-mine-'+mocc).html(myr);}
182
  else if(myr<0){jQuery('#wppa-numrate-mine-'+mocc).html(' dislike');}
190
  else{jQuery('#wppa-vote-button-'+mocc).val(wppaVotedForMe);}
191
  jQuery('#wppa-vote-count-'+mocc).html(cnt);}
192
  function wppaGetDislikeText(dsc,myr,incmine){return dsc;}
193
+ function _wppaSetRd(mocc,avg,where){var idx1=parseInt(avg);var idx2=idx1+1;var frac=avg-idx1;var opac=wppaStarOpacity+frac*(1.0-wppaStarOpacity);var ilow=1;var ihigh=wppaRatingMax;for(idx=ilow;idx<=ihigh;idx++){if(where=='#wppa-rate-'||where=='.wppa-rate-'){if(jQuery(where+mocc+'-'+idx).attr('src')!=wppaImageDirectory+'star.ico'){jQuery(where+mocc+'-'+idx).attr('src',wppaImageDirectory+'star.ico');}}
194
  if(idx<=idx1){jQuery(where+mocc+'-'+idx).stop().fadeTo(100,1.0);}
195
  else if(idx==idx2){jQuery(where+mocc+'-'+idx).stop().fadeTo(100,opac);}
196
  else{jQuery(where+mocc+'-'+idx).stop().fadeTo(100,wppaStarOpacity);}}}
js/wppa-tinymce-shortcodes.js CHANGED
@@ -2,7 +2,7 @@
2
  * Pachkage: wp-photo-album-plus
3
  *
4
  *
5
- * Version 6.5.08
6
  *
7
  */
8
 
@@ -142,11 +142,11 @@ function wppaGalleryEvaluate() {
142
  var admins = '';
143
 
144
  // Type
145
- topType = jQuery('#wppagallery-top-type').attr('value');
146
  switch ( topType ) {
147
  case 'galerytype':
148
  jQuery('#wppagallery-galery-type-tr').show();
149
- type = jQuery('#wppagallery-galery-type').attr('value');
150
  needGalType = true;
151
  needAlbum = true;
152
  jQuery('#wppagallery-album-type-tr').show();
@@ -161,7 +161,7 @@ function wppaGalleryEvaluate() {
161
  break;
162
  case 'slidestype':
163
  jQuery('#wppagallery-slides-type-tr').show();
164
- type = jQuery('#wppagallery-slides-type').attr('value');
165
  needSlideType = true;
166
  needAlbum = true;
167
  jQuery('#wppagallery-album-type-tr').show();
@@ -176,20 +176,14 @@ function wppaGalleryEvaluate() {
176
  break;
177
  case 'singletype':
178
  jQuery('#wppagallery-single-type-tr').show();
179
- type = jQuery('#wppagallery-single-type').attr('value');
180
  needPhoto = true;
181
  jQuery('#wppagallery-photo-tr').show();
182
  jQuery('#wppagallery-top-type').css('color', '#070');
183
- if ( type == '' ) {
184
- jQuery('#wppagallery-single-type').css('color', '#700');
185
- }
186
- else {
187
- jQuery('#wppagallery-single-type').css('color', '#070');
188
- }
189
  break;
190
  case 'searchtype':
191
  jQuery('#wppagallery-search-type-tr').show();
192
- type = jQuery('#wppagallery-search-type').attr('value');
193
  needSearchType = true;
194
  searchType = type;
195
  switch ( type ) {
@@ -231,15 +225,15 @@ function wppaGalleryEvaluate() {
231
  break;
232
  case 'superview':
233
  jQuery('#wppagallery-album-super-tr').show();
234
- album = jQuery('#wppagallery-album-super-parent').attr('value');
235
  break;
236
  case 'calendar':
237
  jQuery('#wppagallery-calendar-tr').show();
238
  jQuery('#wppagallery-album-super-tr').show(); // Optional parent album
239
- caltype = jQuery('#wppagallery-calendar-type').attr('value');
240
  reverse = jQuery('#wppagallery-calendar-reverse').attr('checked');
241
  allopen = jQuery('#wppagallery-calendar-allopen').attr('checked');
242
- parent = jQuery('#wppagallery-album-super-parent').attr('value');
243
  break;
244
  default:
245
  }
@@ -253,7 +247,7 @@ function wppaGalleryEvaluate() {
253
  break;
254
  case 'misceltype':
255
  jQuery('#wppagallery-miscel-type-tr').show();
256
- type = jQuery('#wppagallery-miscel-type').attr('value');
257
  needMiscType = true;
258
  switch ( type ) {
259
  case 'generic':
@@ -288,7 +282,7 @@ function wppaGalleryEvaluate() {
288
 
289
  // Album
290
  if ( needAlbum ) {
291
- albumType = jQuery('#wppagallery-album-type').attr('value');
292
  switch ( albumType ) {
293
  case 'real':
294
  jQuery('#wppagallery-album-real-tr').show();
@@ -325,11 +319,11 @@ function wppaGalleryEvaluate() {
325
  // and get the album identifier
326
  if ( type == 'cover') {
327
  jQuery('#wppagallery-album-virt-cover-tr').show();
328
- album = jQuery('#wppagallery-album-virt-cover').attr('value');
329
  }
330
  else { // type != cover
331
  jQuery('#wppagallery-album-virt-tr').show();
332
- album = jQuery('#wppagallery-album-virt').attr('value');
333
  }
334
 
335
  // Now displatch on album identifier found
@@ -346,7 +340,7 @@ function wppaGalleryEvaluate() {
346
  parent = wppaGetSelectionEnumByClass('.wppagallery-album-ropt');
347
  if ( parent == '' ) parent = '0';
348
  jQuery('#wppagallery-photo-count-tr').show();
349
- count = jQuery('#wppagallery-photo-count').attr('value');
350
  break;
351
  case '#tags':
352
  jQuery('#wppagallery-phototags-tr').show();
@@ -375,9 +369,9 @@ function wppaGalleryEvaluate() {
375
  break;
376
  case '#last':
377
  jQuery('#wppagallery-album-parent-tr').show();
378
- parent = jQuery('#wppagallery-album-parent-parent').attr('value');
379
  jQuery('#wppagallery-album-count-tr').show();
380
- count = jQuery('#wppagallery-album-count').attr('value');
381
  break;
382
  case '#cat':
383
  jQuery('#wppagallery-albumcat-tr').show();
@@ -409,7 +403,7 @@ function wppaGalleryEvaluate() {
409
  jQuery('#wppagallery-owner-tr').show();
410
  jQuery('#wppagallery-owner').css('color', '#700');
411
  needOwner = true;
412
- owner = jQuery('#wppagallery-owner').attr('value');
413
  if ( owner != '' ) {
414
  jQuery('#wppagallery-owner').css('color', '#070');
415
  jQuery('#wppagallery-owner-parent-tr').show();
@@ -463,18 +457,19 @@ function wppaGalleryEvaluate() {
463
 
464
  // Photo
465
  if ( needPhoto ) {
466
- photo = jQuery('#wppagallery-photo').attr('value');
467
- id = photo.split('.');
468
- id = id[0];
469
- if ( photo == '' ) {
470
- jQuery('#wppagallery-photo').css('color', '#700');
471
- }
472
- else {
473
  jQuery('#wppagallery-photo-preview-tr').show();
474
  wppaTinyMcePhotoPreview( photo )
475
  shortcode += ' photo="'+id+'"';
476
  jQuery('#wppagallery-photo').css('color', '#070');
477
  }
 
 
 
478
  }
479
 
480
  // Search options
2
  * Pachkage: wp-photo-album-plus
3
  *
4
  *
5
+ * Version 6.6.28
6
  *
7
  */
8
 
142
  var admins = '';
143
 
144
  // Type
145
+ topType = jQuery('#wppagallery-top-type').val();
146
  switch ( topType ) {
147
  case 'galerytype':
148
  jQuery('#wppagallery-galery-type-tr').show();
149
+ type = jQuery('#wppagallery-galery-type').val();
150
  needGalType = true;
151
  needAlbum = true;
152
  jQuery('#wppagallery-album-type-tr').show();
161
  break;
162
  case 'slidestype':
163
  jQuery('#wppagallery-slides-type-tr').show();
164
+ type = jQuery('#wppagallery-slides-type').val();
165
  needSlideType = true;
166
  needAlbum = true;
167
  jQuery('#wppagallery-album-type-tr').show();
176
  break;
177
  case 'singletype':
178
  jQuery('#wppagallery-single-type-tr').show();
179
+ type = jQuery('#wppagallery-single-type').val();
180
  needPhoto = true;
181
  jQuery('#wppagallery-photo-tr').show();
182
  jQuery('#wppagallery-top-type').css('color', '#070');
 
 
 
 
 
 
183
  break;
184
  case 'searchtype':
185
  jQuery('#wppagallery-search-type-tr').show();
186
+ type = jQuery('#wppagallery-search-type').val();
187
  needSearchType = true;
188
  searchType = type;
189
  switch ( type ) {
225
  break;
226
  case 'superview':
227
  jQuery('#wppagallery-album-super-tr').show();
228
+ album = jQuery('#wppagallery-album-super-parent').val();
229
  break;
230
  case 'calendar':
231
  jQuery('#wppagallery-calendar-tr').show();
232
  jQuery('#wppagallery-album-super-tr').show(); // Optional parent album
233
+ caltype = jQuery('#wppagallery-calendar-type').val();
234
  reverse = jQuery('#wppagallery-calendar-reverse').attr('checked');
235
  allopen = jQuery('#wppagallery-calendar-allopen').attr('checked');
236
+ parent = jQuery('#wppagallery-album-super-parent').val();
237
  break;
238
  default:
239
  }
247
  break;
248
  case 'misceltype':
249
  jQuery('#wppagallery-miscel-type-tr').show();
250
+ type = jQuery('#wppagallery-miscel-type').val();
251
  needMiscType = true;
252
  switch ( type ) {
253
  case 'generic':
282
 
283
  // Album
284
  if ( needAlbum ) {
285
+ albumType = jQuery('#wppagallery-album-type').val();
286
  switch ( albumType ) {
287
  case 'real':
288
  jQuery('#wppagallery-album-real-tr').show();
319
  // and get the album identifier
320
  if ( type == 'cover') {
321
  jQuery('#wppagallery-album-virt-cover-tr').show();
322
+ album = jQuery('#wppagallery-album-virt-cover').val();
323
  }
324
  else { // type != cover
325
  jQuery('#wppagallery-album-virt-tr').show();
326
+ album = jQuery('#wppagallery-album-virt').val();
327
  }
328
 
329
  // Now displatch on album identifier found
340
  parent = wppaGetSelectionEnumByClass('.wppagallery-album-ropt');
341
  if ( parent == '' ) parent = '0';
342
  jQuery('#wppagallery-photo-count-tr').show();
343
+ count = jQuery('#wppagallery-photo-count').val();
344
  break;
345
  case '#tags':
346
  jQuery('#wppagallery-phototags-tr').show();
369
  break;
370
  case '#last':
371
  jQuery('#wppagallery-album-parent-tr').show();
372
+ parent = jQuery('#wppagallery-album-parent-parent').val();
373
  jQuery('#wppagallery-album-count-tr').show();
374
+ count = jQuery('#wppagallery-album-count').val();
375
  break;
376
  case '#cat':
377
  jQuery('#wppagallery-albumcat-tr').show();
403
  jQuery('#wppagallery-owner-tr').show();
404
  jQuery('#wppagallery-owner').css('color', '#700');
405
  needOwner = true;
406
+ owner = jQuery('#wppagallery-owner').val();
407
  if ( owner != '' ) {
408
  jQuery('#wppagallery-owner').css('color', '#070');
409
  jQuery('#wppagallery-owner-parent-tr').show();
457
 
458
  // Photo
459
  if ( needPhoto ) {
460
+ photo = jQuery('#wppagallery-photo').val();
461
+ if ( photo ) {
462
+ id = photo.replace(/\//g,'');
463
+ id = id.split('.');
464
+ id = id[0];
 
 
465
  jQuery('#wppagallery-photo-preview-tr').show();
466
  wppaTinyMcePhotoPreview( photo )
467
  shortcode += ' photo="'+id+'"';
468
  jQuery('#wppagallery-photo').css('color', '#070');
469
  }
470
+ else {
471
+ jQuery('#wppagallery-photo').css('color', '#700');
472
+ }
473
  }
474
 
475
  // Search options
js/wppa-utils.js CHANGED
@@ -2,7 +2,7 @@
2
  //
3
  // conatins common vars and functions
4
  //
5
- var wppaJsUtilsVersion = '6.6.27';
6
  var wppaDebug;
7
 
8
  // Trim
@@ -315,69 +315,113 @@ function wppaSvgHtml( image, height, isLightbox, border, none, light, medium, he
315
  src = wppaImageDirectory + image + '.png';
316
  }
317
 
318
- // Make the HTML
319
- var result = '<img' +
320
- ' src="' + src + '"' +
321
- ( wppaUseSvg ? ' class="wppa-svg"' : '' ) +
322
- ' style="' +
323
- 'height:' + height + ';' +
324
- 'fill:' + fc + ';' +
325
- 'background-color:' + bc + ';' +
326
- ( radius ? 'border-radius:' + radius + '%;' : '' ) +
327
- ( border ? 'border:2px solid ' + bc + ';box-sizing:border-box;' : '' ) +
328
- ( wppaUseSvg ? 'display:none;' : '' ) +
329
- 'text-decoration:none !important;' +
330
- 'vertical-align:middle;' +
331
- '"' +
332
- ' onload="wppaReplaceSvg()"' +
333
- ' />';
334
-
335
- // For systems that do not execute onload:
336
- setTimeout( function() { wppaReplaceSvg(); }, 100 );
337
-
338
- return result;
339
- }
340
-
341
- // Replace all SVG images with inline SVG tag
342
- function wppaReplaceSvg() {
343
- wppaConsoleLog('Doing ReplaceSvg', 'force');
344
- jQuery('img.wppa-svg').each(function(){
345
- var $img = jQuery(this);
346
- var imgID = $img.attr('id');
347
- var imgClass = $img.attr('class');
348
- var imgURL = $img.attr('src');
349
- var imgStyle = $img.attr('style');
350
-
351
-
352
- jQuery.get(imgURL, function(data) {
353
- // Get the SVG tag, ignore the rest
354
- var $svg = jQuery(data).find('svg');
355
-
356
- // Add replaced image's ID to the new SVG
357
- if(typeof imgID !== 'undefined') {
358
- $svg = $svg.attr('id', imgID);
359
- }
360
- // Add replaced image's classes to the new SVG
361
- if(typeof imgClass !== 'undefined') {
362
- $svg = $svg.attr('class', imgClass+' replaced-svg');
363
- }
364
- // Add replaces image's style to the new SVG
365
- if ( typeof imgStyle !== 'undefined' ) {
366
- if ( typeof( imgID ) == 'undefined' || ( imgID.substr( 0, 15 ) != 'wppa-ajax-spin-' && imgID.substr( 0, 15 ) != 'wppa-ovl-spin' ) ) {
367
- imgStyle = imgStyle.replace( 'display:none', 'display:inline' );
368
- }
369
- $svg = $svg.attr('style', imgStyle);
370
- }
371
-
372
- // Remove any invalid XML tags as per http://validator.w3.org
373
- $svg = $svg.removeAttr('xmlns:a');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
374
 
375
- // Replace image with new SVG
376
- $img.replaceWith($svg);
377
 
378
- }, 'xml');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
379
 
380
- });
381
  }
382
 
383
  // Say we're in
2
  //
3
  // conatins common vars and functions
4
  //
5
+ var wppaJsUtilsVersion = '6.6.28';
6
  var wppaDebug;
7
 
8
  // Trim
315
  src = wppaImageDirectory + image + '.png';
316
  }
317
 
318
+ // Make the html. Native svg html
319
+ var wppaSvgArray = [ 'Next-Button',
320
+ 'Prev-Button',
321
+ 'Backward-Button',
322
+ 'Forward-Button',
323
+ 'Pause-Button',
324
+ 'Play-Button',
325
+ 'Stop-Button',
326
+ 'Eagle-1',
327
+ 'Snail',
328
+ 'Exit',
329
+ 'Full-Screen',
330
+ 'Exit-Full-Screen',
331
+ 'Content-View'
332
+ ];
333
+ if ( wppaUseSvg && jQuery.inArray( image, wppaSvgArray ) != '-1' ) {
334
+
335
+ var result = '<svg' +
336
+ ' version="1.1"' +
337
+ ' xmlns="http://www.w3.org/2000/svg"' +
338
+ ' xmlns:xlink="http://www.w3.org/1999/xlink"' +
339
+ ' x="0px"' +
340
+ ' y="0px"' +
341
+ ' viewBox="0 0 30 30"' +
342
+ ' style="' +
343
+ 'enable-background:new 0 0 30 30;' +
344
+ ( height ? 'height:' + height + ';' : '' ) +
345
+ 'fill:' + fc + ';' +
346
+ 'background-color:' + bc + ';' +
347
+ 'text-decoration:none !important;' +
348
+ 'vertical-align:middle;' +
349
+ ( radius ? 'border-radius:' + radius + '%;' : '' ) +
350
+ ( border ? 'border:2px solid ' + bc + ';box-sizing:border-box;' : '' ) +
351
+ '"' +
352
+ ' xml:space="preserve"' +
353
+ ' >' +
354
+ '<g>';
355
+ switch ( image ) {
356
+ case 'Next-Button':
357
+ result += '<path' +
358
+ ' d="M30,0H0V30H30V0z M20,20.5' +
359
+ 'c0,0.3-0.2,0.5-0.5,0.5S19,20.8,19,20.5v-4.2l-8.3,4.6c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1c-0.2-0.1-0.2-0.3-0.2-0.4v-11' +
360
+ 'c0-0.2,0.1-0.4,0.3-0.4c0.2-0.1,0.4-0.1,0.5,0l8.2,5.5V9.5C19,9.2,19.2,9,19.5,9S20,9.2,20,9.5V20.5z"' +
361
+ ' />';
362
+ break;
363
+ case 'Prev-Button':
364
+ result += '<path' +
365
+ ' d="M30,0H0V30H30V0z M20,20.5c0,0.2-0.1,0.4-0.3,0.4c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1L11,15.4v5.1c0,0.3-0.2,0.5-0.5,0.5S10,20.8,10,20.5v-11' +
366
+ 'C10,9.2,10.2,9,10.5,9S11,9.2,11,9.5v4.2l8.3-4.6c0.2-0.1,0.3-0.1,0.5,0S20,9.3,20,9.5V20.5z"' +
367
+ ' />';
368
+ break;
369
+ case 'Pause-Button':
370
+ result += '<path' +
371
+ ' d="M30,0H0V30H30V0z M14,20.5' +
372
+ 'c0,0.3-0.2,0.5-0.5,0.5h-4C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h4C13.8,9,14,9.2,14,9.5V20.5z M21,20.5' +
373
+ 'c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5v-11C16,9.2,16.2,9,16.5,9h4C20.8,9,21,9.2,21,9.5V20.5z"' +
374
+ ' />';
375
+ break;
376
+ case 'Play-Button':
377
+ result += '<path' +
378
+ ' d="M30,0H0V30H30V0z' +
379
+ 'M19.8,14.9l-8,5C11.7,20,11.6,20,11.5,20c-0.1,0-0.2,0-0.2-0.1c-0.2-0.1-0.3-0.3-0.3-0.4v-9c0-0.2,0.1-0.3,0.2-0.4' +
380
+ 'c0.1-0.1,0.3-0.1,0.5,0l8,4c0.2,0.1,0.3,0.2,0.3,0.4C20,14.7,19.9,14.8,19.8,14.9z"' +
381
+ ' />';
382
+ break;
383
+ case 'Stop-Button':
384
+ result += '<path' +
385
+ ' d="M30,0H0V30H30V0z M21,20.5' +
386
+ 'c0,0.3-0.2,0.5-0.5,0.5h-11C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h11C20.8,9,21,9.2,21,9.5V20.5z"' +
387
+ '/>';
388
+ break;
389
+ case 'Exit':
390
+ result += '<path d="M30 24.398l-8.406-8.398 8.406-8.398-5.602-5.602-8.398 8.402-8.402-8.402-5.598 5.602 8.398 8.398-8.398 8.398 5.598 5.602 8.402-8.402 8.398 8.402z"></path>';
391
+ break;
392
+ case 'Full-Screen':
393
+ result += '<path d="M27.414 24.586l-4.586-4.586-2.828 2.828 4.586 4.586-4.586 4.586h12v-12zM12 0h-12v12l4.586-4.586 4.543 4.539 2.828-2.828-4.543-4.539zM12 22.828l-2.828-2.828-4.586 4.586-4.586-4.586v12h12l-4.586-4.586zM32 0h-12l4.586 4.586-4.543 4.539 2.828 2.828 4.543-4.539 4.586 4.586z"></path>';
394
+ break;
395
+ case 'Exit-Full-Screen':
396
+ result += '<path d="M24.586 27.414l4.586 4.586 2.828-2.828-4.586-4.586 4.586-4.586h-12v12zM0 12h12v-12l-4.586 4.586-4.539-4.543-2.828 2.828 4.539 4.543zM0 29.172l2.828 2.828 4.586-4.586 4.586 4.586v-12h-12l4.586 4.586zM20 12h12l-4.586-4.586 4.547-4.543-2.828-2.828-4.547 4.543-4.586-4.586z"></path>';
397
+ break;
398
+ default:
399
+ alert( 'Native svg ' + image + ' not implemented' );
400
+ }
401
+ result += '</g>' +
402
+ '</svg>';
403
 
404
+ }
 
405
 
406
+ // Make the HTML
407
+ else {
408
+ var result = '<img' +
409
+ ' src="' + src + '"' +
410
+ ( wppaUseSvg ? ' class="wppa-svg"' : '' ) +
411
+ ' style="' +
412
+ 'height:' + height + ';' +
413
+ 'fill:' + fc + ';' +
414
+ 'background-color:' + bc + ';' +
415
+ ( radius ? 'border-radius:' + radius + '%;' : '' ) +
416
+ ( border ? 'border:2px solid ' + bc + ';box-sizing:border-box;' : '' ) +
417
+ ( wppaUseSvg ? 'display:none;' : '' ) +
418
+ 'text-decoration:none !important;' +
419
+ 'vertical-align:middle;' +
420
+ '"' +
421
+ ' />';
422
+ }
423
 
424
+ return result;
425
  }
426
 
427
  // Say we're in
js/wppa-utils.min.js CHANGED
@@ -3,7 +3,7 @@
3
  // conatins common vars and functions
4
  //
5
 
6
- var wppaJsUtilsVersion='6.6.27';var wppaDebug;function wppaTrim(str,arg){var result;result=wppaTrimLeft(str,arg);result=wppaTrimRight(result,arg);return result;}
7
  function wppaTrimLeft(str,arg){var result;var strlen;var arglen;var argcount;var i;var done;var oldStr,newStr;switch(typeof(arg)){case'string':result=str;strlen=str.length;arglen=arg.length;while(strlen>=arglen&&result.substr(0,arglen)==arg){result=result.substr(arglen);strlen=result.length;}
8
  break;case'object':done=false;newStr=str;while(!done){i=0;oldStr=newStr;while(i<arg.length){newStr=wppaTrimLeft(newStr,arg[i]);i++;}
9
  done=(oldStr==newStr);}
@@ -37,14 +37,15 @@ if(isLightbox){fc=wppaOvlSvgFillcolor;bc=wppaOvlSvgBgcolor;}
37
  else{fc=wppaSvgFillcolor;bc=wppaSvgBgcolor;}
38
  var src;if(wppaUseSvg){src=wppaImageDirectory+image+'.svg';}
39
  else{src=wppaImageDirectory+image+'.png';}
40
- var result='<img'+' src="'+src+'"'+
 
 
 
 
 
41
  (wppaUseSvg?' class="wppa-svg"':'')+' style="'+'height:'+height+';'+'fill:'+fc+';'+'background-color:'+bc+';'+
42
  (radius?'border-radius:'+radius+'%;':'')+
43
  (border?'border:2px solid '+bc+';box-sizing:border-box;':'')+
44
- (wppaUseSvg?'display:none;':'')+'text-decoration:none !important;'+'vertical-align:middle;'+'"'+' onload="wppaReplaceSvg()"'+' />';setTimeout(function(){wppaReplaceSvg();},100);return result;}
45
- function wppaReplaceSvg(){wppaConsoleLog('Doing ReplaceSvg','force');jQuery('img.wppa-svg').each(function(){var $img=jQuery(this);var imgID=$img.attr('id');var imgClass=$img.attr('class');var imgURL=$img.attr('src');var imgStyle=$img.attr('style');jQuery.get(imgURL,function(data){var $svg=jQuery(data).find('svg');if(typeof imgID!=='undefined'){$svg=$svg.attr('id',imgID);}
46
- if(typeof imgClass!=='undefined'){$svg=$svg.attr('class',imgClass+' replaced-svg');}
47
- if(typeof imgStyle!=='undefined'){if(typeof(imgID)=='undefined'||(imgID.substr(0,15)!='wppa-ajax-spin-'&&imgID.substr(0,15)!='wppa-ovl-spin')){imgStyle=imgStyle.replace('display:none','display:inline');}
48
- $svg=$svg.attr('style',imgStyle);}
49
- $svg=$svg.removeAttr('xmlns:a');$img.replaceWith($svg);},'xml');});}
50
  wppaConsoleLog('wppa-utils.js version '+wppaJsUtilsVersion+' loaded.','force');
3
  // conatins common vars and functions
4
  //
5
 
6
+ var wppaJsUtilsVersion='6.6.28';var wppaDebug;function wppaTrim(str,arg){var result;result=wppaTrimLeft(str,arg);result=wppaTrimRight(result,arg);return result;}
7
  function wppaTrimLeft(str,arg){var result;var strlen;var arglen;var argcount;var i;var done;var oldStr,newStr;switch(typeof(arg)){case'string':result=str;strlen=str.length;arglen=arg.length;while(strlen>=arglen&&result.substr(0,arglen)==arg){result=result.substr(arglen);strlen=result.length;}
8
  break;case'object':done=false;newStr=str;while(!done){i=0;oldStr=newStr;while(i<arg.length){newStr=wppaTrimLeft(newStr,arg[i]);i++;}
9
  done=(oldStr==newStr);}
37
  else{fc=wppaSvgFillcolor;bc=wppaSvgBgcolor;}
38
  var src;if(wppaUseSvg){src=wppaImageDirectory+image+'.svg';}
39
  else{src=wppaImageDirectory+image+'.png';}
40
+ var wppaSvgArray=['Next-Button','Prev-Button','Backward-Button','Forward-Button','Pause-Button','Play-Button','Stop-Button','Eagle-1','Snail','Exit','Full-Screen','Exit-Full-Screen','Content-View'];if(wppaUseSvg&&jQuery.inArray(image,wppaSvgArray)!='-1'){var result='<svg'+' version="1.1"'+' xmlns="http://www.w3.org/2000/svg"'+' xmlns:xlink="http://www.w3.org/1999/xlink"'+' x="0px"'+' y="0px"'+' viewBox="0 0 30 30"'+' style="'+'enable-background:new 0 0 30 30;'+
41
+ (height?'height:'+height+';':'')+'fill:'+fc+';'+'background-color:'+bc+';'+'text-decoration:none !important;'+'vertical-align:middle;'+
42
+ (radius?'border-radius:'+radius+'%;':'')+
43
+ (border?'border:2px solid '+bc+';box-sizing:border-box;':'')+'"'+' xml:space="preserve"'+' >'+'<g>';switch(image){case'Next-Button':result+='<path'+' d="M30,0H0V30H30V0z M20,20.5'+'c0,0.3-0.2,0.5-0.5,0.5S19,20.8,19,20.5v-4.2l-8.3,4.6c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1c-0.2-0.1-0.2-0.3-0.2-0.4v-11'+'c0-0.2,0.1-0.4,0.3-0.4c0.2-0.1,0.4-0.1,0.5,0l8.2,5.5V9.5C19,9.2,19.2,9,19.5,9S20,9.2,20,9.5V20.5z"'+' />';break;case'Prev-Button':result+='<path'+' d="M30,0H0V30H30V0z M20,20.5c0,0.2-0.1,0.4-0.3,0.4c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1L11,15.4v5.1c0,0.3-0.2,0.5-0.5,0.5S10,20.8,10,20.5v-11'+'C10,9.2,10.2,9,10.5,9S11,9.2,11,9.5v4.2l8.3-4.6c0.2-0.1,0.3-0.1,0.5,0S20,9.3,20,9.5V20.5z"'+' />';break;case'Pause-Button':result+='<path'+' d="M30,0H0V30H30V0z M14,20.5'+'c0,0.3-0.2,0.5-0.5,0.5h-4C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h4C13.8,9,14,9.2,14,9.5V20.5z M21,20.5'+'c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5v-11C16,9.2,16.2,9,16.5,9h4C20.8,9,21,9.2,21,9.5V20.5z"'+' />';break;case'Play-Button':result+='<path'+' d="M30,0H0V30H30V0z'+'M19.8,14.9l-8,5C11.7,20,11.6,20,11.5,20c-0.1,0-0.2,0-0.2-0.1c-0.2-0.1-0.3-0.3-0.3-0.4v-9c0-0.2,0.1-0.3,0.2-0.4'+'c0.1-0.1,0.3-0.1,0.5,0l8,4c0.2,0.1,0.3,0.2,0.3,0.4C20,14.7,19.9,14.8,19.8,14.9z"'+' />';break;case'Stop-Button':result+='<path'+' d="M30,0H0V30H30V0z M21,20.5'+'c0,0.3-0.2,0.5-0.5,0.5h-11C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h11C20.8,9,21,9.2,21,9.5V20.5z"'+'/>';break;case'Exit':result+='<path d="M30 24.398l-8.406-8.398 8.406-8.398-5.602-5.602-8.398 8.402-8.402-8.402-5.598 5.602 8.398 8.398-8.398 8.398 5.598 5.602 8.402-8.402 8.398 8.402z"></path>';break;case'Full-Screen':result+='<path d="M27.414 24.586l-4.586-4.586-2.828 2.828 4.586 4.586-4.586 4.586h12v-12zM12 0h-12v12l4.586-4.586 4.543 4.539 2.828-2.828-4.543-4.539zM12 22.828l-2.828-2.828-4.586 4.586-4.586-4.586v12h12l-4.586-4.586zM32 0h-12l4.586 4.586-4.543 4.539 2.828 2.828 4.543-4.539 4.586 4.586z"></path>';break;case'Exit-Full-Screen':result+='<path d="M24.586 27.414l4.586 4.586 2.828-2.828-4.586-4.586 4.586-4.586h-12v12zM0 12h12v-12l-4.586 4.586-4.539-4.543-2.828 2.828 4.539 4.543zM0 29.172l2.828 2.828 4.586-4.586 4.586 4.586v-12h-12l4.586 4.586zM20 12h12l-4.586-4.586 4.547-4.543-2.828-2.828-4.547 4.543-4.586-4.586z"></path>';break;default:alert('Native svg '+image+' not implemented');}
44
+ result+='</g>'+'</svg>';}
45
+ else{var result='<img'+' src="'+src+'"'+
46
  (wppaUseSvg?' class="wppa-svg"':'')+' style="'+'height:'+height+';'+'fill:'+fc+';'+'background-color:'+bc+';'+
47
  (radius?'border-radius:'+radius+'%;':'')+
48
  (border?'border:2px solid '+bc+';box-sizing:border-box;':'')+
49
+ (wppaUseSvg?'display:none;':'')+'text-decoration:none !important;'+'vertical-align:middle;'+'"'+' />';}
50
+ return result;}
 
 
 
 
51
  wppaConsoleLog('wppa-utils.js version '+wppaJsUtilsVersion+' loaded.','force');
js/wppa.js CHANGED
@@ -2,7 +2,7 @@
2
  //
3
  // conatins common vars and functions
4
  //
5
- var wppaJsVersion = '6.6.27';
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!!
@@ -288,11 +288,6 @@ function wppaDoInit( autoOnly ) {
288
  }
289
  }
290
 
291
- // Replave .svg images with svg html.
292
- // Looks redundant, but some installations do not execute
293
- // onload="wppaReplaceSvg()" for unknown reasons
294
- wppaReplaceSvg();
295
-
296
  // Make sure ajax spinners dies
297
  jQuery( '.wppa-ajax-spin' ).stop().fadeOut();
298
  setTimeout( function() {jQuery( '.wppa-ajax-spin' ).stop().fadeOut();}, 1000 );
@@ -458,16 +453,26 @@ function wppaGetContainerWidth( mocc ) {
458
  // Do the responsive size adjustment
459
  function _wppaDoAutocol( mocc ) {
460
 
461
- wppaConsoleLog( 'Doing autocol '+mocc );
462
-
463
- if ( ! wppaAutoColumnWidth[mocc] ) return; // Not auto
464
-
465
  var w;
466
  var h;
467
 
468
  // Container
469
- w = wppaGetContainerWidth( mocc );//document.getElementById( 'wppa-container-'+mocc ).parentNode.clientWidth;
 
 
 
 
 
 
 
 
 
 
470
  wppaColWidth[mocc] = w;
 
 
471
  jQuery( ".wppa-container-"+mocc ).css( 'width',w );
472
  if ( wppaRenderModal ) {
473
  jQuery( ".ui-dialog" ).css( 'width', w );
@@ -518,8 +523,6 @@ function _wppaDoAutocol( mocc ) {
518
  else {
519
  jQuery( ".wppa-asym-text-frame-mcr-"+mocc ).css( 'width',w - wppaTextFrameDelta );
520
  var myCss = {
521
- // 'width' : w,
522
- // 'maxWidth' : w,
523
  'marginLeft': '0px',
524
  'float' : 'left'
525
  }
@@ -1257,7 +1260,7 @@ function wppaUpdateSearchRoot( text, root ) {
1257
  items = jQuery( ".wppa-search-root-id" );
1258
  i = 0;
1259
  while ( i < items.length ) {
1260
- jQuery( items[i] ).attr( 'value', root );
1261
  i++;
1262
  }
1263
  }
2
  //
3
  // conatins common vars and functions
4
  //
5
+ var wppaJsVersion = '6.6.28';
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!!
288
  }
289
  }
290
 
 
 
 
 
 
291
  // Make sure ajax spinners dies
292
  jQuery( '.wppa-ajax-spin' ).stop().fadeOut();
293
  setTimeout( function() {jQuery( '.wppa-ajax-spin' ).stop().fadeOut();}, 1000 );
453
  // Do the responsive size adjustment
454
  function _wppaDoAutocol( mocc ) {
455
 
456
+ // Auto?
457
+ if ( ! wppaAutoColumnWidth[mocc] ) return;
 
 
458
  var w;
459
  var h;
460
 
461
  // Container
462
+ w = wppaGetContainerWidth( mocc );
463
+
464
+ // Anything changed?
465
+ if ( wppaColWidth[mocc] == w ) {
466
+ return;
467
+ }
468
+
469
+ // Log we are in
470
+ wppaConsoleLog( 'Doing autocol '+mocc );
471
+
472
+ // Update current width
473
  wppaColWidth[mocc] = w;
474
+
475
+ // Adjust container
476
  jQuery( ".wppa-container-"+mocc ).css( 'width',w );
477
  if ( wppaRenderModal ) {
478
  jQuery( ".ui-dialog" ).css( 'width', w );
523
  else {
524
  jQuery( ".wppa-asym-text-frame-mcr-"+mocc ).css( 'width',w - wppaTextFrameDelta );
525
  var myCss = {
 
 
526
  'marginLeft': '0px',
527
  'float' : 'left'
528
  }
1260
  items = jQuery( ".wppa-search-root-id" );
1261
  i = 0;
1262
  while ( i < items.length ) {
1263
+ jQuery( items[i] ).val( root );
1264
  i++;
1265
  }
1266
  }
js/wppa.min.js CHANGED
@@ -3,9 +3,9 @@
3
  // conatins common vars and functions
4
  //
5
 
6
- var wppaJsVersion='6.6.27';var wppaVersion='0';var wppaIsIe=false;var wppaUseSvg=true;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 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 wppaClickToView='';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 wppaBumpClickCount=false;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 wppaEditPhotoWidth='960';var wppaThemeStyles='';var wppaStickyHeaderHeight=0;var wppaRenderModal=false;var wppaModalBgColor='#ffffff';var wppaBoxRadius=0;var wppaModalQuitImg;var wppaUploadEdit='none';var wppaPageArg='';var wppaSlideshowNavigationType='icons';var wppaCoverImageResponsive=[];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 _wppaWaitTexts=[];var _wppaImageAlt=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlAlts;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 wppaOvlOpen=false;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='';var wppaIsMobile=false;var wppaSvgFillcolor='gray';var wppaSvgBgcolor='transparent';var wppaSvgCornerStyle='light';jQuery(document).ready(function(){wppaDoInit(false);setTimeout(function(){wppaDoInit(true);},1000);});function wppaDoInit(autoOnly){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7
  if(!autoOnly){_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);}}});}}
8
- wppaReplaceSvg();jQuery('.wppa-ajax-spin').stop().fadeOut();setTimeout(function(){jQuery('.wppa-ajax-spin').stop().fadeOut();},1000);jQuery('.wppa-ovl-spin').stop().fadeOut();setTimeout(function(){jQuery('.wppa-ovl-spin').stop().fadeOut();},1000);setTimeout(function(){var i=1;while(i<wppaTopMoc){if(jQuery('ubb-'+i+'-l')){wppaUbb(i,'l','hide');wppaUbb(i,'r','hide');}
9
  i++;}},3000);}
10
  jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax){wppaCanAjaxRender=true;}
11
  if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
@@ -23,7 +23,8 @@ j++;}
23
  return url;}
24
  function wppaGetContainerWidth(mocc){var elm=document.getElementById('wppa-container-'+mocc);var w=0;if(!wppaAutoColumnWidth[mocc])return elm.clientWidth;while(w==0){elm=elm.parentNode;w=jQuery(elm).width();}
25
  return w*wppaAutoColumnFrac[mocc];}
26
- function _wppaDoAutocol(mocc){wppaConsoleLog('Doing autocol '+mocc);if(!wppaAutoColumnWidth[mocc])return;var w;var h;w=wppaGetContainerWidth(mocc);wppaColWidth[mocc]=w;jQuery(".wppa-container-"+mocc).css('width',w);if(wppaRenderModal){jQuery(".ui-dialog").css('width',w);jQuery(".ui-dialog").attr('height','auto');}
 
27
  if(wppaCoverImageResponsive[mocc]){}
28
  else{jQuery(".wppa-asym-text-frame-"+mocc).css('width',w-wppaTextFrameDelta);jQuery(".wppa-cover-box-"+mocc).css('width',w);}
29
  var exists=jQuery(".wppa-cover-box-mcr-"+mocc);var MCRWidth;if(exists.length>1){var nCovers=parseInt((w+8)/(wppaMaxCoverWidth+8))+1;var coverMax1=nCovers-1;MCRWidth=parseInt(((w+8)/nCovers)-8);var idx=0;while(idx<exists.length){var col=idx%nCovers;switch(col){case 0:jQuery(exists[idx]).css({'marginLeft':'0px','clear':'both','float':'left'});break;case coverMax1:jQuery(exists[idx]).css({'marginLeft':'8px','clear':'none','float':'right'});break;default:jQuery(exists[idx]).css({'marginLeft':'8px','clear':'none','float':'left'});}
3
  // conatins common vars and functions
4
  //
5
 
6
+ var wppaJsVersion='6.6.28';var wppaVersion='0';var wppaIsIe=false;var wppaUseSvg=true;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 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 wppaClickToView='';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 wppaBumpClickCount=false;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 wppaEditPhotoWidth='960';var wppaThemeStyles='';var wppaStickyHeaderHeight=0;var wppaRenderModal=false;var wppaModalBgColor='#ffffff';var wppaBoxRadius=0;var wppaModalQuitImg;var wppaUploadEdit='none';var wppaPageArg='';var wppaSlideshowNavigationType='icons';var wppaCoverImageResponsive=[];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 _wppaWaitTexts=[];var _wppaImageAlt=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlAlts;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 wppaOvlOpen=false;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='';var wppaIsMobile=false;var wppaSvgFillcolor='gray';var wppaSvgBgcolor='transparent';var wppaSvgCornerStyle='light';jQuery(document).ready(function(){wppaDoInit(false);setTimeout(function(){wppaDoInit(true);},1000);});function wppaDoInit(autoOnly){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7
  if(!autoOnly){_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);}}});}}
8
+ jQuery('.wppa-ajax-spin').stop().fadeOut();setTimeout(function(){jQuery('.wppa-ajax-spin').stop().fadeOut();},1000);jQuery('.wppa-ovl-spin').stop().fadeOut();setTimeout(function(){jQuery('.wppa-ovl-spin').stop().fadeOut();},1000);setTimeout(function(){var i=1;while(i<wppaTopMoc){if(jQuery('ubb-'+i+'-l')){wppaUbb(i,'l','hide');wppaUbb(i,'r','hide');}
9
  i++;}},3000);}
10
  jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax){wppaCanAjaxRender=true;}
11
  if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
23
  return url;}
24
  function wppaGetContainerWidth(mocc){var elm=document.getElementById('wppa-container-'+mocc);var w=0;if(!wppaAutoColumnWidth[mocc])return elm.clientWidth;while(w==0){elm=elm.parentNode;w=jQuery(elm).width();}
25
  return w*wppaAutoColumnFrac[mocc];}
26
+ function _wppaDoAutocol(mocc){if(!wppaAutoColumnWidth[mocc])return;var w;var h;w=wppaGetContainerWidth(mocc);if(wppaColWidth[mocc]==w){return;}
27
+ wppaConsoleLog('Doing autocol '+mocc);wppaColWidth[mocc]=w;jQuery(".wppa-container-"+mocc).css('width',w);if(wppaRenderModal){jQuery(".ui-dialog").css('width',w);jQuery(".ui-dialog").attr('height','auto');}
28
  if(wppaCoverImageResponsive[mocc]){}
29
  else{jQuery(".wppa-asym-text-frame-"+mocc).css('width',w-wppaTextFrameDelta);jQuery(".wppa-cover-box-"+mocc).css('width',w);}
30
  var exists=jQuery(".wppa-cover-box-mcr-"+mocc);var MCRWidth;if(exists.length>1){var nCovers=parseInt((w+8)/(wppaMaxCoverWidth+8))+1;var coverMax1=nCovers-1;MCRWidth=parseInt(((w+8)/nCovers)-8);var idx=0;while(idx<exists.length){var col=idx%nCovers;switch(col){case 0:jQuery(exists[idx]).css({'marginLeft':'0px','clear':'both','float':'left'});break;case coverMax1:jQuery(exists[idx]).css({'marginLeft':'8px','clear':'none','float':'right'});break;default:jQuery(exists[idx]).css({'marginLeft':'8px','clear':'none','float':'left'});}
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, imagemagick
5
- Version: 6.6.27
6
- Stable tag: 6.6.26
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
9
  Requires at least: 3.9
@@ -118,7 +118,7 @@ to the new multisite standards, do the following:
118
 
119
  = Which other plugins do you recommand to use with WPPA+, and which not? =
120
 
121
- * Recommanded plugins: qTranslate, WP Super Cache, Cube Points, Simple Cart & Buy Now, Google-Maps-GPX-Viewer.
122
  * Plugins that break up WPPA+: My Live Signature.
123
  * Google Analytics for WordPress will break the slideshow in most cases when *Track outbound clicks & downloads:* has been checked in its configuration.
124
 
@@ -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: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
182
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
183
  = 6.6.27 =
184
 
185
  = Bug Fixes =
@@ -195,7 +215,7 @@ See for additional information: <a href="http://www.wppa.nl/changelog/" >The doc
195
  = Other Changes =
196
 
197
  * Table II-J11: Navigation symbol style has now an option to revert to non-svg icons. Usefull in case of pageload problems due to many slideshows on a page.
198
- * The minimum and maximum allowed fe upload image size works now as follows: an image is too small if both width and height are less than the given limit,
199
  the image is too large if either width or height (or both) is larger than the given limit.
200
 
201
  = 6.6.26 =
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, imagemagick
5
+ Version: 6.6.28
6
+ Stable tag: 6.6.27
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
9
  Requires at least: 3.9
118
 
119
  = Which other plugins do you recommand to use with WPPA+, and which not? =
120
 
121
+ * Recommanded plugins: qTranslate, WP Super Cache, Cube Points, Simple Cart & Buy Now.
122
  * Plugins that break up WPPA+: My Live Signature.
123
  * Google Analytics for WordPress will break the slideshow in most cases when *Track outbound clicks & downloads:* has been checked in its configuration.
124
 
180
 
181
  See for additional information: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
182
 
183
+ = 6.6.28 =
184
+
185
+ = Bug Fixes =
186
+
187
+ * Fixed a typo in album admin.
188
+ * Fixed photo id in shortcode generator when filesystem is tree structure.
189
+ * Unapproved comments showed up in the comment widget. Fixed.
190
+ * Fixed a layout issue in the Album navigator widget.
191
+ * Fixed a layout issue in Table VIII-B.
192
+
193
+ = New Features =
194
+
195
+ = Other Changes =
196
+
197
+ * Svg icons are now directly coded in html, causing a dramatic performance improvement.
198
+ * The plugin **Google maps GPX viewer** stopped working due to lack of maintenance. If you want to use any external plugin, set Table IX-K5 to **External plugin** and read the help of IX-K5.
199
+ A suitable external plugin should have the possibility to use a shortcode with the **latitude** and **longitude** as arguments; and the google maps api js must be loaded once on all pages.
200
+ The shortcode for the external plugin can be entered in Table IX-K5.3.
201
+ The following keywords can be used in the shortcode: 'w#lon', 'w#lat', 'w#ip', 'w#gmapikey', for longitude, lattitude, the visitors ipaddress and google maps api key.
202
+
203
  = 6.6.27 =
204
 
205
  = Bug Fixes =
215
  = Other Changes =
216
 
217
  * Table II-J11: Navigation symbol style has now an option to revert to non-svg icons. Usefull in case of pageload problems due to many slideshows on a page.
218
+ * The minimum and maximum allowed fe upload image size works now as follows: an image is too small if both width and height are less than the given limit,
219
  the image is too large if either width or height (or both) is larger than the given limit.
220
 
221
  = 6.6.26 =
wppa-admin-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * gp admin functions
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -191,29 +191,26 @@ global $wpdb;
191
 
192
  // display usefull message
193
  function wppa_update_message( $msg, $fixed = false, $id = '' ) {
194
- ?>
195
- <div id="wppa-ms-<?php echo $id ?>" class="updated fade" <?php if ( $fixed ) echo 'style="position: fixed; width: 80%; text-align: center; text-weight:bold;"' ?>><p><strong><?php echo( $msg ); ?></strong></p></div>
196
- <?php
197
  }
198
 
199
  // display error message
200
- function wppa_error_message( $msg, $fixed = false, $id = '' ) {
201
- ?>
202
- <div id="wppa-er-<?php echo $id ?>" class="error <?php if ( $fixed == 'fixed' ) echo fade ?>" <?php if ( $fixed == 'hidden' ) echo 'style="display:none;"'; if ( $fixed == 'fixed' ) echo 'style="position: fixed;"' ?>><p><strong><?php echo( $msg ); ?></strong></p></div>
203
- <?php
204
- wppa_log( 'Error', $msg );
205
  }
 
206
  // display warning message
207
  function wppa_warning_message( $msg, $fixed = false, $id = '' ) {
208
- ?>
209
- <div id="wppa-wr-<?php echo $id ?>" class="updated <?php if ( $fixed == 'fixed' ) echo fade ?>" <?php if ( $fixed == 'hidden' ) echo 'style="display:none;"'; if ( $fixed == 'fixed' ) echo 'style="position: fixed;"' ?>><p><strong><?php echo( $msg ); ?></strong></p></div>
210
- <?php
211
  }
 
212
  // display ok message
213
- function wppa_ok_message( $msg, $fixed = false, $id = '' ) {
214
- ?>
215
- <div id="wppa-ok-<?php echo $id ?>" class="updated <?php if ( $fixed == 'fixed' ) echo fade ?>" style="background-color: #e0ffe0; border-color: #55ee55;" ><p id="wppa-ok-p" ><strong><?php echo( $msg ); ?></strong></p></div>
216
- <?php
217
  }
218
 
219
  function wppa_check_numeric( $value, $minval, $target, $maxval = '' ) {
@@ -1057,7 +1054,7 @@ function wppa_admin_spinner() {
1057
 
1058
  $result = '<img' .
1059
  ' id="wppa-admin-spinner"' .
1060
- ' src="' . wppa_get_imgdir( wppa_use_svg() ? 'loader.svg' : 'loader.gif' ) . '"' .
1061
  ' alt="Spinner"' .
1062
  ' style="' .
1063
  'position:fixed;' .
3
  * Package: wp-photo-album-plus
4
  *
5
  * gp admin functions
6
+ * Version 6.6.28
7
  *
8
  */
9
 
191
 
192
  // display usefull message
193
  function wppa_update_message( $msg, $fixed = false, $id = '' ) {
194
+
195
+ echo '<div class="notice notice-info is-dismissible"><p>' . $msg . '</p></div>';
 
196
  }
197
 
198
  // display error message
199
+ function wppa_error_message( $msg ) {
200
+
201
+ echo '<div class="notice notice-error is-dismissible"><p>' . $msg . '</p></div>';
 
 
202
  }
203
+
204
  // display warning message
205
  function wppa_warning_message( $msg, $fixed = false, $id = '' ) {
206
+
207
+ echo '<div class="notice notice-warning is-dismissible"><p>' . $msg . '</p></div>';
 
208
  }
209
+
210
  // display ok message
211
+ function wppa_ok_message( $msg ) {
212
+
213
+ echo '<div class="notice notice-success is-dismissible"><p>' . $msg . '</p></div>';
 
214
  }
215
 
216
  function wppa_check_numeric( $value, $minval, $target, $maxval = '' ) {
1054
 
1055
  $result = '<img' .
1056
  ' id="wppa-admin-spinner"' .
1057
+ ' src="' . wppa_get_imgdir( wppa_use_svg( 'admin' ) ? 'loader.svg' : 'loader.gif' ) . '"' .
1058
  ' alt="Spinner"' .
1059
  ' style="' .
1060
  'position:fixed;' .
wppa-ajax.php CHANGED
@@ -2,7 +2,7 @@
2
  /* wppa-ajax.php
3
  *
4
  * Functions used in ajax requests
5
- * Version 6.6.27
6
  *
7
  */
8
 
@@ -48,6 +48,10 @@ global $wppa_log_file;
48
 
49
  $wppa_action = $_REQUEST['wppa-action'];
50
 
 
 
 
 
51
  switch ( $wppa_action ) {
52
  case 'getqrcode':
53
  //wppa_log( 'obs', 'Ajax getqrcode for '.$_REQUEST['url'] );
@@ -2720,8 +2724,13 @@ global $wppa_log_file;
2720
  }
2721
  if ( wppa_opt( 'gpx_implementation' ) == 'none' ) {
2722
  wppa_update_option( 'wppa_gpx_implementation', 'wppa-plus-embedded' );
 
2723
  }
2724
  }
 
 
 
 
2725
  break;
2726
 
2727
  case 'wppa_i_fotomoto':
@@ -2856,9 +2865,13 @@ global $wppa_log_file;
2856
  }
2857
  if ( ! wppa_switch( 'custom_on' ) ) {
2858
  wppa_update_option( 'wppa_custom_on', 'yes' );
2859
- $alert .= __( 'The display of the custom box has been enabled' , 'wp-photo-album-plus');
2860
  }
2861
  }
 
 
 
 
2862
  break;
2863
 
2864
  case 'wppa_regen_thumbs_skip_one':
2
  /* wppa-ajax.php
3
  *
4
  * Functions used in ajax requests
5
+ * Version 6.6.28
6
  *
7
  */
8
 
48
 
49
  $wppa_action = $_REQUEST['wppa-action'];
50
 
51
+ if ( wppa_switch( 'log_ajax' ) ) {
52
+ wppa_log( 'Obs', 'Ajax action = '.$wppa_action.', querystring = '.$_SERVER['REQUEST_URI'] );
53
+ }
54
+
55
  switch ( $wppa_action ) {
56
  case 'getqrcode':
57
  //wppa_log( 'obs', 'Ajax getqrcode for '.$_REQUEST['url'] );
2724
  }
2725
  if ( wppa_opt( 'gpx_implementation' ) == 'none' ) {
2726
  wppa_update_option( 'wppa_gpx_implementation', 'wppa-plus-embedded' );
2727
+ wppa_update_option( 'wppa_load_map_api', 'yes' );
2728
  }
2729
  }
2730
+ if ( $value == 'no' ) {
2731
+ wppa_update_option( 'gpx_implementation', 'none' );
2732
+ wppa_update_option( 'wppa_load_map_api', 'no' );
2733
+ }
2734
  break;
2735
 
2736
  case 'wppa_i_fotomoto':
2865
  }
2866
  if ( ! wppa_switch( 'custom_on' ) ) {
2867
  wppa_update_option( 'wppa_custom_on', 'yes' );
2868
+ $alert .= __( 'The display of the custom box has been enabled.' , 'wp-photo-album-plus');
2869
  }
2870
  }
2871
+ if ( $value == 'wppa-plus-embedded' ) {
2872
+ wppa_update_option( 'wppa_load_map_api', 'yes' );
2873
+ $alert .= __( 'The Google maps API will be loaded on all pages to enable the use of Ajax page content changes that use maps.', 'wp-photo-album-plus');
2874
+ }
2875
  break;
2876
 
2877
  case 'wppa_regen_thumbs_skip_one':
wppa-album-admin-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -759,7 +759,7 @@ function wppaTryScheduleAll( id ) {
759
  echo
760
  '<tr>' .
761
  '<td>' .
762
- __( 'Catogories:', 'wp-photo-album-plus' ) .
763
  '</td>' .
764
  '<td>' .
765
  '<input' .
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
+ * Version 6.6.28
7
  *
8
  */
9
 
759
  echo
760
  '<tr>' .
761
  '<td>' .
762
+ __( 'Categories:', 'wp-photo-album-plus' ) .
763
  '</td>' .
764
  '<td>' .
765
  '<input' .
wppa-album-navigator-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display album names linking to content
6
- * Version 6.6.09
7
  */
8
 
9
  class AlbumNavigatorWidget extends WP_Widget {
@@ -139,7 +139,6 @@ class AlbumNavigatorWidget extends WP_Widget {
139
  else $ca = '0';
140
  $ca = wppa_force_numeric_else( $ca, '0' );
141
  if ( $ca && ! wppa_album_exists( $ca ) ) {
142
- // wppa_log('dbg', 'Non-existent album '.$ca.' in url. Referrer= '.$_ENV["HTTP_REFERER"].', Request uri= '.$_ENV["REQUEST_URI"]);
143
  $ca = '0';
144
  }
145
  }
@@ -168,7 +167,7 @@ class AlbumNavigatorWidget extends WP_Widget {
168
  <div style="cursor:default;width:12px;float:left;text-align:center;font-weight:bold;" class="anw-'.$w.'-'.$a.'-" onclick="jQuery(\'.anw-'.$w.'-'.$a.'\').css(\'display\',\'\'); jQuery(\'.anw-'.$w.'-'.$a.'-\').css(\'display\',\'none\');" >'.( $a == $ca ? '&raquo;' : '+').'</div>
169
  <div style="cursor:default;width:12px;float:left;text-align:center;font-weight:bold;display:none;" class="anw-'.$w.'-'.$a.'" onclick="jQuery(\'.anw-'.$w.'-'.$a.'-\').css(\'display\',\'\'); jQuery(\'.anw-'.$w.'-'.$a.'\').css(\'display\',\'none\'); jQuery(\'.p-'.$w.'-'.$a.'\').css(\'display\',\'none\');" >'.( $a == $ca ? '&raquo;' : '-').'</div>';
170
  else $result .= '
171
- <div style="width:12px;float:left;" >&nbsp;'.( $a == $ca ? '&raquo;' : '').'</div>';
172
  $result .= '
173
  <a href="'.wppa_encrypt_url(wppa_get_permalink( $page ).'&amp;wppa-album='.$a.'&amp;wppa-cover=0&amp;wppa-occur=1'.$slide).'">'.wppa_get_album_name( $a ).'</a>
174
  </li>';
3
  * Package: wp-photo-album-plus
4
  *
5
  * display album names linking to content
6
+ * Version 6.6.28
7
  */
8
 
9
  class AlbumNavigatorWidget extends WP_Widget {
139
  else $ca = '0';
140
  $ca = wppa_force_numeric_else( $ca, '0' );
141
  if ( $ca && ! wppa_album_exists( $ca ) ) {
 
142
  $ca = '0';
143
  }
144
  }
167
  <div style="cursor:default;width:12px;float:left;text-align:center;font-weight:bold;" class="anw-'.$w.'-'.$a.'-" onclick="jQuery(\'.anw-'.$w.'-'.$a.'\').css(\'display\',\'\'); jQuery(\'.anw-'.$w.'-'.$a.'-\').css(\'display\',\'none\');" >'.( $a == $ca ? '&raquo;' : '+').'</div>
168
  <div style="cursor:default;width:12px;float:left;text-align:center;font-weight:bold;display:none;" class="anw-'.$w.'-'.$a.'" onclick="jQuery(\'.anw-'.$w.'-'.$a.'-\').css(\'display\',\'\'); jQuery(\'.anw-'.$w.'-'.$a.'\').css(\'display\',\'none\'); jQuery(\'.p-'.$w.'-'.$a.'\').css(\'display\',\'none\');" >'.( $a == $ca ? '&raquo;' : '-').'</div>';
169
  else $result .= '
170
+ <span style="width:12px;" >&nbsp;' . ( $a == $ca ? '&raquo;' : '&nbsp;' ) . '</span>';
171
  $result .= '
172
  <a href="'.wppa_encrypt_url(wppa_get_permalink( $page ).'&amp;wppa-album='.$a.'&amp;wppa-cover=0&amp;wppa-occur=1'.$slide).'">'.wppa_get_album_name( $a ).'</a>
173
  </li>';
wppa-comment-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the recent commets on photos
6
- * Version 6.4.18
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -66,7 +66,7 @@ class wppaCommentWidget extends WP_Widget {
66
  $imgevents = wppa_get_imgevents('thumb', $id, true);
67
 
68
  $title = '';
69
- $comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_COMMENTS."` WHERE `photo` = %s ORDER BY `timestamp` DESC", $id ), ARRAY_A );
70
  if ( $comments ) {
71
  $first_comment = $comments['0'];
72
  foreach ( $comments as $comment ) {
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the recent commets on photos
6
+ * Version 6.6.28
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
66
  $imgevents = wppa_get_imgevents('thumb', $id, true);
67
 
68
  $title = '';
69
+ $comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_COMMENTS."` WHERE `photo` = %s AND `status` = 'approved' ORDER BY `timestamp` DESC", $id ), ARRAY_A );
70
  if ( $comments ) {
71
  $first_comment = $comments['0'];
72
  foreach ( $comments as $comment ) {
wppa-filter.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via shortcode handler
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -499,7 +499,7 @@ global $wppa_postid;
499
  wppa_reset_occurrance();
500
 
501
  // Get and validate photo id
502
- if ( is_numeric( $xatts[0] ) ) {
503
  $photo = $xatts[0];
504
  if ( ! wppa_photo_exists( $photo ) ) {
505
  return sprintf( __( 'Photo %d does not exist', 'wp-photo-album-plus' ), $photo );
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via shortcode handler
6
+ * Version 6.6.28
7
  *
8
  */
9
 
499
  wppa_reset_occurrance();
500
 
501
  // Get and validate photo id
502
+ if ( isset( $xatts[0] ) && is_numeric( $xatts[0] ) ) {
503
  $photo = $xatts[0];
504
  if ( ! wppa_photo_exists( $photo ) ) {
505
  return sprintf( __( 'Photo %d does not exist', 'wp-photo-album-plus' ), $photo );
wppa-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -109,6 +109,10 @@ global $wppa_session;
109
 
110
  wppa( 'is_cover', wppa_get_get( 'cover' ) );
111
  wppa( 'is_slide', wppa_get_get( 'slide' ) || ( wppa_get_get( 'album' ) !== false && wppa_get_get( 'photo' ) ) );
 
 
 
 
112
  if ( wppa( 'is_slide' ) ) {
113
  wppa( 'start_photo', wppa_get_get( 'photo' ) ); // Start a slideshow here
114
  }
@@ -3090,27 +3094,57 @@ global $blog_id;
3090
  break;
3091
  }
3092
 
3093
- wppa_out( '<img' .
3094
- ' id="wppa-ajax-spin-' . wppa( 'mocc' ) . '"' .
3095
- ' src="'.wppa_get_imgdir().'loader.' . ( wppa_use_svg() ? 'svg' : 'gif' ) . '"' .
3096
- ( wppa_use_svg() ? ' class="wppa-svg wppa-ajax-spin"' : ' class="wppa-ajax-spin"' ) .
3097
- ' alt="spinner"' .
3098
- ' style="' .
3099
- 'box-shadow:none;' .
3100
- 'z-index:1010;' .
3101
- 'position:fixed;' .
3102
- 'top:50%;' .
3103
- 'margin-top:-60px;' .
3104
- 'left:50%;' .
3105
- 'margin-left:-60px;' .
3106
- 'display:none;' .
3107
- 'fill:' . wppa_opt( 'svg_color' ) . ';' .
3108
- 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
3109
- 'border-radius:' . $bradius . 'px;' .
3110
- 'box-shadow:none;' .
3111
- '"' .
3112
- ' />'
3113
- );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3114
  }
3115
  }
3116
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
+ * Version 6.6.28
7
  *
8
  */
9
 
109
 
110
  wppa( 'is_cover', wppa_get_get( 'cover' ) );
111
  wppa( 'is_slide', wppa_get_get( 'slide' ) || ( wppa_get_get( 'album' ) !== false && wppa_get_get( 'photo' ) ) );
112
+ if ( wppa_get_get( 'slideonly' ) ) {
113
+ wppa( 'is_slide', true );
114
+ wppa( 'is_slideonly', true );
115
+ }
116
  if ( wppa( 'is_slide' ) ) {
117
  wppa( 'start_photo', wppa_get_get( 'photo' ) ); // Start a slideshow here
118
  }
3094
  break;
3095
  }
3096
 
3097
+ if ( wppa_use_svg() ) {
3098
+ wppa_out( '<svg' .
3099
+ ' id="wppa-ajax-spin-' . wppa( 'mocc' ) . '"' .
3100
+ ' class="wppa-ajax-spin uil-default"' .
3101
+ ' width="120px"' .
3102
+ ' height="120px"' .
3103
+ ' xmlns="http://www.w3.org/2000/svg"' .
3104
+ ' viewBox="0 0 100 100"' .
3105
+ ' preserveAspectRatio="xMidYMid"' .
3106
+ ' style="' .
3107
+ 'box-shadow:none;' .
3108
+ 'z-index:1010;' .
3109
+ 'position:fixed;' .
3110
+ 'top:50%;' .
3111
+ 'margin-top:-60px;' .
3112
+ 'left:50%;' .
3113
+ 'margin-left:-60px;' .
3114
+ 'display:none;' .
3115
+ 'fill:' . wppa_opt( 'svg_color' ) . ';' .
3116
+ 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
3117
+ 'border-radius:' . $bradius . 'px;' .
3118
+ 'box-shadow:none;' .
3119
+ '"' .
3120
+ ' >' .
3121
+ wppa_get_spinner_svg_body_html() .
3122
+ '</svg>'
3123
+ );
3124
+ }
3125
+ else {
3126
+ wppa_out( '<img' .
3127
+ ' id="wppa-ajax-spin-' . wppa( 'mocc' ) . '"' .
3128
+ ' src="'.wppa_get_imgdir().'loader.' . ( wppa_use_svg() ? 'svg' : 'gif' ) . '"' .
3129
+ ( wppa_use_svg() ? ' class="wppa-svg wppa-ajax-spin"' : ' class="wppa-ajax-spin"' ) .
3130
+ ' alt="spinner"' .
3131
+ ' style="' .
3132
+ 'box-shadow:none;' .
3133
+ 'z-index:1010;' .
3134
+ 'position:fixed;' .
3135
+ 'top:50%;' .
3136
+ 'margin-top:-60px;' .
3137
+ 'left:50%;' .
3138
+ 'margin-left:-60px;' .
3139
+ 'display:none;' .
3140
+ 'fill:' . wppa_opt( 'svg_color' ) . ';' .
3141
+ 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
3142
+ 'border-radius:' . $bradius . 'px;' .
3143
+ 'box-shadow:none;' .
3144
+ '"' .
3145
+ ' />'
3146
+ );
3147
+ }
3148
  }
3149
  }
3150
 
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.6.27
7
  *
8
  */
9
 
@@ -335,7 +335,7 @@ global $wppa_opt;
335
  }
336
 
337
  // google maps
338
- if ( wppa_opt( 'gpx_implementation' ) == 'wppa-plus-embedded' && strpos( wppa_opt( 'custom_content' ), 'w#location' ) !== false ) {
339
  if ( wppa_opt( 'map_apikey' ) ) {
340
  wp_enqueue_script( 'wppa-geo', 'https://maps.googleapis.com/maps/api/js?key='.wppa_opt( 'map_apikey' ).'&sensor=false', '', $wppa_api_version, $footer );
341
  }
@@ -500,29 +500,59 @@ global $wppa_session;
500
  break;
501
  }
502
 
503
- echo
504
- '<img' .
505
- ' id="wppa-ovl-spin"' .
506
- ' alt="spinner"' .
507
- ( wppa_use_svg() ? ' class="wppa-svg"' : '' ) .
508
- ' style="' .
509
- 'width:120px;' .
510
- 'height:120px;' .
511
- 'position:fixed;' .
512
- 'top:50%;' .
513
- 'margin-top:-60px;' .
514
- 'left:50%;' .
515
- 'margin-left:-60px;' .
516
- 'z-index:100100;' .
517
- 'opacity:1;' .
518
- 'display:none;' .
519
- 'fill:' . wppa_opt( 'ovl_svg_color' ) . ';' .
520
- 'background-color:' . wppa_opt( 'ovl_svg_bg_color' ) . ';' .
521
- 'box-shadow:none;' .
522
- 'border-radius:' . $bradius . 'px;' .
523
- '"' .
524
- ' src="' . wppa_get_imgdir() . ( wppa_use_svg() ? 'loader.svg' : 'loader.gif' ) . '"' .
525
- ' />';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
526
 
527
  // The init vars
528
  echo '
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
+ * Version 6.6.28
7
  *
8
  */
9
 
335
  }
336
 
337
  // google maps
338
+ if ( ( wppa_switch( 'load_map_api' ) || wppa_opt( 'gpx_implementation' ) == 'wppa-plus-embedded' ) && strpos( wppa_opt( 'custom_content' ), 'w#location' ) !== false ) {
339
  if ( wppa_opt( 'map_apikey' ) ) {
340
  wp_enqueue_script( 'wppa-geo', 'https://maps.googleapis.com/maps/api/js?key='.wppa_opt( 'map_apikey' ).'&sensor=false', '', $wppa_api_version, $footer );
341
  }
500
  break;
501
  }
502
 
503
+ if ( wppa_use_svg() ) {
504
+ echo
505
+ '<svg' .
506
+ ' id="wppa-ovl-spin"' .
507
+ ' width="120px"' .
508
+ ' height="120px"' .
509
+ ' xmlns="http://www.w3.org/2000/svg"' .
510
+ ' viewBox="0 0 100 100"' .
511
+ ' preserveAspectRatio="xMidYMid"' .
512
+ ' style="' .
513
+ 'width:120px;' .
514
+ 'height:120px;' .
515
+ 'position:fixed;' .
516
+ 'top:50%;' .
517
+ 'margin-top:-60px;' .
518
+ 'left:50%;' .
519
+ 'margin-left:-60px;' .
520
+ 'z-index:100100;' .
521
+ 'opacity:1;' .
522
+ 'display:none;' .
523
+ 'fill:' . wppa_opt( 'ovl_svg_color' ) . ';' .
524
+ 'background-color:' . wppa_opt( 'ovl_svg_bg_color' ) . ';' .
525
+ 'box-shadow:none;' .
526
+ 'border-radius:' . $bradius . 'px;' .
527
+ '"' . ' >' .
528
+ wppa_get_spinner_svg_body_html() .
529
+ '</svg>';
530
+ }
531
+ else {
532
+ echo
533
+ '<img' .
534
+ ' id="wppa-ovl-spin"' .
535
+ ' alt="spinner"' .
536
+ ( wppa_use_svg() ? ' class="wppa-svg"' : '' ) .
537
+ ' style="' .
538
+ 'width:120px;' .
539
+ 'height:120px;' .
540
+ 'position:fixed;' .
541
+ 'top:50%;' .
542
+ 'margin-top:-60px;' .
543
+ 'left:50%;' .
544
+ 'margin-left:-60px;' .
545
+ 'z-index:100100;' .
546
+ 'opacity:1;' .
547
+ 'display:none;' .
548
+ 'fill:' . wppa_opt( 'ovl_svg_color' ) . ';' .
549
+ 'background-color:' . wppa_opt( 'ovl_svg_bg_color' ) . ';' .
550
+ 'box-shadow:none;' .
551
+ 'border-radius:' . $bradius . 'px;' .
552
+ '"' .
553
+ ' src="' . wppa_get_imgdir() . ( wppa_use_svg() ? 'loader.svg' : 'loader.gif' ) . '"' .
554
+ ' />';
555
+ }
556
 
557
  // The init vars
558
  echo '
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -7591,7 +7591,7 @@ global $wp_version;
7591
  ' id=""' .
7592
  ' onchange="wppaAjaxUpdateOptionValue(\'move_all_photos_from\',this)"' .
7593
  ' name="move_all_photos_to"' .
7594
- ' style="float:left;"' .
7595
  ' >'.
7596
  wppa_album_select_a(array( 'addpleaseselect'=>true,
7597
  'path'=>true,
@@ -7618,7 +7618,7 @@ global $wp_version;
7618
  ' id=""' .
7619
  ' onchange="wppaAjaxUpdateOptionValue(\'move_all_photos_to\',this)"' .
7620
  ' name="move_all_photos_to"' .
7621
- ' style="float:left;"' .
7622
  ' >'.
7623
  wppa_album_select_a(array( 'addpleaseselect'=>true,
7624
  'path'=>true,
@@ -9558,11 +9558,11 @@ if ( strpos( $_SERVER['SERVER_NAME'], 'opajaap' ) !== false ) {
9558
  $name = __('GPX Implementation', 'wp-photo-album-plus');
9559
  $desc = __('The way the maps are produced.', 'wp-photo-album-plus');
9560
  $help = esc_js(__('Select the way the maps are produced.', 'wp-photo-album-plus'));
9561
- $help .= '\n\n'.esc_js(__('When using Google maps GPX viewer plugin, you can not use Ajax (Table IV-A1)', 'wp-photo-album-plus'));
9562
- $help .= '\n'.esc_js(__('When using WPPA+ Embedded code, you can use Ajax, but there are less display options.', 'wp-photo-album-plus'));
9563
  $slug = 'wppa_gpx_implementation';
9564
- $opts = array( __('--- none ---', 'wp-photo-album-plus'), __('WPPA+ Embedded code', 'wp-photo-album-plus'), __('Google maps GPX viewer plugin', 'wp-photo-album-plus') );
9565
- $vals = array( 'none', 'wppa-plus-embedded', 'google-maps-gpx-viewer' );
9566
  $onch = 'wppaCheckGps();alert(\''.__('The page will be reloaded after the action has taken place.', 'wp-photo-album-plus').'\');wppaRefreshAfter();';
9567
  $html = wppa_select($slug, $opts, $vals, $onch);
9568
  $clas = '';
@@ -9571,19 +9571,28 @@ if ( strpos( $_SERVER['SERVER_NAME'], 'opajaap' ) !== false ) {
9571
 
9572
  $name = __('Map height', 'wp-photo-album-plus');
9573
  $desc = __('The height of the map display.', 'wp-photo-album-plus');
9574
- $help = '';
9575
  $slug = 'wppa_map_height';
9576
  $html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
9577
  $clas = 'wppa_gpx_native';
9578
  $tags = 'system';
 
 
 
 
 
 
 
 
 
9579
  wppa_setting($slug, '5.1', $name, $desc, $html, $help, $clas, $tags);
9580
 
9581
  $name = __('Google maps API key', 'wp-photo-album-plus');
9582
  $desc = __('Enter your Google maps api key here if you have one.', 'wp-photo-album-plus');
9583
  $help = '';
9584
  $slug = 'wppa_map_apikey';
9585
- $html = wppa_input($slug, '200px', '');
9586
- $clas = 'wppa_gpx_native';
9587
  $tags = 'system';
9588
  wppa_setting($slug, '5.2', $name, $desc, $html, $help, $clas, $tags);
9589
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 6.6.28
7
  *
8
  */
9
 
7591
  ' id=""' .
7592
  ' onchange="wppaAjaxUpdateOptionValue(\'move_all_photos_from\',this)"' .
7593
  ' name="move_all_photos_to"' .
7594
+ ' style="float:left;max-width:220px;"' .
7595
  ' >'.
7596
  wppa_album_select_a(array( 'addpleaseselect'=>true,
7597
  'path'=>true,
7618
  ' id=""' .
7619
  ' onchange="wppaAjaxUpdateOptionValue(\'move_all_photos_to\',this)"' .
7620
  ' name="move_all_photos_to"' .
7621
+ ' style="float:left;max-width:220px;"' .
7622
  ' >'.
7623
  wppa_album_select_a(array( 'addpleaseselect'=>true,
7624
  'path'=>true,
9558
  $name = __('GPX Implementation', 'wp-photo-album-plus');
9559
  $desc = __('The way the maps are produced.', 'wp-photo-album-plus');
9560
  $help = esc_js(__('Select the way the maps are produced.', 'wp-photo-album-plus'));
9561
+ $help .= '\n\n'.esc_js(__('When using an external plugin, most of the times you can not use Ajax (Table IV-A1).', 'wp-photo-album-plus'));
9562
+ $help .= '\n'.esc_js(__('Also: it may or may not be required to load the maps js api (Table IX-K5.1)', 'wp-photo-album-plus'));
9563
  $slug = 'wppa_gpx_implementation';
9564
+ $opts = array( __('--- none ---', 'wp-photo-album-plus'), __('WPPA+ Embedded code', 'wp-photo-album-plus'), __('External plugin', 'wp-photo-album-plus') );
9565
+ $vals = array( 'none', 'wppa-plus-embedded', 'external-plugin' );
9566
  $onch = 'wppaCheckGps();alert(\''.__('The page will be reloaded after the action has taken place.', 'wp-photo-album-plus').'\');wppaRefreshAfter();';
9567
  $html = wppa_select($slug, $opts, $vals, $onch);
9568
  $clas = '';
9571
 
9572
  $name = __('Map height', 'wp-photo-album-plus');
9573
  $desc = __('The height of the map display.', 'wp-photo-album-plus');
9574
+ $help = esc_js(__('This setting is for embedded implementation only.', 'wp-photo-album-plus'));
9575
  $slug = 'wppa_map_height';
9576
  $html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
9577
  $clas = 'wppa_gpx_native';
9578
  $tags = 'system';
9579
+ wppa_setting($slug, '5.0', $name, $desc, $html, $help, $clas, $tags);
9580
+
9581
+ $name = __('Load maps api', 'wp-photo-album-plus');
9582
+ $desc = __('Load the Google maps js api', 'wp-photo-album-plus');
9583
+ $help = esc_js(__('If you use an external maps plugin, you may need to tick this box.', 'wp-photo-album-plus'));
9584
+ $slug = 'wppa_load_map_api';
9585
+ $html = wppa_checkbox($slug);
9586
+ $clas = 'wppa_gpx_plugin';
9587
+ $tags = 'system';
9588
  wppa_setting($slug, '5.1', $name, $desc, $html, $help, $clas, $tags);
9589
 
9590
  $name = __('Google maps API key', 'wp-photo-album-plus');
9591
  $desc = __('Enter your Google maps api key here if you have one.', 'wp-photo-album-plus');
9592
  $help = '';
9593
  $slug = 'wppa_map_apikey';
9594
+ $html = wppa_input($slug, '300px', '');
9595
+ $clas = '';
9596
  $tags = 'system';
9597
  wppa_setting($slug, '5.2', $name, $desc, $html, $help, $clas, $tags);
9598
 
wppa-setup.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -207,8 +207,8 @@ global $silent;
207
  }
208
 
209
  // Clear Session
210
- $wpdb->query( "TRUNCATE TABLE `".WPPA_SESSION."`" );
211
- wppa_session_start();
212
 
213
  // Convert any changed and remove obsolete setting options
214
  if ( $old_rev > '100' ) { // On update only
@@ -536,6 +536,14 @@ global $silent;
536
  wppa_rename_setting( 'wppa_upload_fronend_maxsize', 'wppa_upload_frontend_maxsize' ); // Fix typo
537
  }
538
 
 
 
 
 
 
 
 
 
539
  }
540
 
541
  // Set Defaults
@@ -1561,6 +1569,7 @@ Hide Camera info
1561
  'wppa_enable_generator' => 'yes',
1562
  'wppa_log_cron' => 'no', // A9
1563
  'wppa_retry_mails' => '0', // A10
 
1564
 
1565
 
1566
  // IX D New
@@ -1695,6 +1704,7 @@ Hide Camera info
1695
  'wppa_gpx_implementation' => 'none',
1696
  'wppa_map_height' => '300',
1697
  'wppa_map_apikey' => '',
 
1698
  'wppa_gpx_shortcode' => '[map style="width: auto; height:300px; margin:0; " marker="yes" lat="w#lat" lon="w#lon"]',
1699
  'wppa_fotomoto_on' => 'no',
1700
  'wppa_fotomoto_fontsize' => '',
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
+ * Version 6.6.28
7
  *
8
  */
9
 
207
  }
208
 
209
  // Clear Session
210
+ // $wpdb->query( "TRUNCATE TABLE `".WPPA_SESSION."`" );
211
+ // wppa_session_start();
212
 
213
  // Convert any changed and remove obsolete setting options
214
  if ( $old_rev > '100' ) { // On update only
536
  wppa_rename_setting( 'wppa_upload_fronend_maxsize', 'wppa_upload_frontend_maxsize' ); // Fix typo
537
  }
538
 
539
+ if ( $old_rev <= '6628' ) {
540
+ if ( get_option( 'wppa_gpx_implementation' ) == 'wppa-plus-embedded' ) {
541
+ update_option( 'wppa_load_map_api', 'yes' );
542
+ }
543
+ if ( get_option( 'wppa_gpx_implementation' ) == 'google-maps-gpx-viewer' ) {
544
+ update_option( 'wppa_gpx_implementation', 'external-plugin' );
545
+ }
546
+ }
547
  }
548
 
549
  // Set Defaults
1569
  'wppa_enable_generator' => 'yes',
1570
  'wppa_log_cron' => 'no', // A9
1571
  'wppa_retry_mails' => '0', // A10
1572
+ 'wppa_log_ajax' => 'no',
1573
 
1574
 
1575
  // IX D New
1704
  'wppa_gpx_implementation' => 'none',
1705
  'wppa_map_height' => '300',
1706
  'wppa_map_apikey' => '',
1707
+ 'wppa_load_map_api' => 'no',
1708
  'wppa_gpx_shortcode' => '[map style="width: auto; height:300px; margin:0; " marker="yes" lat="w#lat" lon="w#lon"]',
1709
  'wppa_fotomoto_on' => 'no',
1710
  'wppa_fotomoto_fontsize' => '',
wppa-slideshow.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the slideshow high level functions
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -402,11 +402,40 @@ function wppa_slide_frame() {
402
  break;
403
  }
404
 
405
- // if ( ! wppa( 'is_slideonly' ) || wppa( 'is_slideonlyf' ) ) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
406
  wppa_out( '<img' .
407
  ' id="wppa-slide-spin-' . wppa( 'mocc' ) . '"' .
408
  ' alt="spinner"' .
409
- ( wppa_use_svg() ? ' class="wppa-svg"' : '' ) .
410
  ' style="' .
411
  'width:120px;' .
412
  'height:120px;' .
@@ -418,15 +447,15 @@ function wppa_slide_frame() {
418
  'z-index:100100;' .
419
  'opacity:1;' .
420
  'display:block;' .
421
- 'fill:' . wppa_opt( 'svg_color' ) . ';' .
422
  'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
423
  'box-shadow:none;' .
424
  'border-radius:' . $bradius .'px;' .
425
  '"' .
426
- ' src="' . wppa_get_imgdir() . ( wppa_use_svg() ? 'loader.svg' : 'loader.gif' ) . '"' .
427
  ' />'
428
  );
429
- // }
430
 
431
 
432
  /*'<div' .
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the slideshow high level functions
6
+ * Version 6.6.28
7
  *
8
  */
9
 
402
  break;
403
  }
404
 
405
+ if ( wppa_use_svg() ) {
406
+ wppa_out( '<svg' .
407
+ ' id="wppa-slide-spin-' . wppa( 'mocc' ) . '"' .
408
+ ' class="wppa-ajax-spin uil-default"' .
409
+ ' width="120px"' .
410
+ ' height="120px"' .
411
+ ' xmlns="http://www.w3.org/2000/svg"' .
412
+ ' viewBox="0 0 100 100"' .
413
+ ' preserveAspectRatio="xMidYMid"' .
414
+ ' style="' .
415
+ 'width:120px;' .
416
+ 'height:120px;' .
417
+ 'position:absolute;' .
418
+ 'top:50%;' .
419
+ 'margin-top:-60px;' .
420
+ 'left:50%;' .
421
+ 'margin-left:-60px;' .
422
+ 'z-index:100100;' .
423
+ 'opacity:1;' .
424
+ 'display:block;' .
425
+ 'fill:' . wppa_opt( 'svg_color' ) . ';' .
426
+ 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
427
+ 'box-shadow:none;' .
428
+ 'border-radius:' . $bradius .'px;' .
429
+ '"' .
430
+ ' >' .
431
+ wppa_get_spinner_svg_body_html() .
432
+ '</svg>'
433
+ );
434
+ }
435
+ else {
436
  wppa_out( '<img' .
437
  ' id="wppa-slide-spin-' . wppa( 'mocc' ) . '"' .
438
  ' alt="spinner"' .
 
439
  ' style="' .
440
  'width:120px;' .
441
  'height:120px;' .
447
  'z-index:100100;' .
448
  'opacity:1;' .
449
  'display:block;' .
450
+ // 'fill:' . wppa_opt( 'svg_color' ) . ';' .
451
  'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
452
  'box-shadow:none;' .
453
  'border-radius:' . $bradius .'px;' .
454
  '"' .
455
+ ' src="' . wppa_get_imgdir() . 'loader.gif"' .
456
  ' />'
457
  );
458
+ }
459
 
460
 
461
  /*'<div' .
wppa-utils.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
- * Version 6.6.27
7
  *
8
  */
9
 
@@ -254,9 +254,11 @@ global $wppa;
254
 
255
  // Switch on implementation type
256
  switch ( $type ) {
257
- case 'google-maps-gpx-viewer':
258
  $geo = str_replace( 'w#lon', $lon, str_replace( 'w#lat', $lat, wppa_opt( 'gpx_shortcode' ) ) );
259
  $geo = str_replace( 'w#ip', $_SERVER['REMOTE_ADDR'], $geo );
 
 
260
  $geo = do_shortcode( $geo );
261
  $wppa['geo'] .= '<div id="geodiv-' . wppa( 'mocc' ) . '-' . $id . '" style="display:none;">' . $geo . '</div>';
262
  break;
@@ -3309,8 +3311,177 @@ function wppa_get_svghtml( $name, $height = false, $lightbox = false, $border =
3309
  $use_svg = wppa_use_svg();
3310
  $src = $use_svg ? $name . '.svg' : $name . '.png';
3311
 
3312
- // Compose the html
3313
- $result = '<img' .
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3314
  ' src="' . wppa_get_imgdir( $src ) . '"' .
3315
  ( $use_svg ? ' class="wppa-svg"' : '' ) .
3316
  ' style="' .
@@ -3325,9 +3496,9 @@ function wppa_get_svghtml( $name, $height = false, $lightbox = false, $border =
3325
 
3326
  '"' .
3327
  ' alt="' . $name . '"' .
3328
- ' onload="wppaReplaceSvg()"' .
3329
  ' />';
3330
-
3331
  return $result;
3332
  }
3333
 
@@ -3632,12 +3803,68 @@ function wppa_create_qrcode_cache( $qrsrc ) {
3632
  }
3633
  }
3634
 
3635
- function wppa_use_svg() {
3636
  if ( wppa_is_ie() ) {
3637
  return false;
3638
  }
3639
- if ( wppa_opt( 'icon_corner_style' ) == 'gif' ) {
3640
  return false;
3641
  }
3642
  return true;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3643
  }
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
+ * Version 6.6.28
7
  *
8
  */
9
 
254
 
255
  // Switch on implementation type
256
  switch ( $type ) {
257
+ case 'external-plugin':
258
  $geo = str_replace( 'w#lon', $lon, str_replace( 'w#lat', $lat, wppa_opt( 'gpx_shortcode' ) ) );
259
  $geo = str_replace( 'w#ip', $_SERVER['REMOTE_ADDR'], $geo );
260
+ $geo = str_replace( 'w#gmapikey', wppa_opt( 'map_apikey' ), $geo );
261
+
262
  $geo = do_shortcode( $geo );
263
  $wppa['geo'] .= '<div id="geodiv-' . wppa( 'mocc' ) . '-' . $id . '" style="display:none;">' . $geo . '</div>';
264
  break;
3311
  $use_svg = wppa_use_svg();
3312
  $src = $use_svg ? $name . '.svg' : $name . '.png';
3313
 
3314
+ // Compose the html. Native svg html
3315
+ if ( $use_svg && in_array( $name, array( 'Next-Button',
3316
+ 'Prev-Button',
3317
+ 'Backward-Button',
3318
+ 'Forward-Button',
3319
+ 'Pause-Button',
3320
+ 'Play-Button',
3321
+ 'Stop-Button',
3322
+ 'Eagle-1',
3323
+ 'Snail',
3324
+ 'Exit',
3325
+ 'Full-Screen',
3326
+ 'Exit-Full-Screen',
3327
+ 'Content-View',
3328
+
3329
+ ) ) ) {
3330
+
3331
+ $result = '<svg' .
3332
+ ' version="1.1"' .
3333
+ ' xmlns="http://www.w3.org/2000/svg"' .
3334
+ ' xmlns:xlink="http://www.w3.org/1999/xlink"' .
3335
+ ' x="0px"' .
3336
+ ' y="0px"' .
3337
+ ' viewBox="0 0 30 30"' .
3338
+ ' style="' .
3339
+ 'enable-background:new 0 0 30 30;' .
3340
+ ( $height ? 'height:' . $height . ';' : '' ) .
3341
+ 'fill:' . $fillcolor . ';' .
3342
+ 'background-color:' . $bgcolor . ';' .
3343
+ 'text-decoration:none !important;' .
3344
+ 'vertical-align:middle;' .
3345
+ ( $bradius ? 'border-radius:' . $bradius . '%;' : '' ) .
3346
+ ( $border ? 'border:2px solid ' . $bgcolor . ';box-sizing:border-box;' : '' ) .
3347
+ '"' .
3348
+ ' xml:space="preserve"' .
3349
+ ' >' .
3350
+ '<g>';
3351
+ switch ( $name ) {
3352
+
3353
+ case 'Next-Button':
3354
+ $result .= '<path' .
3355
+ ' d="M30,0H0V30H30V0z M20,20.5' .
3356
+ 'c0,0.3-0.2,0.5-0.5,0.5S19,20.8,19,20.5v-4.2l-8.3,4.6c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1c-0.2-0.1-0.2-0.3-0.2-0.4v-11' .
3357
+ 'c0-0.2,0.1-0.4,0.3-0.4c0.2-0.1,0.4-0.1,0.5,0l8.2,5.5V9.5C19,9.2,19.2,9,19.5,9S20,9.2,20,9.5V20.5z"' .
3358
+ ' />';
3359
+ break;
3360
+ case 'Prev-Button':
3361
+ $result .= '<path' .
3362
+ ' d="M30,0H0V30H30V0z M20,20.5c0,0.2-0.1,0.4-0.3,0.4c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1L11,15.4v5.1c0,0.3-0.2,0.5-0.5,0.5S10,20.8,10,20.5v-11' .
3363
+ 'C10,9.2,10.2,9,10.5,9S11,9.2,11,9.5v4.2l8.3-4.6c0.2-0.1,0.3-0.1,0.5,0S20,9.3,20,9.5V20.5z"' .
3364
+ ' />';
3365
+ break;
3366
+ case 'Backward-Button':
3367
+ $result .= '<path' .
3368
+ ' d="M30,0H0V30H30V0z M23,20.5' .
3369
+ 'c0,0.2-0.1,0.3-0.2,0.4c-0.2,0.1-0.3,0.1-0.5,0L16,17.4v3.1c0,0.2-0.1,0.4-0.3,0.4c-0.1,0-0.1,0.1-0.2,0.1c-0.1,0-0.2,0-0.3-0.1' .
3370
+ 'l-8-6C7.1,14.8,7,14.6,7,14.5c0-0.2,0.1-0.3,0.2-0.4l8-5c0.2-0.1,0.3-0.1,0.5,0C15.9,9.2,16,9.3,16,9.5v3.1l6.3-3.6' .
3371
+ 'c0.2-0.1,0.3-0.1,0.5,0C22.9,9.2,23,9.3,23,9.5V20.5z"' .
3372
+ ' />';
3373
+ break;
3374
+ case 'Forward-Button':
3375
+ $result .= '<path' .
3376
+ ' d="M30,0H0V30H30V0z' .
3377
+ 'M22.8,15.9l-8,5c-0.2,0.1-0.3,0.1-0.5,0c-0.2-0.1-0.3-0.3-0.3-0.4v-3.1l-6.3,3.6C7.7,21,7.6,21,7.5,21c-0.1,0-0.2,0-0.3-0.1' .
3378
+ 'C7.1,20.8,7,20.7,7,20.5v-11c0-0.2,0.1-0.3,0.2-0.4C7.4,9,7.6,9,7.7,9.1l6.3,3.6V9.5c0-0.2,0.1-0.4,0.3-0.4c0.2-0.1,0.4-0.1,0.5,0' .
3379
+ 'l8,6c0.1,0.1,0.2,0.3,0.2,0.4C23,15.7,22.9,15.8,22.8,15.9z"' .
3380
+ ' />';
3381
+ break;
3382
+ case 'Pause-Button':
3383
+ $result .= '<path' .
3384
+ ' d="M30,0H0V30H30V0z M14,20.5' .
3385
+ 'c0,0.3-0.2,0.5-0.5,0.5h-4C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h4C13.8,9,14,9.2,14,9.5V20.5z M21,20.5' .
3386
+ 'c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5v-11C16,9.2,16.2,9,16.5,9h4C20.8,9,21,9.2,21,9.5V20.5z"' .
3387
+ ' />';
3388
+ break;
3389
+ case 'Play-Button':
3390
+ $result .= '<path' .
3391
+ ' d="M30,0H0V30H30V0z' .
3392
+ 'M19.8,14.9l-8,5C11.7,20,11.6,20,11.5,20c-0.1,0-0.2,0-0.2-0.1c-0.2-0.1-0.3-0.3-0.3-0.4v-9c0-0.2,0.1-0.3,0.2-0.4' .
3393
+ 'c0.1-0.1,0.3-0.1,0.5,0l8,4c0.2,0.1,0.3,0.2,0.3,0.4C20,14.7,19.9,14.8,19.8,14.9z"' .
3394
+ ' />';
3395
+ break;
3396
+ case 'Stop-Button':
3397
+ $result .= '<path' .
3398
+ ' d="M30,0H0V30H30V0z M21,20.5' .
3399
+ 'c0,0.3-0.2,0.5-0.5,0.5h-11C9.2,21,9,20.8,9,20.5v-11C9,9.2,9.2,9,9.5,9h11C20.8,9,21,9.2,21,9.5V20.5z"' .
3400
+ '/>';
3401
+ break;
3402
+ case 'Eagle-1':
3403
+ $result .= '<path' .
3404
+ ' d="M29.9,19.2c-0.1-0.1-0.2-0.2-0.4-0.2c-3.7,0-6.2-0.6-7.6-1.1c-0.1,0-0.1,0.1-0.2,0.1c-1.2,1.2-4,2.6-4.6,2.9' .
3405
+ 'c-0.1,0-0.1,0.1-0.2,0.1c-0.2,0-0.4-0.1-0.4-0.3c-0.1-0.2,0-0.5,0.2-0.7c0.3-0.2,2.9-1.4,4.1-2.5l0,0c0.1-0.1,0.1-0.1,0.2-0.2' .
3406
+ 'c0.7-0.7,2.5-0.5,3.3-0.3c0,0,0.1,0,0.1,0c0.2,0.1,0.4,0,0.5-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0.1-0.2,0.1-0.3,0.2-0.5c0,0,0-0.1,0-0.1' .
3407
+ 'c0-0.1,0.1-0.3,0.1-0.4c0,0,0-0.1,0-0.1c0-0.1,0-0.3,0-0.4c0,0,0-0.1,0-0.1c0-0.1-0.1-0.3-0.2-0.4c0,0,0,0,0-0.1' .
3408
+ 'c-0.1-0.1-0.1-0.2-0.2-0.2c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1-0.1-0.2-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1-0.1-0.2-0.1' .
3409
+ 'c-0.1,0-0.1-0.1-0.2-0.1c-0.1,0-0.1-0.1-0.2-0.1c0,0-0.1,0-0.1-0.1c-0.1,0-0.2-0.1-0.2-0.1c0,0-0.1,0-0.1,0c-0.4-0.1-0.7-0.2-1-0.2' .
3410
+ 'c0-0.1-0.1-0.2-0.1-0.3c-0.1-0.2-0.2-0.3-0.3-0.5c-0.2-0.2-0.4-0.3-0.6-0.4C21,12.1,20.6,12,20,12c-0.3,0-0.6,0-0.8,0.1' .
3411
+ 'c-0.1,0-0.1,0-0.2,0c-0.2,0-0.5,0.1-0.7,0.1c0,0-0.1,0-0.1,0c-0.2,0.1-0.5,0.1-0.7,0.2c0,0,0,0,0,0c-1.2,0.5-2.2,1.2-3,1.8' .
3412
+ 'c-0.5,0.3-0.9,0.6-1.2,0.8c-0.2,0.1-0.5,0-0.7-0.2c-0.1-0.3,0-0.5,0.2-0.7c0.2-0.1,0.6-0.4,0.9-0.6c-1.6-0.6-4-2-4-5.4' .
3413
+ 'c0-4.1,1.9-5.6,3.2-6.6c0.3-0.2,0.6-0.4,0.8-0.7C14,0.7,14,0.5,14,0.3S13.7,0,13.5,0C10.1,0,8.1,2,7,3.5v-1C7,2.3,6.9,2.1,6.7,2' .
3414
+ 'C6.5,2,6.3,2,6.1,2.1C4.5,3.8,3.9,5.4,3.7,6.8L3.4,6.3C3.4,6.1,3.2,6,3.1,6S2.8,6,2.6,6.1C1.8,7,1.3,8,1.3,9c0,0.5,0.1,1,0.3,1.4' .
3415
+ 'l-1-0.4c-0.2-0.1-0.3,0-0.5,0.1C0.1,10.2,0,10.3,0,10.5c0,2.7,0.5,4.4,1.4,5.2c0.1,0.1,0.2,0.1,0.3,0.2C1.4,16.4,1,17.4,1,18.5' .
3416
+ 'c0,1.5,2.6,2.5,4.5,3c-1,0.4-2,1-2,2c0,0.5-1.6,1.2-3.1,1.5c-0.2,0-0.3,0.2-0.4,0.4c-0.1,0.2,0,0.4,0.2,0.5C0.4,26,4.9,30,8.5,30' .
3417
+ 'C8.8,30,9,29.8,9,29.5c0-3.1,3.5-5,4.5-5.4c0.6,0.3,2,0.9,5,0.9c1.9,0,2.9-0.3,3.2-1l1.6,0.9c0.1,0,0.2,0.1,0.3,0.1' .
3418
+ 'c3.4,0,4.3-1.1,4.4-1.2c0.1-0.2,0.1-0.5-0.1-0.6l-0.8-0.8c2.1-0.6,2.9-2.6,2.9-2.7C30,19.5,30,19.3,29.9,19.2z M20.5,14' .
3419
+ 'c0.3,0,0.5,0.2,0.5,0.5S20.8,15,20.5,15S20,14.8,20,14.5S20.2,14,20.5,14z"' .
3420
+ ' />';
3421
+ break;
3422
+ case 'Snail':
3423
+ $result .= '<path' .
3424
+ ' d="M28.5,16.3L30,9.1c0.1-0.3-0.1-0.5-0.4-0.6c-0.3-0.1-0.5,0.1-0.6,0.4L27.6,16c0,0-0.1,0-0.1,0L27,10c0-0.3-0.3-0.5-0.5-0.5' .
3425
+ 'C26.2,9.5,26,9.8,26,10l0.5,6.1c-0.4,0.1-0.7,0.2-1.1,0.3l0,0c-1.4,2-4.8,4.1-6.9,4.1c-1.9,0-3.8-0.1-5.2-1.1' .
3426
+ 'c-0.1-0.1-0.2-0.2-0.2-0.4c0-0.1,0-0.3,0.2-0.4l1.2-1.1c1.5-1.9,1.6-4.7,1.6-5.5c0-1.8-1.2-5.5-5-5.5c-3.7,0-5,2.7-5,5' .
3427
+ 'c0,2.7,2.1,3,3,3c1.5,0,3-1.3,3-2.5c0-1.1-0.4-1.5-1.5-1.5C9.4,10.5,9,10.9,9,12c0,0.3-0.2,0.5-0.5,0.5S8,12.3,8,12' .
3428
+ 'c0-1.6,0.9-2.5,2.5-2.5c1.7,0,2.5,0.8,2.5,2.5c0,1.8-1.9,3.5-4,3.5c-1.9,0-4-1.1-4-4c0-3,1.9-6,6-6c4.1,0,6,3.8,6,6.5' .
3429
+ 'c0,1.1-0.2,4-1.8,6.1l-0.8,0.7c1.2,0.5,2.6,0.6,4.1,0.6c1.8,0,5.2-2.3,6.2-3.9l0,0c0.3-0.7,0.3-1.6,0.3-2.7c0-0.3,0-0.5,0-0.8' .
3430
+ 'c0-2-3-9.5-12-9.5C4.8,2.5,1,7.9,1,13c0,3,1.3,5.3,3.8,6.5c-0.5,0.4-1.4,1.1-2.6,1.6C0.1,21.8,0,24.9,0,25c0,0.2,0.1,0.4,0.3,0.4' .
3431
+ 'c0.2,0.1,0.4,0.1,0.5,0c0,0,1.3-0.9,4.1-0.9c1.6,0,2.6,0.6,3.6,1c0.7,0.4,1.3,0.7,2.1,0.7c0.5,0,0.6,0.1,0.8,0.4' .
3432
+ 'c0.3,0.4,0.6,0.8,1.7,0.8c1,0,1.4-0.3,1.8-0.6c0.3-0.2,0.6-0.4,1.2-0.4c0.6,0,0.9,0.2,1.3,0.4c0.4,0.3,1,0.6,1.9,0.6' .
3433
+ 'c1.4,0,1.6-1,1.8-1.6c0.1-0.4,0.2-0.8,0.4-1c0.2-0.2,0.4-0.1,1,0.1c0.6,0.2,1.4,0.6,2.1-0.1c0.6-0.6,0.7-1.1,0.8-1.5' .
3434
+ 'c0.1-0.4,0.1-0.6,0.5-1c0.6-0.5,2-0.1,2.4,0.1c0.2,0.1,0.5,0,0.6-0.2c0-0.1,1.1-1.7,1.1-3.3C30,17.8,29.4,16.8,28.5,16.3z"' .
3435
+ ' />';
3436
+ break;
3437
+ case 'Exit':
3438
+ $result .= '<path d="M30 24.398l-8.406-8.398 8.406-8.398-5.602-5.602-8.398 8.402-8.402-8.402-5.598 5.602 8.398 8.398-8.398 8.398 5.598 5.602 8.402-8.402 8.398 8.402z"></path>';
3439
+ break;
3440
+ case 'Full-Screen':
3441
+ $result .= '<path d="M27.414 24.586l-4.586-4.586-2.828 2.828 4.586 4.586-4.586 4.586h12v-12zM12 0h-12v12l4.586-4.586 4.543 4.539 2.828-2.828-4.543-4.539zM12 22.828l-2.828-2.828-4.586 4.586-4.586-4.586v12h12l-4.586-4.586zM32 0h-12l4.586 4.586-4.543 4.539 2.828 2.828 4.543-4.539 4.586 4.586z"></path>';
3442
+ break;
3443
+ case 'Exit-Full-Screen':
3444
+ $result .= '<path d="M24.586 27.414l4.586 4.586 2.828-2.828-4.586-4.586 4.586-4.586h-12v12zM0 12h12v-12l-4.586 4.586-4.539-4.543-2.828 2.828 4.539 4.543zM0 29.172l2.828 2.828 4.586-4.586 4.586 4.586v-12h-12l4.586 4.586zM20 12h12l-4.586-4.586 4.547-4.543-2.828-2.828-4.547 4.543-4.586-4.586z"></path>';
3445
+ break;
3446
+ case 'Content-View':
3447
+ $result .= '<path' .
3448
+ ' d="M21.5,25.5h4c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4c-0.276,0-0.5,0.224-0.5,0.5S21.224,25.5,21.5,25.5z' .
3449
+ 'M21.5,18.5h4c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4c-0.276,0-0.5,0.224-0.5,0.5S21.224,18.5,21.5,18.5z M21.5,23.5h4' .
3450
+ 'c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4c-0.276,0-0.5,0.224-0.5,0.5S21.224,23.5,21.5,23.5z M21.5,16.5h4' .
3451
+ 'c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4c-0.276,0-0.5,0.224-0.5,0.5S21.224,16.5,21.5,16.5z M21.5,11.5h4' .
3452
+ 'c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4c-0.276,0-0.5,0.224-0.5,0.5S21.224,11.5,21.5,11.5z M26.864,0.5H3.136' .
3453
+ 'C1.407,0.5,0,1.866,0,3.545v22.91C0,28.134,1.407,29.5,3.136,29.5h23.728c1.729,0,3.136-1.366,3.136-3.045V3.545' .
3454
+ 'C30,1.866,28.593,0.5,26.864,0.5z M9.5,2.5C9.776,2.5,10,2.724,10,3S9.776,3.5,9.5,3.5S9,3.276,9,3S9.224,2.5,9.5,2.5z M6.5,2.5' .
3455
+ 'C6.776,2.5,7,2.724,7,3S6.776,3.5,6.5,3.5S6,3.276,6,3S6.224,2.5,6.5,2.5z M3.5,2.5C3.776,2.5,4,2.724,4,3S3.776,3.5,3.5,3.5' .
3456
+ 'S3,3.276,3,3S3.224,2.5,3.5,2.5z M29,26.455c0,1.128-0.958,2.045-2.136,2.045H3.136C1.958,28.5,1,27.583,1,26.455V5.5h28V26.455z' .
3457
+ 'M21.5,9.5h4C25.776,9.5,26,9.276,26,9s-0.224-0.5-0.5-0.5h-4C21.224,8.5,21,8.724,21,9S21.224,9.5,21.5,9.5z M4.5,25.5h2' .
3458
+ 'C6.776,25.5,7,25.276,7,25v-2c0-0.276-0.224-0.5-0.5-0.5h-2C4.224,22.5,4,22.724,4,23v2C4,25.276,4.224,25.5,4.5,25.5z M17.5,11.5' .
3459
+ 'h2c0.276,0,0.5-0.224,0.5-0.5V9c0-0.276-0.224-0.5-0.5-0.5h-2C17.224,8.5,17,8.724,17,9v2C17,11.276,17.224,11.5,17.5,11.5z' .
3460
+ 'M8.5,25.5h4c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4C8.224,24.5,8,24.724,8,25S8.224,25.5,8.5,25.5z M8.5,18.5h4' .
3461
+ 'c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4C8.224,17.5,8,17.724,8,18S8.224,18.5,8.5,18.5z M8.5,23.5h4' .
3462
+ 'c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4C8.224,22.5,8,22.724,8,23S8.224,23.5,8.5,23.5z M4.5,11.5h2' .
3463
+ 'C6.776,11.5,7,11.276,7,11V9c0-0.276-0.224-0.5-0.5-0.5h-2C4.224,8.5,4,8.724,4,9v2C4,11.276,4.224,11.5,4.5,11.5z M4.5,18.5h2' .
3464
+ 'C6.776,18.5,7,18.276,7,18v-2c0-0.276-0.224-0.5-0.5-0.5h-2C4.224,15.5,4,15.724,4,16v2C4,18.276,4.224,18.5,4.5,18.5z M17.5,25.5' .
3465
+ 'h2c0.276,0,0.5-0.224,0.5-0.5v-2c0-0.276-0.224-0.5-0.5-0.5h-2c-0.276,0-0.5,0.224-0.5,0.5v2C17,25.276,17.224,25.5,17.5,25.5z' .
3466
+ 'M17.5,18.5h2c0.276,0,0.5-0.224,0.5-0.5v-2c0-0.276-0.224-0.5-0.5-0.5h-2c-0.276,0-0.5,0.224-0.5,0.5v2' .
3467
+ 'C17,18.276,17.224,18.5,17.5,18.5z M8.5,16.5h4c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4C8.224,15.5,8,15.724,8,16' .
3468
+ 'S8.224,16.5,8.5,16.5z M8.5,9.5h4C12.776,9.5,13,9.276,13,9s-0.224-0.5-0.5-0.5h-4C8.224,8.5,8,8.724,8,9S8.224,9.5,8.5,9.5z' .
3469
+ 'M8.5,11.5h4c0.276,0,0.5-0.224,0.5-0.5s-0.224-0.5-0.5-0.5h-4C8.224,10.5,8,10.724,8,11S8.224,11.5,8.5,11.5z"' .
3470
+ ' />';
3471
+ break;
3472
+
3473
+ }
3474
+
3475
+ $result .= '</g>' .
3476
+ '</svg>';
3477
+
3478
+ return $result;
3479
+ }
3480
+
3481
+ // Compose html. Non native svg or gif/png
3482
+ else {
3483
+ wppa_log('dbg','Still used for '.$name);
3484
+ $result = '<img' .
3485
  ' src="' . wppa_get_imgdir( $src ) . '"' .
3486
  ( $use_svg ? ' class="wppa-svg"' : '' ) .
3487
  ' style="' .
3496
 
3497
  '"' .
3498
  ' alt="' . $name . '"' .
3499
+ // ' onload="wppaReplaceSvg()"' .
3500
  ' />';
3501
+ }
3502
  return $result;
3503
  }
3504
 
3803
  }
3804
  }
3805
 
3806
+ function wppa_use_svg( $is_admin = false ) {
3807
  if ( wppa_is_ie() ) {
3808
  return false;
3809
  }
3810
+ if ( ! $is_admin && wppa_opt( 'icon_corner_style' ) == 'gif' ) {
3811
  return false;
3812
  }
3813
  return true;
3814
+ }
3815
+
3816
+ function wppa_get_spinner_svg_body_html() {
3817
+ $result =
3818
+ '<rect x="0" y="0" width="100" height="100" fill="none" class="bk" >' .
3819
+ '</rect>' .
3820
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(0 50 50) translate(0 -32)">' .
3821
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0s" repeatCount="indefinite"/>' .
3822
+ '</rect>' .
3823
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(22.5 50 50) translate(0 -32)">' .
3824
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.09375s" repeatCount="indefinite"/>' .
3825
+ '</rect>' .
3826
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(45 50 50) translate(0 -32)">' .
3827
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.1875s" repeatCount="indefinite"/>' .
3828
+ '</rect>' .
3829
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(67.5 50 50) translate(0 -32)">' .
3830
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.28125s" repeatCount="indefinite"/>' .
3831
+ '</rect>' .
3832
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(90 50 50) translate(0 -32)">' .
3833
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.375s" repeatCount="indefinite"/>' .
3834
+ '</rect>' .
3835
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(112.5 50 50) translate(0 -32)">' .
3836
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.46875s" repeatCount="indefinite"/>' .
3837
+ '</rect>' .
3838
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(135 50 50) translate(0 -32)">' .
3839
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.5625s" repeatCount="indefinite"/>' .
3840
+ '</rect>' .
3841
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(157.5 50 50) translate(0 -32)">' .
3842
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.65625s" repeatCount="indefinite"/>' .
3843
+ '</rect>' .
3844
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(180 50 50) translate(0 -32)">' .
3845
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.75s" repeatCount="indefinite"/>' .
3846
+ '</rect>' .
3847
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(202.5 50 50) translate(0 -32)">' .
3848
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.84375s" repeatCount="indefinite"/>' .
3849
+ '</rect>' .
3850
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(225 50 50) translate(0 -32)">' .
3851
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="0.9375s" repeatCount="indefinite"/>' .
3852
+ '</rect>' .
3853
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(247.5 50 50) translate(0 -32)">' .
3854
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="1.03125s" repeatCount="indefinite"/>' .
3855
+ '</rect>' .
3856
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(270 50 50) translate(0 -32)">' .
3857
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="1.125s" repeatCount="indefinite"/>' .
3858
+ '</rect>' .
3859
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(292.5 50 50) translate(0 -32)">' .
3860
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="1.21875s" repeatCount="indefinite"/>' .
3861
+ '</rect>' .
3862
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(315 50 50) translate(0 -32)">' .
3863
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="1.3125s" repeatCount="indefinite"/>' .
3864
+ '</rect>' .
3865
+ '<rect class="wppa-ajaxspin" x="47" y="40" width="6" height="20" rx="3" ry="3" transform="rotate(337.5 50 50) translate(0 -32)">' .
3866
+ '<animate attributeName="opacity" from="1" to="0" dur="1.5s" begin="1.40625s" repeatCount="indefinite"/>' .
3867
+ '</rect>';
3868
+
3869
+ return $result;
3870
  }
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.6.27
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/
@@ -22,8 +22,8 @@ global $wpdb;
22
  global $wp_version;
23
 
24
  /* WPPA GLOBALS */
25
- global $wppa_revno; $wppa_revno = '6627'; // WPPA db version
26
- global $wppa_api_version; $wppa_api_version = '6-6-27-005'; // WPPA software version
27
 
28
  /* start timers */
29
  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.6.28
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/
22
  global $wp_version;
23
 
24
  /* WPPA GLOBALS */
25
+ global $wppa_revno; $wppa_revno = '6628'; // WPPA db version
26
+ global $wppa_api_version; $wppa_api_version = '6-6-28-008'; // WPPA software version
27
 
28
  /* start timers */
29
  global $wppa_starttime; $wppa_starttime = microtime( true );