WP Photo Album Plus - Version 6.8.09

Version Description

= 6.8.09

  • This version addresses various bug fixes and code edits.

= 6.8.08 =

  • This version addresses various minor bug fixes and feature requests.
  • This version offers substantial performance improvements when the box in Table IV-A13: Defer Javascript is ticked. This setting is now recommended and set ticked as the default.
  • For more info on performance improvements and compatibility with optimizers: see the changelog.txt

= 6.8.07 =

  • This version addresses various minor bug fixes and enhancements, and a new widget: Statistics.

= 6.8.06 =

  • This version addresses various minor bug fixes and improved cache handling.

= 6.8.05 =

  • This version addresses various minor bug fixes and feture requests.

= 6.8.04 =

  • This version addresses various display issues and a few fixes of bugs that seldom affected the plugins behaviour.
Download this release

Release Info

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

Code changes from version 6.8.09.001 to 6.8.09

changelog.txt CHANGED
@@ -5,6 +5,16 @@ WP Photo Album Plus Changelog
5
  = Bug Fixes =
6
 
7
  * If lightbox global was active and no wppa images on the page, lightbox did not work. Fixed.
 
 
 
 
 
 
 
 
 
 
8
 
9
  = 6.8.08 =
10
 
5
  = Bug Fixes =
6
 
7
  * If lightbox global was active and no wppa images on the page, lightbox did not work. Fixed.
8
+ * Import page: No import button when only .csv files were present. Fixed.
9
+
10
+ = New Features =
11
+
12
+ * Breadcrumb, Table II-A4.4: Photo name: Show name of photo above slideshow. You can now switch it off.
13
+ * GPX maps, Table IX-K5.4: Zoomlevel: The starting zoomlevel for the embedded GPX implementation.
14
+
15
+ = Other Changes =
16
+
17
+ * Removed obsolete and not used code, obsolete comments and diagnostics.
18
 
19
  = 6.8.08 =
20
 
js/wppa.js CHANGED
@@ -2,7 +2,7 @@
2
  //
3
  // conatins common vars and functions
4
  //
5
- var wppaJsVersion = '6.8.08';
6
 
7
  // Important notice:
8
  // All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!
@@ -155,6 +155,7 @@ var wppaProcessing = 'Processing...';
155
  var wppaDone = 'Done!';
156
  var wppaUploadFailed = 'Upload failed';
157
  var wppaServerError = 'Server error';
 
158
 
159
  // 'Internal' variables ( private )
160
  var _wppaId = [];
@@ -947,7 +948,7 @@ function wppaGeoInit( mocc, lat, lon ) {
947
  scaleControl: true,
948
  streetViewControl: true,
949
  overviewMapControl: true,
950
- zoom: 10,
951
  center: myLatLng,
952
  // mapTypeId: google.maps.MapTypeId.TERRAIN,
953
  // mapTypeControlOptions: {
2
  //
3
  // conatins common vars and functions
4
  //
5
+ var wppaJsVersion = '6.8.09';
6
 
7
  // Important notice:
8
  // All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!
155
  var wppaDone = 'Done!';
156
  var wppaUploadFailed = 'Upload failed';
157
  var wppaServerError = 'Server error';
158
+ var wppaGeoZoom = 10;
159
 
160
  // 'Internal' variables ( private )
161
  var _wppaId = [];
948
  scaleControl: true,
949
  streetViewControl: true,
950
  overviewMapControl: true,
951
+ zoom: wppaGeoZoom,
952
  center: myLatLng,
953
  // mapTypeId: google.maps.MapTypeId.TERRAIN,
954
  // mapTypeControlOptions: {
js/wppa.min.js CHANGED
@@ -1 +1 @@
1
- var wppaJsVersion="6.8.08",wppaVersion="0",wppaIsIe=!1,wppaUseSvg=!0,wppaDebug,wppaFullValign=[],wppaFullHalign=[],wppaFullFrameDelta=[],wppaAnimationSpeed,wppaImageDirectory,wppaAutoColumnWidth=[],wppaAutoColumnFrac=[],wppaThumbnailAreaDelta,wppaSlideShowTimeOut=2500,wppaFadeInAfterFadeOut=!1,wppaTextFrameDelta=0,wppaBoxDelta=0,wppaPreambule=[],wppaHideWhenEmpty=!1,wppaThumbnailPitch=[],wppaFilmStripLength=[],wppaFilmStripMargin=[],wppaFilmStripAreaDelta=[],wppaFilmShowGlue=!1,wppaIsMini=[],wppaPortraitOnly=[],wppaSlideShow,wppaPhoto,wppaOf,wppaNextPhoto,wppaPreviousPhoto,wppaNextP,wppaPrevP,wppaAvgRating,wppaMyRating,wppaAvgRat,wppaMyRat,wppaDislikeMsg,wppaMiniTreshold=300,wppaStart="Start",wppaStop="Stop",wppaPleaseName,wppaPleaseEmail,wppaPleaseComment,wppaRatingOnce=!0,wppaBGcolorNumbar="transparent",wppaBcolorNumbar="transparent",wppaBGcolorNumbarActive="transparent",wppaBcolorNumbarActive="transparent",wppaFontFamilyNumbar="",wppaFontSizeNumbar="",wppaFontColorNumbar="",wppaFontWeightNumbar="",wppaFontFamilyNumbarActive="",wppaFontSizeNumbarActive="",wppaFontColorNumbarActive="",wppaFontWeightNumbarActive="",wppaNumbarMax="10",wppaAjaxUrl="",wppaLang="",wppaNextOnCallback=!1,wppaStarOpacity=.2,wppaLightBox=[],wppaEmailRequired="required",wppaSlideBorderWidth=0,wppaSlideInitRunning=[],wppaAnimationType="fadeover",wppaSlidePause=[],wppaSlideBlank=[],wppaRatingMax=5,wppaRatingDisplayType="graphic",wppaRatingPrec=2,wppaFilmPageSize=[],wppaAspectRatio=[],wppaFullSize=[],wppaStretch=!1,wppaThumbSpaceAuto=!1,wppaMinThumbSpace=4,wppaMagnifierCursor="",wppaArtMonkyLink="none",wppaAutoOpenComments=!1,wppaUpdateAddressLine=!1,wppaFilmThumbTitle="",wppaClickToView="",wppaUploadUrl="",wppaVoteForMe="",wppaVotedForMe="",wppaSlideSwipe=!0,wppaLightboxSingle=[],wppaMaxCoverWidth=300,wppaDownLoad="Download",wppaSiteUrl="",wppaWppaUrl="",wppaIncludeUrl="",wppaSlideToFullpopup=!1,wppaComAltSize=75,wppaBumpViewCount=!0,wppaBumpClickCount=!1,wppaFotomoto=!1,wppaArtMonkeyButton=!0,wppaShortQargs=!1,wppaOvlHires=!1,wppaMasonryCols=[],wppaVideoPlaying=[],wppaAudioPlaying=[],wppaSlideVideoStart=!1,wppaSlideAudioStart=!1,wppaAudioHeight=28,wppaHis=0,wppaStartHtml=[],wppaCanAjaxRender=!1,wppaCanPushState=!1,wppaAllowAjax=!0,wppaMaxOccur=0,wppaFirstOccur=0,wppaUsePhotoNamesInUrls=!1,wppaShareHideWhenRunning=!1,wppaCommentRequiredAfterVote=!0,wppaTopMoc=0,wppaColWidth=[],wppaFotomotoHideWhenRunning=!1,wppaFotomotoMinWidth=400,wppaPhotoView=[],wppaBackgroundColorImage="",wppaPopupLinkType="",wppaPopupOnclick=[],wppaThumbTargetBlank=!1,wppaRel="rel",wppaEditPhotoWidth="960",wppaThemeStyles="",wppaStickyHeaderHeight=0,wppaRenderModal=!1,wppaModalBgColor="#ffffff",wppaBoxRadius=0,wppaModalQuitImg,wppaUploadEdit="none",wppaPageArg="",wppaSlideshowNavigationType="icons",wppaCoverImageResponsive=[],wppaSearchBoxSelItems=[],wppaSlideWrap=[],wppaHideRightClick=!1,wppaProcessing="Processing...",wppaDone="Done!",wppaUploadFailed="Upload failed",wppaServerError="Server error",_wppaId=[],_wppaAvg=[],_wppaDisc=[],_wppaMyr=[],_wppaVRU=[],_wppaLinkUrl=[],_wppaLinkTitle=[],_wppaLinkTarget=[],_wppaCommentHtml=[],_wppaIptcHtml=[],_wppaExifHtml=[],_wppaToTheSame=!1,_wppaSlides=[],_wppaNames=[],_wppaFullNames=[],_wppaDsc=[],_wppaOgDsc=[],_wppaCurIdx=[],_wppaNxtIdx=[],_wppaTimeOut=[],_wppaSSRuns=[],_wppaFg=[],_wppaTP=[],_wppaIsBusy=[],_wppaFirst=[],_wppaVoteInProgress=!1,_wppaTextDelay,_wppaUrl=[],_wppaSkipRated=[],_wppaLbTitle=[],_wppaStateCount=0,_wppaDidGoto=[],_wppaShareUrl=[],_wppaShareHtml=[],_wppaFilmNoMove=[],_wppaHiresUrl=[],_wppaIsVideo=[],_wppaVideoHtml=[],_wppaAudioHtml=[],_wppaVideoNatWidth=[],_wppaVideoNatHeight=[],_wppaWaitTexts=[],_wppaImageAlt=[],__wppaOverruleRun=!1,wppaOvlUrls,wppaOvlTitles,wppaOvlAlts,wppaOvlIdx=0,wppaOvlFirst=!0,wppaOvlKbHandler="",wppaOvlSizeHandler="",wppaOvlPadTop=5,wppaOvlIsSingle,wppaOvlRunning=!1,wppaOvlVideoHtmls,wppaOvlAudioHtmls,wppaOvlVideoNaturalWidths,wppaOvlVideoNaturalHeights,wppaOvlModeInitial="normal",wppaOvlVideoPlaying=!1,wppaOvlAudioPlaying=!1,wppaOvlShowLegenda=!0,wppaOvlShowStartStop=!0,wppaOvlRadius=0,wppaOvlBorderWidth=16,wppaOvlOpen=!1,wppaOvlTxtHeight=36,wppaOvlOpacity=.8,wppaOvlOnclickType="none",wppaOvlTheme="black",wppaOvlAnimSpeed=300,wppaOvlSlideSpeed=3e3,wppaVer4WindowWidth=800,wppaVer4WindowHeight=600,wppaOvlFontFamily="Helvetica",wppaOvlFontSize="10",wppaOvlFontColor="",wppaOvlFontWeight="bold",wppaOvlLineHeight="12",wppaOvlShowCounter=!0,wppaOvlIsVideo=!1,wppaShowLegenda="",wppaOvlFsPhotoId=0,wppaPhotoId=0,wppaOvlVideoStart=!1,wppaOvlAudioStart=!1,wppaLastIptc="",wppaLastExif="",wppaIsMobile=!1,wppaSvgFillcolor="gray",wppaSvgBgcolor="transparent",wppaSvgCornerStyle="light";function wppaDoInit(p){var a=!1;for(mocc=1;mocc<=wppaTopMoc;mocc++)wppaAutoColumnWidth[mocc]&&(wppaColWidth[mocc]=0,_wppaDoAutocol(mocc),a=!0);p||(_wppaTextDelay=wppaAnimationSpeed,wppaFadeInAfterFadeOut&&(_wppaTextDelay*=2),a&&jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++)wppaAutoColumnWidth[mocc]&&(wppaColWidth[mocc]=0,_wppaDoAutocol(mocc))})),jQuery(".wppa-ajax-spin").stop().fadeOut(),setTimeout(function(){jQuery(".wppa-ajax-spin").stop().fadeOut()},1e3),jQuery(".wppa-ovl-spin").stop().fadeOut(),setTimeout(function(){jQuery(".wppa-ovl-spin").stop().fadeOut()},1e3),setTimeout(function(){for(var p=1;p<wppaTopMoc;)jQuery("ubb-"+p+"-l")&&(wppaUbb(p,"l","hide"),wppaUbb(p,"r","hide")),p++},3e3),wppaProtect()}function wppaProtect(){wppaHideRightClick&&(jQuery("img").bind("contextmenu",function(p){return!1}),jQuery("video").bind("contextmenu",function(p){return!1}))}function wppaUpdateLightboxes(){"function"==typeof wppaInitOverlay&&wppaInitOverlay(),"undefined"!=typeof myLightbox&&"function"==typeof myLightbox.updateImageList&&myLightbox.updateImageList(),jQuery().prettyPhoto&&jQuery("a[rel^='prettyPhoto']").prettyPhoto({deeplinking:!1})}function wppaStopVideo(p){var a,e,t=[];for(t[1]="wppa-overlay-img",t[2]="theimg0-"+p,t[3]="theimg1-"+p,e=0;e<3;)1==++e&&0!=p||(a=document.getElementById(t[e]))&&"function"==typeof a.pause&&(a.pause(),wppaConsoleLog("Video "+t[e]+" paused","force"))}function wppaStopAudio(p){if("number"==typeof p)jQuery("#audio-"+p).pause&&jQuery("#audio-"+p).pause();else{var a=jQuery("audio");if(a.length>0)for(var e=0;e<a.length;)"wppa"==jQuery(a[e]).attr("data-from")&&a[e].pause(),e++}}function wppaMakeFullsizeUrl(p){var a,e;(a=(p=p.replace("/thumbs/","/")).split("//"))[1]?(e=a[1].split("/"),p=a[0]+"//"):(e=a[0].split("/"),p="");for(var t=0;t<e.length;){var o=e[t];"w"!=o.split("_")[0]&&(0!=t&&(p+="/"),p+=o),t++}return p}function wppaGetContainerWidth(p){var a=document.getElementById("wppa-container-"+p),e=0;if(!wppaAutoColumnWidth[p])return a.clientWidth;for(;0==e;)a=a.parentNode,e=jQuery(a).width();return parseInt(e*wppaAutoColumnFrac[p])}function _wppaDoAutocol(p){var a;if(wppaAutoColumnWidth[p]&&(a=wppaGetContainerWidth(p),wppaColWidth[p]!=a)){wppaConsoleLog("Doing autocol "+p),wppaColWidth[p]=a,jQuery(".wppa-container-"+p).css("width",a),wppaRenderModal&&(jQuery(".ui-dialog").css("width",a),jQuery(".ui-dialog").attr("height","auto")),wppaCoverImageResponsive[p]||(jQuery(".wppa-asym-text-frame-"+p).css("width",a-wppaTextFrameDelta),jQuery(".wppa-cover-box-"+p).css("width",a));var e,t=jQuery(".wppa-cover-box-mcr-"+p);if(t.length>1){var o=parseInt((a+8)/(wppaMaxCoverWidth+8))+1,r=o-1;e=parseInt((a+8)/o-8);for(var s=0;s<t.length;){switch(s%o){case 0:jQuery(t[s]).css({marginLeft:"0px",clear:"both",float:"left"});break;case r:jQuery(t[s]).css({marginLeft:"8px",clear:"none",float:"right"});break;default:jQuery(t[s]).css({marginLeft:"8px",clear:"none",float:"left"})}s++}wppaCoverImageResponsive[p]||jQuery(".wppa-asym-text-frame-mcr-"+p).css("width",e-wppaTextFrameDelta),jQuery(".wppa-cover-box-mcr-"+p).css("width",e)}else if(wppaCoverImageResponsive[p]);else{jQuery(".wppa-asym-text-frame-mcr-"+p).css("width",a-wppaTextFrameDelta);jQuery(".wppa-cover-box-mcr-"+p).css({marginLeft:"0px",float:"left"})}if(wppaThumbSpaceAuto){var i=parseInt(jQuery(".thumbnail-frame-"+p).css("width"));if(i){var n=a-wppaThumbnailAreaDelta-7,l=parseInt(n/(i+wppaMinThumbSpace)),w=parseInt(.5+(n-l*i)/(l+1));jQuery(".thumbnail-frame-"+p).css({marginLeft:w})}}jQuery(".thumbnail-frame-comalt-"+p).css("width",a-wppaThumbnailAreaDelta),jQuery(".wppa-com-alt-"+p).css("width",a-wppaThumbnailAreaDelta-wppaComAltSize-16);for(var u,c=1,d=jQuery("#wppa-mas-h-"+c+"-"+p).attr("data-height-perc");d;)u=d*(a-wppaThumbnailAreaDelta)/100,jQuery("#wppa-mas-h-"+c+"-"+p).css("height",u),c++,d=jQuery("#wppa-mas-h-"+c+"-"+p).attr("data-height-perc");wppaSetMasHorFrameWidthsForIeAndChrome(p),wppaFormatSlide(p),jQuery("#audio-slide-"+p).css("width",a-wppaBoxDelta-6),jQuery(".wppa-comment-textarea-"+p).css("width",.7*a),wppaFilmStripLength[p]=a-wppaFilmStripAreaDelta[p],jQuery("#filmwindow-"+p).css("width",wppaFilmStripLength[p]),_wppaAdjustFilmstrip(p),wppaIsMini[p]||void 0===_wppaSlides[p]||(wppaColWidth[p]<wppaMiniTreshold?(jQuery("#wppa-avg-rat-"+p).html(wppaAvgRat),jQuery("#wppa-my-rat-"+p).html(wppaMyRat),jQuery("#counter-"+p).html(_wppaCurIdx[p]+1+" / "+_wppaSlides[p].length)):(jQuery("#wppa-avg-rat-"+p).html(wppaAvgRating),jQuery("#wppa-my-rat-"+p).html(wppaMyRating),jQuery("#counter-"+p).html(wppaPhoto+" "+(_wppaCurIdx[p]+1)+" "+wppaOf+" "+_wppaSlides[p].length))),jQuery(".wppa-sphoto-"+p).css("width",a),jQuery(".wppa-simg-"+p).css("width",a-2*wppaSlideBorderWidth),jQuery(".wppa-simg-"+p).css("height",""),jQuery(".wppa-mphoto-"+p).css("width",a+10),jQuery(".wppa-mimg-"+p).css("width",a),jQuery(".wppa-mimg-"+p).css("height",""),wppaSearchBoxSelItems[p]>0&&(a/wppaSearchBoxSelItems[p]<125?jQuery(".wppa-searchsel-item-"+p).css("width","100%"):jQuery(".wppa-searchsel-item-"+p).css("width",100/wppaSearchBoxSelItems[p]+"%")),jQuery(".wppa-upload-album-"+p).css("maxWidth",.6*a)}}function wppaSetMasHorFrameWidthsForIeAndChrome(p){for(var a=jQuery(".wppa-mas-h-"+p),e=wppaMinThumbSpace,t=0;t<a.length;t++){var o=wppaGetChildI(a[t]);if(o){if("IMG"==o.nodeName&&!o.complete)return void setTimeout("wppaSetMasHorFrameWidthsForIeAndChrome( "+p+" )",400);var r=o.naturalWidth/o.naturalHeight*o.height+e;jQuery(a[t]).css({width:r})}}}function wppaGetChildI(p){var a,e=p.childNodes;for(a=0;a<e.length;a++){var t=e[a];if(t.id&&"i-"==t.id.substr(0,2))return t;var o=wppaGetChildI(t);if(o)return o}return!1}jQuery(document).ready(function(){wppaDoInit(!1),setTimeout(function(){wppaDoInit(!0)},1e3)}),jQuery(document).ready(function(p){if(wppaAllowAjax&&jQuery.ajax&&(wppaCanAjaxRender=!0),void 0!==history.pushState){for(var a=1;a<=wppaMaxOccur;)wppaStartHtml[a]=jQuery("#wppa-container-"+a).html(),a++;wppaCanPushState=!0}});var wppaFotomotoLoaded=!1,wppaFotomotoToolbarIds=[];function fotomoto_loaded(){wppaFotomotoLoaded=!0}function wppaFotomotoToolbar(p,a){if(!(wppaColWidth[p]>=wppaFotomotoMinWidth))return jQuery("#wppa-fotomoto-container-"+p).css("display","none"),void jQuery("#wppa-fotomoto-checkout-"+p).css("display","none");jQuery("#wppa-fotomoto-container-"+p).css("display","inline"),jQuery("#wppa-fotomoto-checkout-"+p).css("display","inline"),wppaFotomoto&&document.getElementById("wppa-fotomoto-container-"+p)&&(wppaFotomotoLoaded?(FOTOMOTO.API.checkinImage(a),wppaFotomotoToolbarIds[p]=FOTOMOTO.API.showToolbar("wppa-fotomoto-container-"+p,a)):(setTimeout("wppaFotomotoToolbar( "+p+',"'+a+'" )',200),wppaConsoleLog("Waiting for Fotomoto")))}function wppaFotomotoHide(p){jQuery("#wppa-fotomoto-container-"+p).css("display","none"),jQuery("#wppa-fotomoto-checkout-"+p).css("display","none")}function wppaGetCurrentFullUrl(p,a){var e,t,o,r=document.location.href.split("?"),s="nil",i=0,n=!0;o=wppaShortQargs?"":"wppa-",r[1]&&(s=r[1].split("&"));var l=!1;if(e=r[0],"nil"!=s&&s.length>0)for(;i<s.length;)(t=s[i].split("="))[0]==o+"album"&&(l=!0),t[0]!=o+"photo"&&(e+=n?"?":"&",n=!1,e+=s[i]),i++;return l?(e+=n?"?":"&",e+=wppaUsePhotoNamesInUrls?o+"photo="+encodeURIComponent(_wppaNames[p][a]):o+"photo="+_wppaId[p][a]):""}function wppaStringContainsForbiddenChars(p){for(var a=["?","&","#","/",'"',"'"],e=0;e<a.length;){if(-1!=p.indexOf(a[e]))return!0;e++}return!1}function wppaPushStateSlide(p,a,e){if(!wppaIsMini[p]&&wppaCanPushState&&wppaUpdateAddressLine&&""!=e)try{history.pushState({page:wppaHis,occur:p,type:"slide",slide:a},"---",e),wppaConsoleLog("Slide history stack updated")}catch(p){wppaConsoleLog("Slide history stack update failed")}}function wppaRepairScriptTags(p){if(void 0===p)return"";for(;-1!=p.indexOf("[script");)p=p.replace("[script","<script");for(;-1!=p.indexOf("[/script");)p=p.replace("[/script","</script");return p}function wppaRepairBrTags(p){return void 0===p?"":p.replace("[br /]","<br />")}function wppaTrimAlt(p){return void 0===p?"":p.length>13?p.substr(0,10)+"...":p}window.onpopstate=function(p){var a=0;if(wppaCanPushState){if(p.state)switch(a=p.state.occur,p.state.type){case"html":jQuery("#wppa-container-"+a).html(p.state.html);break;case"slide":_wppaGoto(a,p.state.slide)}else if(wppaUpdateAddressLine){if(a=wppaFirstOccur,jQuery("#wppa-container-"+a).html(wppaStartHtml[a]),wppaFirstOccur=0,0==a){var e=document.location.href.split("&wppa-occur=");a=parseInt(e[1])}e=document.location.href.split("&wppa-photo=");var t=parseInt(e[1]);if(t>0){for(var o=0;o<_wppaId[a].length&&_wppaId[a][o]!=t;)o++;o<_wppaId[a].length&&_wppaGoto(a,o)}}document.getElementById("theslide0-"+a)&&_wppaStop(a)}"undefined"!=typeof wppaQRUpdate&&wppaQRUpdate(document.location.href)};var wppaFbInitBusy=!1;function wppaFbInit(){wppaFbInitBusy?wppaConsoleLog("Fb Init busy"):"undefined"!=typeof FB?(wppaFbInitBusy=!0,setTimeout("_wppaFbInit()",10)):(wppaConsoleLog("Fb wait"),setTimeout("wppaFbInit()",200))}function _wppaFbInit(){FB.init({status:!0,xfbml:!0}),wppaFbInitBusy=!1}function wppaInsertAtCursor(p,a){if(document.selection)p.focus(),sel=document.selection.createRange(),sel.text=a;else if(p.selectionStart||"0"==p.selectionStart){var e=p.selectionStart,t=p.selectionEnd;p.value=p.value.substring(0,e)+a+p.value.substring(t,p.value.length),p.selectionStart=e+a.length,p.selectionEnd=e+a.length}else p.value+=a}function wppaGeoInit(p,a,e){var t=new google.maps.LatLng(a,e),o={disableDefaultUI:!1,panControl:!1,zoomControl:!0,mapTypeControl:!0,scaleControl:!0,streetViewControl:!0,overviewMapControl:!0,zoom:10,center:t},r=new google.maps.Map(document.getElementById("map-canvas-"+p),o),s=new google.maps.Marker({position:t,map:r,title:""});google.maps.event.addListener(r,"center_changed",function(){window.setTimeout(function(){r.panTo(s.getPosition())},1e3)})}function wppaEncode(p){var a;if(void 0!==p){var e=(a=(a=p.replace(/#/g,"||HASH||")).replace(/&/g,"||AMP||")).split("+"),t=0;for(a="";t<e.length;)a+=e[t],++t<e.length&&(a+="||PLUS||");return a}}function wppaUrlToId(p){var a=p.split("/wppa/");return 1==a.length&&(a=p.split("/upload/")),1==a.length?0:a=(a=(a=(a=(a=(a=(a=a[1]).split("."))[0].replace("/","")).replace("/","")).replace("/","")).replace("/","")).replace("/","")}function wppaSuperSearchSelect(p,a){jQuery("#wppa-ss-albumopt-"+p).css("display","none"),jQuery("#wppa-ss-albumcat-"+p).css("display","none"),jQuery("#wppa-ss-albumname-"+p).css("display","none"),jQuery("#wppa-ss-albumtext-"+p).css("display","none"),jQuery("#wppa-ss-photoopt-"+p).css("display","none"),jQuery("#wppa-ss-photoname-"+p).css("display","none"),jQuery("#wppa-ss-photoowner-"+p).css("display","none"),jQuery("#wppa-ss-phototag-"+p).css("display","none"),jQuery("#wppa-ss-phototext-"+p).css("display","none"),jQuery("#wppa-ss-photoexif-"+p).css("display","none"),jQuery("#wppa-ss-photoiptc-"+p).css("display","none"),jQuery("#wppa-ss-exifopts-"+p).css("display","none"),jQuery("#wppa-ss-iptcopts-"+p).css("display","none"),jQuery("#wppa-ss-spinner-"+p).css("display","none"),jQuery("#wppa-ss-button-"+p).css("display","none");var e=jQuery("#wppa-ss-pa-"+p).val(),t="",o="",r="";switch(e){case"a":switch(jQuery("#wppa-ss-albumopt-"+p).css("display",""),t=jQuery("#wppa-ss-albumopt-"+p).val()){case"c":jQuery("#wppa-ss-albumcat-"+p).css("display","");var s=jQuery(".wppa-ss-albumcat-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"n":jQuery("#wppa-ss-albumname-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-albumname-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"t":jQuery("#wppa-ss-albumtext-"+p).css("display","");s=jQuery(".wppa-ss-albumtext-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","")}break;case"p":switch(jQuery("#wppa-ss-photoopt-"+p).css("display",""),t=jQuery("#wppa-ss-photoopt-"+p).val()){case"n":jQuery("#wppa-ss-photoname-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-photoname-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"o":jQuery("#wppa-ss-photoowner-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-photoowner-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"g":jQuery("#wppa-ss-phototag-"+p).css("display","");s=jQuery(".wppa-ss-phototag-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"t":jQuery("#wppa-ss-phototext-"+p).css("display","");var i;s=jQuery(".wppa-ss-phototext-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"i":jQuery("#wppa-ss-photoiptc-"+p).css("display",""),(o=jQuery("#wppa-ss-photoiptc-"+p).val())&&(o.length>2&&(o=o.replace("#","H")),""!=o&&(jQuery("#wppa-ss-iptcopts-"+p).css("display",""),wppaLastIptc!=o?(wppaAjaxGetSsIptcList(p,o,"wppa-ss-iptcopts-"+p),wppaLastIptc=o):null!=(r=jQuery("#wppa-ss-iptcopts-"+p).val())&&""!=r&&jQuery("#wppa-ss-button-"+p).css("display","")));break;case"e":jQuery("#wppa-ss-photoexif-"+p).css("display",""),(o=jQuery("#wppa-ss-photoexif-"+p).val())&&(o.length>2&&(o=o.replace("#","H")),""!=o&&(jQuery("#wppa-ss-exifopts-"+p).css("display",""),wppaLastExif!=o?(wppaAjaxGetSsExifList(p,o,"wppa-ss-exifopts-"+p),wppaLastExif=o):null!=(r=jQuery("#wppa-ss-exifopts-"+p).val())&&""!=r&&jQuery("#wppa-ss-button-"+p).css("display","")))}}if(a){var n=jQuery("#wppa-ss-pageurl-"+p).val();-1==n.indexOf("?")?n+="?":n+="&",n+="occur=1&wppa-supersearch="+e+","+t+","+o+","+r,document.location.href=n}}function wppaAjaxGetSsIptcList(p,a,e){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=getssiptclist&tag="+a+"&moccur="+p,async:!0,type:"GET",timeout:1e4,beforeSend:function(a){jQuery("#wppa-ss-spinner-"+p).css("display","")},success:function(a,t,o){jQuery("#"+e).html(a),jQuery("#wppa-ss-iptcopts-"+p).css("display",""),wppaSuperSearchSelect(p),setTimeout('wppaSetIptcExifSize( ".wppa-iptclist-'+p+'", "#'+e+'" )',10)},error:function(p,a,e){wppaConsoleLog("wppaAjaxGetSsIptcList failed. Error = "+e+", status = "+a,"force")},complete:function(a,e,t){jQuery("#wppa-ss-spinner-"+p).css("display","none")}})}function wppaAjaxGetSsExifList(p,a,e){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=getssexiflist&tag="+a+"&moccur="+p,async:!0,type:"GET",timeout:1e4,beforeSend:function(a){jQuery("#wppa-ss-spinner-"+p).css("display","")},success:function(a,t,o){jQuery("#"+e).html(a),jQuery("#wppa-ss-exifopts-"+p).css("display",""),wppaSuperSearchSelect(p),setTimeout('wppaSetIptcExifSize( ".wppa-exiflist-'+p+'", "#'+e+'" )',10)},error:function(p,a,e){wppaConsoleLog("wppaAjaxGetSsExifList failed. Error = "+e+", status = "+a,"force")},complete:function(a,e,t){jQuery("#wppa-ss-spinner-"+p).css("display","none")}})}function wppaSetIptcExifSize(p,a){var e=jQuery(p).length;e>6&&(e=6),e<2&&(e=2),jQuery(a).attr("size",e)}function wppaUpdateSearchRoot(p,a){for(var e=jQuery(".wppa-search-root"),t=0;t<e.length;)jQuery(e[t]).html(p),t++;for(e=jQuery(".wppa-rootbox"),t=0;t<e.length;)a?(jQuery(e[t]).removeAttr("checked"),jQuery(e[t]).removeAttr("disabled")):(jQuery(e[t]).attr("checked","checked"),jQuery(e[t]).attr("disabled","disabled")),t++;for(e=jQuery(".wppa-search-root-id"),t=0;t<e.length;)jQuery(e[t]).val(a),t++}function wppaSubboxChange(p){if("checked"==jQuery(p).attr("checked"))for(var a=jQuery(".wppa-rootbox"),e=0;e<a.length;)jQuery(a[e]).attr("checked","checked"),e++}function wppaClearSubsearch(){for(var p=jQuery(".wppa-display-searchstring"),a=0;a<p.length;)jQuery(p[a]).html(""),a++;for(p=jQuery(".wppa-search-sub-box"),a=0;a<p.length;)jQuery(p[a]).attr("disabled","disabled"),a++}function wppaEnableSubsearch(){for(var p=jQuery(".wppa-search-sub-box"),a=0;a<p.length;)jQuery(p[a]).removeAttr("disabled"),a++}function wppaDisplaySelectedFiles(p){for(var a=jQuery("#"+p),e=0,t="";e<a[0].files.length;)t+=a[0].files[e].name+" ",e++;jQuery("#"+p+"-display").val(t)}function wppaIsEmpty(p){return null==p||(void 0===p||(""==p||(0==p||(0==p||void 0))))}function wppaGetUploadOptions(yalb,mocc,where,onComplete){var options={beforeSend:function(){jQuery("#progress-"+yalb+"-"+mocc).show(),jQuery("#bar-"+yalb+"-"+mocc).width("0%"),jQuery("#message-"+yalb+"-"+mocc).html(""),jQuery("#percent-"+yalb+"-"+mocc).html("")},uploadProgress:function(p,a,e,t){jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#7F7"),jQuery("#bar-"+yalb+"-"+mocc).width(t+"%"),t<95?jQuery("#percent-"+yalb+"-"+mocc).html(t+"%"):jQuery("#percent-"+yalb+"-"+mocc).html(wppaProcessing)},success:function(){jQuery("#bar-"+yalb+"-"+mocc).width("100%"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaDone),jQuery(".wppa-upload-button").val(wppaUploadButtonText)},complete:function(response){-1!=response.responseText.indexOf(wppaUploadFailed)?(jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#F77"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaUploadFailed),jQuery("#message-"+yalb+"-"+mocc).html('<span style="font-size: 10px;" >'+response.responseText+"</span>")):(jQuery("#message-"+yalb+"-"+mocc).html('<span style="font-size: 10px;" >'+response.responseText+"</span>"),"thumb"!=where&&"cover"!=where||eval(onComplete))},error:function(){jQuery("#message-"+yalb+"-"+mocc).html('<span style="color: red;" >'+wppaServerError+"</span>"),jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#F77"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaUploadFailed)}};return options}wppaConsoleLog("wppa.js version "+wppaJsVersion+" loaded.","force");
1
+ var wppaJsVersion="6.8.09",wppaVersion="0",wppaIsIe=!1,wppaUseSvg=!0,wppaDebug,wppaFullValign=[],wppaFullHalign=[],wppaFullFrameDelta=[],wppaAnimationSpeed,wppaImageDirectory,wppaAutoColumnWidth=[],wppaAutoColumnFrac=[],wppaThumbnailAreaDelta,wppaSlideShowTimeOut=2500,wppaFadeInAfterFadeOut=!1,wppaTextFrameDelta=0,wppaBoxDelta=0,wppaPreambule=[],wppaHideWhenEmpty=!1,wppaThumbnailPitch=[],wppaFilmStripLength=[],wppaFilmStripMargin=[],wppaFilmStripAreaDelta=[],wppaFilmShowGlue=!1,wppaIsMini=[],wppaPortraitOnly=[],wppaSlideShow,wppaPhoto,wppaOf,wppaNextPhoto,wppaPreviousPhoto,wppaNextP,wppaPrevP,wppaAvgRating,wppaMyRating,wppaAvgRat,wppaMyRat,wppaDislikeMsg,wppaMiniTreshold=300,wppaStart="Start",wppaStop="Stop",wppaPleaseName,wppaPleaseEmail,wppaPleaseComment,wppaRatingOnce=!0,wppaBGcolorNumbar="transparent",wppaBcolorNumbar="transparent",wppaBGcolorNumbarActive="transparent",wppaBcolorNumbarActive="transparent",wppaFontFamilyNumbar="",wppaFontSizeNumbar="",wppaFontColorNumbar="",wppaFontWeightNumbar="",wppaFontFamilyNumbarActive="",wppaFontSizeNumbarActive="",wppaFontColorNumbarActive="",wppaFontWeightNumbarActive="",wppaNumbarMax="10",wppaAjaxUrl="",wppaLang="",wppaNextOnCallback=!1,wppaStarOpacity=.2,wppaLightBox=[],wppaEmailRequired="required",wppaSlideBorderWidth=0,wppaSlideInitRunning=[],wppaAnimationType="fadeover",wppaSlidePause=[],wppaSlideBlank=[],wppaRatingMax=5,wppaRatingDisplayType="graphic",wppaRatingPrec=2,wppaFilmPageSize=[],wppaAspectRatio=[],wppaFullSize=[],wppaStretch=!1,wppaThumbSpaceAuto=!1,wppaMinThumbSpace=4,wppaMagnifierCursor="",wppaArtMonkyLink="none",wppaAutoOpenComments=!1,wppaUpdateAddressLine=!1,wppaFilmThumbTitle="",wppaClickToView="",wppaUploadUrl="",wppaVoteForMe="",wppaVotedForMe="",wppaSlideSwipe=!0,wppaLightboxSingle=[],wppaMaxCoverWidth=300,wppaDownLoad="Download",wppaSiteUrl="",wppaWppaUrl="",wppaIncludeUrl="",wppaSlideToFullpopup=!1,wppaComAltSize=75,wppaBumpViewCount=!0,wppaBumpClickCount=!1,wppaFotomoto=!1,wppaArtMonkeyButton=!0,wppaShortQargs=!1,wppaOvlHires=!1,wppaMasonryCols=[],wppaVideoPlaying=[],wppaAudioPlaying=[],wppaSlideVideoStart=!1,wppaSlideAudioStart=!1,wppaAudioHeight=28,wppaHis=0,wppaStartHtml=[],wppaCanAjaxRender=!1,wppaCanPushState=!1,wppaAllowAjax=!0,wppaMaxOccur=0,wppaFirstOccur=0,wppaUsePhotoNamesInUrls=!1,wppaShareHideWhenRunning=!1,wppaCommentRequiredAfterVote=!0,wppaTopMoc=0,wppaColWidth=[],wppaFotomotoHideWhenRunning=!1,wppaFotomotoMinWidth=400,wppaPhotoView=[],wppaBackgroundColorImage="",wppaPopupLinkType="",wppaPopupOnclick=[],wppaThumbTargetBlank=!1,wppaRel="rel",wppaEditPhotoWidth="960",wppaThemeStyles="",wppaStickyHeaderHeight=0,wppaRenderModal=!1,wppaModalBgColor="#ffffff",wppaBoxRadius=0,wppaModalQuitImg,wppaUploadEdit="none",wppaPageArg="",wppaSlideshowNavigationType="icons",wppaCoverImageResponsive=[],wppaSearchBoxSelItems=[],wppaSlideWrap=[],wppaHideRightClick=!1,wppaProcessing="Processing...",wppaDone="Done!",wppaUploadFailed="Upload failed",wppaServerError="Server error",wppaGeoZoom=10,_wppaId=[],_wppaAvg=[],_wppaDisc=[],_wppaMyr=[],_wppaVRU=[],_wppaLinkUrl=[],_wppaLinkTitle=[],_wppaLinkTarget=[],_wppaCommentHtml=[],_wppaIptcHtml=[],_wppaExifHtml=[],_wppaToTheSame=!1,_wppaSlides=[],_wppaNames=[],_wppaFullNames=[],_wppaDsc=[],_wppaOgDsc=[],_wppaCurIdx=[],_wppaNxtIdx=[],_wppaTimeOut=[],_wppaSSRuns=[],_wppaFg=[],_wppaTP=[],_wppaIsBusy=[],_wppaFirst=[],_wppaVoteInProgress=!1,_wppaTextDelay,_wppaUrl=[],_wppaSkipRated=[],_wppaLbTitle=[],_wppaStateCount=0,_wppaDidGoto=[],_wppaShareUrl=[],_wppaShareHtml=[],_wppaFilmNoMove=[],_wppaHiresUrl=[],_wppaIsVideo=[],_wppaVideoHtml=[],_wppaAudioHtml=[],_wppaVideoNatWidth=[],_wppaVideoNatHeight=[],_wppaWaitTexts=[],_wppaImageAlt=[],__wppaOverruleRun=!1,wppaOvlUrls,wppaOvlTitles,wppaOvlAlts,wppaOvlIdx=0,wppaOvlFirst=!0,wppaOvlKbHandler="",wppaOvlSizeHandler="",wppaOvlPadTop=5,wppaOvlIsSingle,wppaOvlRunning=!1,wppaOvlVideoHtmls,wppaOvlAudioHtmls,wppaOvlVideoNaturalWidths,wppaOvlVideoNaturalHeights,wppaOvlModeInitial="normal",wppaOvlVideoPlaying=!1,wppaOvlAudioPlaying=!1,wppaOvlShowLegenda=!0,wppaOvlShowStartStop=!0,wppaOvlRadius=0,wppaOvlBorderWidth=16,wppaOvlOpen=!1,wppaOvlTxtHeight=36,wppaOvlOpacity=.8,wppaOvlOnclickType="none",wppaOvlTheme="black",wppaOvlAnimSpeed=300,wppaOvlSlideSpeed=3e3,wppaVer4WindowWidth=800,wppaVer4WindowHeight=600,wppaOvlFontFamily="Helvetica",wppaOvlFontSize="10",wppaOvlFontColor="",wppaOvlFontWeight="bold",wppaOvlLineHeight="12",wppaOvlShowCounter=!0,wppaOvlIsVideo=!1,wppaShowLegenda="",wppaOvlFsPhotoId=0,wppaPhotoId=0,wppaOvlVideoStart=!1,wppaOvlAudioStart=!1,wppaLastIptc="",wppaLastExif="",wppaIsMobile=!1,wppaSvgFillcolor="gray",wppaSvgBgcolor="transparent",wppaSvgCornerStyle="light";function wppaDoInit(p){var a=!1;for(mocc=1;mocc<=wppaTopMoc;mocc++)wppaAutoColumnWidth[mocc]&&(wppaColWidth[mocc]=0,_wppaDoAutocol(mocc),a=!0);p||(_wppaTextDelay=wppaAnimationSpeed,wppaFadeInAfterFadeOut&&(_wppaTextDelay*=2),a&&jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++)wppaAutoColumnWidth[mocc]&&(wppaColWidth[mocc]=0,_wppaDoAutocol(mocc))})),jQuery(".wppa-ajax-spin").stop().fadeOut(),setTimeout(function(){jQuery(".wppa-ajax-spin").stop().fadeOut()},1e3),jQuery(".wppa-ovl-spin").stop().fadeOut(),setTimeout(function(){jQuery(".wppa-ovl-spin").stop().fadeOut()},1e3),setTimeout(function(){for(var p=1;p<wppaTopMoc;)jQuery("ubb-"+p+"-l")&&(wppaUbb(p,"l","hide"),wppaUbb(p,"r","hide")),p++},3e3),wppaProtect()}function wppaProtect(){wppaHideRightClick&&(jQuery("img").bind("contextmenu",function(p){return!1}),jQuery("video").bind("contextmenu",function(p){return!1}))}function wppaUpdateLightboxes(){"function"==typeof wppaInitOverlay&&wppaInitOverlay(),"undefined"!=typeof myLightbox&&"function"==typeof myLightbox.updateImageList&&myLightbox.updateImageList(),jQuery().prettyPhoto&&jQuery("a[rel^='prettyPhoto']").prettyPhoto({deeplinking:!1})}function wppaStopVideo(p){var a,e,t=[];for(t[1]="wppa-overlay-img",t[2]="theimg0-"+p,t[3]="theimg1-"+p,e=0;e<3;)1==++e&&0!=p||(a=document.getElementById(t[e]))&&"function"==typeof a.pause&&(a.pause(),wppaConsoleLog("Video "+t[e]+" paused","force"))}function wppaStopAudio(p){if("number"==typeof p)jQuery("#audio-"+p).pause&&jQuery("#audio-"+p).pause();else{var a=jQuery("audio");if(a.length>0)for(var e=0;e<a.length;)"wppa"==jQuery(a[e]).attr("data-from")&&a[e].pause(),e++}}function wppaMakeFullsizeUrl(p){var a,e;(a=(p=p.replace("/thumbs/","/")).split("//"))[1]?(e=a[1].split("/"),p=a[0]+"//"):(e=a[0].split("/"),p="");for(var t=0;t<e.length;){var o=e[t];"w"!=o.split("_")[0]&&(0!=t&&(p+="/"),p+=o),t++}return p}function wppaGetContainerWidth(p){var a=document.getElementById("wppa-container-"+p),e=0;if(!wppaAutoColumnWidth[p])return a.clientWidth;for(;0==e;)a=a.parentNode,e=jQuery(a).width();return parseInt(e*wppaAutoColumnFrac[p])}function _wppaDoAutocol(p){var a;if(wppaAutoColumnWidth[p]&&(a=wppaGetContainerWidth(p),wppaColWidth[p]!=a)){wppaConsoleLog("Doing autocol "+p),wppaColWidth[p]=a,jQuery(".wppa-container-"+p).css("width",a),wppaRenderModal&&(jQuery(".ui-dialog").css("width",a),jQuery(".ui-dialog").attr("height","auto")),wppaCoverImageResponsive[p]||(jQuery(".wppa-asym-text-frame-"+p).css("width",a-wppaTextFrameDelta),jQuery(".wppa-cover-box-"+p).css("width",a));var e,t=jQuery(".wppa-cover-box-mcr-"+p);if(t.length>1){var o=parseInt((a+8)/(wppaMaxCoverWidth+8))+1,r=o-1;e=parseInt((a+8)/o-8);for(var s=0;s<t.length;){switch(s%o){case 0:jQuery(t[s]).css({marginLeft:"0px",clear:"both",float:"left"});break;case r:jQuery(t[s]).css({marginLeft:"8px",clear:"none",float:"right"});break;default:jQuery(t[s]).css({marginLeft:"8px",clear:"none",float:"left"})}s++}wppaCoverImageResponsive[p]||jQuery(".wppa-asym-text-frame-mcr-"+p).css("width",e-wppaTextFrameDelta),jQuery(".wppa-cover-box-mcr-"+p).css("width",e)}else if(wppaCoverImageResponsive[p]);else{jQuery(".wppa-asym-text-frame-mcr-"+p).css("width",a-wppaTextFrameDelta);jQuery(".wppa-cover-box-mcr-"+p).css({marginLeft:"0px",float:"left"})}if(wppaThumbSpaceAuto){var i=parseInt(jQuery(".thumbnail-frame-"+p).css("width"));if(i){var n=a-wppaThumbnailAreaDelta-7,l=parseInt(n/(i+wppaMinThumbSpace)),w=parseInt(.5+(n-l*i)/(l+1));jQuery(".thumbnail-frame-"+p).css({marginLeft:w})}}jQuery(".thumbnail-frame-comalt-"+p).css("width",a-wppaThumbnailAreaDelta),jQuery(".wppa-com-alt-"+p).css("width",a-wppaThumbnailAreaDelta-wppaComAltSize-16);for(var u,c=1,d=jQuery("#wppa-mas-h-"+c+"-"+p).attr("data-height-perc");d;)u=d*(a-wppaThumbnailAreaDelta)/100,jQuery("#wppa-mas-h-"+c+"-"+p).css("height",u),c++,d=jQuery("#wppa-mas-h-"+c+"-"+p).attr("data-height-perc");wppaSetMasHorFrameWidthsForIeAndChrome(p),wppaFormatSlide(p),jQuery("#audio-slide-"+p).css("width",a-wppaBoxDelta-6),jQuery(".wppa-comment-textarea-"+p).css("width",.7*a),wppaFilmStripLength[p]=a-wppaFilmStripAreaDelta[p],jQuery("#filmwindow-"+p).css("width",wppaFilmStripLength[p]),_wppaAdjustFilmstrip(p),wppaIsMini[p]||void 0===_wppaSlides[p]||(wppaColWidth[p]<wppaMiniTreshold?(jQuery("#wppa-avg-rat-"+p).html(wppaAvgRat),jQuery("#wppa-my-rat-"+p).html(wppaMyRat),jQuery("#counter-"+p).html(_wppaCurIdx[p]+1+" / "+_wppaSlides[p].length)):(jQuery("#wppa-avg-rat-"+p).html(wppaAvgRating),jQuery("#wppa-my-rat-"+p).html(wppaMyRating),jQuery("#counter-"+p).html(wppaPhoto+" "+(_wppaCurIdx[p]+1)+" "+wppaOf+" "+_wppaSlides[p].length))),jQuery(".wppa-sphoto-"+p).css("width",a),jQuery(".wppa-simg-"+p).css("width",a-2*wppaSlideBorderWidth),jQuery(".wppa-simg-"+p).css("height",""),jQuery(".wppa-mphoto-"+p).css("width",a+10),jQuery(".wppa-mimg-"+p).css("width",a),jQuery(".wppa-mimg-"+p).css("height",""),wppaSearchBoxSelItems[p]>0&&(a/wppaSearchBoxSelItems[p]<125?jQuery(".wppa-searchsel-item-"+p).css("width","100%"):jQuery(".wppa-searchsel-item-"+p).css("width",100/wppaSearchBoxSelItems[p]+"%")),jQuery(".wppa-upload-album-"+p).css("maxWidth",.6*a)}}function wppaSetMasHorFrameWidthsForIeAndChrome(p){for(var a=jQuery(".wppa-mas-h-"+p),e=wppaMinThumbSpace,t=0;t<a.length;t++){var o=wppaGetChildI(a[t]);if(o){if("IMG"==o.nodeName&&!o.complete)return void setTimeout("wppaSetMasHorFrameWidthsForIeAndChrome( "+p+" )",400);var r=o.naturalWidth/o.naturalHeight*o.height+e;jQuery(a[t]).css({width:r})}}}function wppaGetChildI(p){var a,e=p.childNodes;for(a=0;a<e.length;a++){var t=e[a];if(t.id&&"i-"==t.id.substr(0,2))return t;var o=wppaGetChildI(t);if(o)return o}return!1}jQuery(document).ready(function(){wppaDoInit(!1),setTimeout(function(){wppaDoInit(!0)},1e3)}),jQuery(document).ready(function(p){if(wppaAllowAjax&&jQuery.ajax&&(wppaCanAjaxRender=!0),void 0!==history.pushState){for(var a=1;a<=wppaMaxOccur;)wppaStartHtml[a]=jQuery("#wppa-container-"+a).html(),a++;wppaCanPushState=!0}});var wppaFotomotoLoaded=!1,wppaFotomotoToolbarIds=[];function fotomoto_loaded(){wppaFotomotoLoaded=!0}function wppaFotomotoToolbar(p,a){if(!(wppaColWidth[p]>=wppaFotomotoMinWidth))return jQuery("#wppa-fotomoto-container-"+p).css("display","none"),void jQuery("#wppa-fotomoto-checkout-"+p).css("display","none");jQuery("#wppa-fotomoto-container-"+p).css("display","inline"),jQuery("#wppa-fotomoto-checkout-"+p).css("display","inline"),wppaFotomoto&&document.getElementById("wppa-fotomoto-container-"+p)&&(wppaFotomotoLoaded?(FOTOMOTO.API.checkinImage(a),wppaFotomotoToolbarIds[p]=FOTOMOTO.API.showToolbar("wppa-fotomoto-container-"+p,a)):(setTimeout("wppaFotomotoToolbar( "+p+',"'+a+'" )',200),wppaConsoleLog("Waiting for Fotomoto")))}function wppaFotomotoHide(p){jQuery("#wppa-fotomoto-container-"+p).css("display","none"),jQuery("#wppa-fotomoto-checkout-"+p).css("display","none")}function wppaGetCurrentFullUrl(p,a){var e,t,o,r=document.location.href.split("?"),s="nil",i=0,n=!0;o=wppaShortQargs?"":"wppa-",r[1]&&(s=r[1].split("&"));var l=!1;if(e=r[0],"nil"!=s&&s.length>0)for(;i<s.length;)(t=s[i].split("="))[0]==o+"album"&&(l=!0),t[0]!=o+"photo"&&(e+=n?"?":"&",n=!1,e+=s[i]),i++;return l?(e+=n?"?":"&",e+=wppaUsePhotoNamesInUrls?o+"photo="+encodeURIComponent(_wppaNames[p][a]):o+"photo="+_wppaId[p][a]):""}function wppaStringContainsForbiddenChars(p){for(var a=["?","&","#","/",'"',"'"],e=0;e<a.length;){if(-1!=p.indexOf(a[e]))return!0;e++}return!1}function wppaPushStateSlide(p,a,e){if(!wppaIsMini[p]&&wppaCanPushState&&wppaUpdateAddressLine&&""!=e)try{history.pushState({page:wppaHis,occur:p,type:"slide",slide:a},"---",e),wppaConsoleLog("Slide history stack updated")}catch(p){wppaConsoleLog("Slide history stack update failed")}}function wppaRepairScriptTags(p){if(void 0===p)return"";for(;-1!=p.indexOf("[script");)p=p.replace("[script","<script");for(;-1!=p.indexOf("[/script");)p=p.replace("[/script","</script");return p}function wppaRepairBrTags(p){return void 0===p?"":p.replace("[br /]","<br />")}function wppaTrimAlt(p){return void 0===p?"":p.length>13?p.substr(0,10)+"...":p}window.onpopstate=function(p){var a=0;if(wppaCanPushState){if(p.state)switch(a=p.state.occur,p.state.type){case"html":jQuery("#wppa-container-"+a).html(p.state.html);break;case"slide":_wppaGoto(a,p.state.slide)}else if(wppaUpdateAddressLine){if(a=wppaFirstOccur,jQuery("#wppa-container-"+a).html(wppaStartHtml[a]),wppaFirstOccur=0,0==a){var e=document.location.href.split("&wppa-occur=");a=parseInt(e[1])}e=document.location.href.split("&wppa-photo=");var t=parseInt(e[1]);if(t>0){for(var o=0;o<_wppaId[a].length&&_wppaId[a][o]!=t;)o++;o<_wppaId[a].length&&_wppaGoto(a,o)}}document.getElementById("theslide0-"+a)&&_wppaStop(a)}"undefined"!=typeof wppaQRUpdate&&wppaQRUpdate(document.location.href)};var wppaFbInitBusy=!1;function wppaFbInit(){wppaFbInitBusy?wppaConsoleLog("Fb Init busy"):"undefined"!=typeof FB?(wppaFbInitBusy=!0,setTimeout("_wppaFbInit()",10)):(wppaConsoleLog("Fb wait"),setTimeout("wppaFbInit()",200))}function _wppaFbInit(){FB.init({status:!0,xfbml:!0}),wppaFbInitBusy=!1}function wppaInsertAtCursor(p,a){if(document.selection)p.focus(),sel=document.selection.createRange(),sel.text=a;else if(p.selectionStart||"0"==p.selectionStart){var e=p.selectionStart,t=p.selectionEnd;p.value=p.value.substring(0,e)+a+p.value.substring(t,p.value.length),p.selectionStart=e+a.length,p.selectionEnd=e+a.length}else p.value+=a}function wppaGeoInit(p,a,e){var t=new google.maps.LatLng(a,e),o={disableDefaultUI:!1,panControl:!1,zoomControl:!0,mapTypeControl:!0,scaleControl:!0,streetViewControl:!0,overviewMapControl:!0,zoom:wppaGeoZoom,center:t},r=new google.maps.Map(document.getElementById("map-canvas-"+p),o),s=new google.maps.Marker({position:t,map:r,title:""});google.maps.event.addListener(r,"center_changed",function(){window.setTimeout(function(){r.panTo(s.getPosition())},1e3)})}function wppaEncode(p){var a;if(void 0!==p){var e=(a=(a=p.replace(/#/g,"||HASH||")).replace(/&/g,"||AMP||")).split("+"),t=0;for(a="";t<e.length;)a+=e[t],++t<e.length&&(a+="||PLUS||");return a}}function wppaUrlToId(p){var a=p.split("/wppa/");return 1==a.length&&(a=p.split("/upload/")),1==a.length?0:a=(a=(a=(a=(a=(a=(a=a[1]).split("."))[0].replace("/","")).replace("/","")).replace("/","")).replace("/","")).replace("/","")}function wppaSuperSearchSelect(p,a){jQuery("#wppa-ss-albumopt-"+p).css("display","none"),jQuery("#wppa-ss-albumcat-"+p).css("display","none"),jQuery("#wppa-ss-albumname-"+p).css("display","none"),jQuery("#wppa-ss-albumtext-"+p).css("display","none"),jQuery("#wppa-ss-photoopt-"+p).css("display","none"),jQuery("#wppa-ss-photoname-"+p).css("display","none"),jQuery("#wppa-ss-photoowner-"+p).css("display","none"),jQuery("#wppa-ss-phototag-"+p).css("display","none"),jQuery("#wppa-ss-phototext-"+p).css("display","none"),jQuery("#wppa-ss-photoexif-"+p).css("display","none"),jQuery("#wppa-ss-photoiptc-"+p).css("display","none"),jQuery("#wppa-ss-exifopts-"+p).css("display","none"),jQuery("#wppa-ss-iptcopts-"+p).css("display","none"),jQuery("#wppa-ss-spinner-"+p).css("display","none"),jQuery("#wppa-ss-button-"+p).css("display","none");var e=jQuery("#wppa-ss-pa-"+p).val(),t="",o="",r="";switch(e){case"a":switch(jQuery("#wppa-ss-albumopt-"+p).css("display",""),t=jQuery("#wppa-ss-albumopt-"+p).val()){case"c":jQuery("#wppa-ss-albumcat-"+p).css("display","");var s=jQuery(".wppa-ss-albumcat-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"n":jQuery("#wppa-ss-albumname-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-albumname-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"t":jQuery("#wppa-ss-albumtext-"+p).css("display","");s=jQuery(".wppa-ss-albumtext-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","")}break;case"p":switch(jQuery("#wppa-ss-photoopt-"+p).css("display",""),t=jQuery("#wppa-ss-photoopt-"+p).val()){case"n":jQuery("#wppa-ss-photoname-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-photoname-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"o":jQuery("#wppa-ss-photoowner-"+p).css("display",""),null!=(r=jQuery("#wppa-ss-photoowner-"+p).val())&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"g":jQuery("#wppa-ss-phototag-"+p).css("display","");s=jQuery(".wppa-ss-phototag-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"t":jQuery("#wppa-ss-phototext-"+p).css("display","");var i;s=jQuery(".wppa-ss-phototext-"+p);for(r="",i=0;i<s.length;i++)"selected"==jQuery(s[i]).attr("selected")&&(r+="."+jQuery(s[i]).val());""!=(r=r.substr(1))&&jQuery("#wppa-ss-button-"+p).css("display","");break;case"i":jQuery("#wppa-ss-photoiptc-"+p).css("display",""),(o=jQuery("#wppa-ss-photoiptc-"+p).val())&&(o.length>2&&(o=o.replace("#","H")),""!=o&&(jQuery("#wppa-ss-iptcopts-"+p).css("display",""),wppaLastIptc!=o?(wppaAjaxGetSsIptcList(p,o,"wppa-ss-iptcopts-"+p),wppaLastIptc=o):null!=(r=jQuery("#wppa-ss-iptcopts-"+p).val())&&""!=r&&jQuery("#wppa-ss-button-"+p).css("display","")));break;case"e":jQuery("#wppa-ss-photoexif-"+p).css("display",""),(o=jQuery("#wppa-ss-photoexif-"+p).val())&&(o.length>2&&(o=o.replace("#","H")),""!=o&&(jQuery("#wppa-ss-exifopts-"+p).css("display",""),wppaLastExif!=o?(wppaAjaxGetSsExifList(p,o,"wppa-ss-exifopts-"+p),wppaLastExif=o):null!=(r=jQuery("#wppa-ss-exifopts-"+p).val())&&""!=r&&jQuery("#wppa-ss-button-"+p).css("display","")))}}if(a){var n=jQuery("#wppa-ss-pageurl-"+p).val();-1==n.indexOf("?")?n+="?":n+="&",n+="occur=1&wppa-supersearch="+e+","+t+","+o+","+r,document.location.href=n}}function wppaAjaxGetSsIptcList(p,a,e){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=getssiptclist&tag="+a+"&moccur="+p,async:!0,type:"GET",timeout:1e4,beforeSend:function(a){jQuery("#wppa-ss-spinner-"+p).css("display","")},success:function(a,t,o){jQuery("#"+e).html(a),jQuery("#wppa-ss-iptcopts-"+p).css("display",""),wppaSuperSearchSelect(p),setTimeout('wppaSetIptcExifSize( ".wppa-iptclist-'+p+'", "#'+e+'" )',10)},error:function(p,a,e){wppaConsoleLog("wppaAjaxGetSsIptcList failed. Error = "+e+", status = "+a,"force")},complete:function(a,e,t){jQuery("#wppa-ss-spinner-"+p).css("display","none")}})}function wppaAjaxGetSsExifList(p,a,e){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=getssexiflist&tag="+a+"&moccur="+p,async:!0,type:"GET",timeout:1e4,beforeSend:function(a){jQuery("#wppa-ss-spinner-"+p).css("display","")},success:function(a,t,o){jQuery("#"+e).html(a),jQuery("#wppa-ss-exifopts-"+p).css("display",""),wppaSuperSearchSelect(p),setTimeout('wppaSetIptcExifSize( ".wppa-exiflist-'+p+'", "#'+e+'" )',10)},error:function(p,a,e){wppaConsoleLog("wppaAjaxGetSsExifList failed. Error = "+e+", status = "+a,"force")},complete:function(a,e,t){jQuery("#wppa-ss-spinner-"+p).css("display","none")}})}function wppaSetIptcExifSize(p,a){var e=jQuery(p).length;e>6&&(e=6),e<2&&(e=2),jQuery(a).attr("size",e)}function wppaUpdateSearchRoot(p,a){for(var e=jQuery(".wppa-search-root"),t=0;t<e.length;)jQuery(e[t]).html(p),t++;for(e=jQuery(".wppa-rootbox"),t=0;t<e.length;)a?(jQuery(e[t]).removeAttr("checked"),jQuery(e[t]).removeAttr("disabled")):(jQuery(e[t]).attr("checked","checked"),jQuery(e[t]).attr("disabled","disabled")),t++;for(e=jQuery(".wppa-search-root-id"),t=0;t<e.length;)jQuery(e[t]).val(a),t++}function wppaSubboxChange(p){if("checked"==jQuery(p).attr("checked"))for(var a=jQuery(".wppa-rootbox"),e=0;e<a.length;)jQuery(a[e]).attr("checked","checked"),e++}function wppaClearSubsearch(){for(var p=jQuery(".wppa-display-searchstring"),a=0;a<p.length;)jQuery(p[a]).html(""),a++;for(p=jQuery(".wppa-search-sub-box"),a=0;a<p.length;)jQuery(p[a]).attr("disabled","disabled"),a++}function wppaEnableSubsearch(){for(var p=jQuery(".wppa-search-sub-box"),a=0;a<p.length;)jQuery(p[a]).removeAttr("disabled"),a++}function wppaDisplaySelectedFiles(p){for(var a=jQuery("#"+p),e=0,t="";e<a[0].files.length;)t+=a[0].files[e].name+" ",e++;jQuery("#"+p+"-display").val(t)}function wppaIsEmpty(p){return null==p||(void 0===p||(""==p||(0==p||(0==p||void 0))))}function wppaGetUploadOptions(yalb,mocc,where,onComplete){var options={beforeSend:function(){jQuery("#progress-"+yalb+"-"+mocc).show(),jQuery("#bar-"+yalb+"-"+mocc).width("0%"),jQuery("#message-"+yalb+"-"+mocc).html(""),jQuery("#percent-"+yalb+"-"+mocc).html("")},uploadProgress:function(p,a,e,t){jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#7F7"),jQuery("#bar-"+yalb+"-"+mocc).width(t+"%"),t<95?jQuery("#percent-"+yalb+"-"+mocc).html(t+"%"):jQuery("#percent-"+yalb+"-"+mocc).html(wppaProcessing)},success:function(){jQuery("#bar-"+yalb+"-"+mocc).width("100%"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaDone),jQuery(".wppa-upload-button").val(wppaUploadButtonText)},complete:function(response){-1!=response.responseText.indexOf(wppaUploadFailed)?(jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#F77"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaUploadFailed),jQuery("#message-"+yalb+"-"+mocc).html('<span style="font-size: 10px;" >'+response.responseText+"</span>")):(jQuery("#message-"+yalb+"-"+mocc).html('<span style="font-size: 10px;" >'+response.responseText+"</span>"),"thumb"!=where&&"cover"!=where||eval(onComplete))},error:function(){jQuery("#message-"+yalb+"-"+mocc).html('<span style="color: red;" >'+wppaServerError+"</span>"),jQuery("#bar-"+yalb+"-"+mocc).css("backgroundColor","#F77"),jQuery("#percent-"+yalb+"-"+mocc).html(wppaUploadFailed)}};return options}wppaConsoleLog("wppa.js version "+wppaJsVersion+" loaded.","force");
readme.txt CHANGED
@@ -130,7 +130,7 @@ See for the full changelog: <a href="http://www.wppa.nl/changelog/" >The documen
130
 
131
  = 6.8.09
132
 
133
- * This version addresses various bug fixes.
134
 
135
  = 6.8.08 =
136
 
130
 
131
  = 6.8.09
132
 
133
+ * This version addresses various bug fixes and code edits.
134
 
135
  = 6.8.08 =
136
 
wppa-admin-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * gp admin functions
6
- * Version 6.8.00
7
  *
8
  */
9
 
@@ -152,7 +152,6 @@ global $wpdb;
152
  $modified_time = $photo['modified'];
153
  if ( $modified_time < $start_time ) {
154
  wppa_update_single_photo( $file, $photo['id'], $filename );
155
- // $wpdb->query( $wpdb->prepare( 'UPDATE `'.WPPA_PHOTOS.'` SET `modified` = %s WHERE `id` = %s', time(), $photo['id'] ) );
156
  $count++;
157
  }
158
  if ( wppa_is_time_up( $count ) ) {
@@ -162,7 +161,6 @@ global $wpdb;
162
  else { // No photo yet
163
  if ( wppa_switch( 'remake_add' ) ) {
164
  wppa_insert_photo( $file, $album['id'], $filename );
165
- // $wpdb->query( $wpdb->prepare( 'UPDATE `'.WPPA_PHOTOS.'` SET `modified` = %s WHERE `id` = %s', time(), $photo['id'] ) );
166
  $count++;
167
  }
168
  }
@@ -173,6 +171,7 @@ global $wpdb;
173
  }
174
  }
175
  }
 
176
  // Do it with a single photo
177
  elseif ( $pid ) {
178
  $photo = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `id` = %s", $pid ), ARRAY_A );
@@ -545,163 +544,6 @@ global $wppa_supported_audio_extensions;
545
  return $count;
546
  }
547
 
548
- function wppa_check_database( $verbose = false ) {
549
- global $wpdb;
550
- static $everything_ok;
551
-
552
- if ( $everything_ok === true ) {
553
- return true;
554
- }
555
-
556
- $any_error = false;
557
- // Check db tables
558
- // This is to test if dbdelta did his job in adding tables and columns
559
- $tn = array( WPPA_ALBUMS, WPPA_PHOTOS, WPPA_RATING, WPPA_COMMENTS, WPPA_IPTC, WPPA_EXIF, WPPA_INDEX );
560
- $flds = array( WPPA_ALBUMS => array( 'id' => 'bigint( 20 ) NOT NULL',
561
- 'name' => 'text NOT NULL',
562
- 'description' => 'text NOT NULL',
563
- 'a_order' => 'smallint( 5 ) unsigned NOT NULL',
564
- 'main_photo' => 'bigint( 20 ) NOT NULL',
565
- 'a_parent' => 'bigint( 20 ) NOT NULL',
566
- 'p_order_by' => 'int unsigned NOT NULL',
567
- 'cover_linktype' => 'tinytext NOT NULL',
568
- 'cover_linkpage' => 'bigint( 20 ) NOT NULL',
569
- 'owner' => 'text NOT NULL',
570
- 'timestamp' => 'tinytext NOT NULL',
571
- 'upload_limit' => 'tinytext NOT NULL',
572
- 'alt_thumbsize' => 'tinytext NOT NULL',
573
- 'default_tags' => 'tinytext NOT NULL',
574
- 'cover_type' => 'tinytext NOT NULL',
575
- 'suba_order_by' => 'tinytext NOT NULL'
576
- ),
577
- WPPA_PHOTOS => array( 'id' => 'bigint( 20 ) NOT NULL',
578
- 'album' => 'bigint( 20 ) NOT NULL',
579
- 'ext' => 'tinytext NOT NULL',
580
- 'name' => 'text NOT NULL',
581
- 'description' => 'longtext NOT NULL',
582
- 'p_order' => 'smallint( 5 ) unsigned NOT NULL',
583
- 'mean_rating' => 'tinytext NOT NULL',
584
- 'linkurl' => 'text NOT NULL',
585
- 'linktitle' => 'text NOT NULL',
586
- 'linktarget' => 'tinytext NOT NULL',
587
- 'owner' => 'text NOT NULL',
588
- 'timestamp' => 'tinytext NOT NULL',
589
- 'status' => 'tinytext NOT NULL',
590
- 'rating_count' => "bigint( 20 ) default '0'",
591
- 'tags' => 'tinytext NOT NULL',
592
- 'alt' => 'tinytext NOT NULL',
593
- 'filename' => 'tinytext NOT NULL',
594
- 'modified' => 'tinytext NOT NULL',
595
- 'location' => 'tinytext NOT NULL'
596
- ),
597
- WPPA_RATING => array( 'id' => 'bigint( 20 ) NOT NULL',
598
- 'photo' => 'bigint( 20 ) NOT NULL',
599
- 'value' => 'smallint( 5 ) NOT NULL',
600
- 'user' => 'text NOT NULL'
601
- ),
602
- WPPA_COMMENTS => array(
603
- 'id' => 'bigint( 20 ) NOT NULL',
604
- 'timestamp' => 'tinytext NOT NULL',
605
- 'photo' => 'bigint( 20 ) NOT NULL',
606
- 'user' => 'text NOT NULL',
607
- 'ip' => 'tinytext NOT NULL',
608
- 'email' => 'text NOT NULL',
609
- 'comment' => 'text NOT NULL',
610
- 'status' => 'tinytext NOT NULL'
611
- ),
612
- WPPA_IPTC => array(
613
- 'id' => 'bigint( 20 ) NOT NULL',
614
- 'photo' => 'bigint( 20 ) NOT NULL',
615
- 'tag' => 'tinytext NOT NULL',
616
- 'description' => 'text NOT NULL',
617
- 'status' => 'tinytext NOT NULL'
618
- ),
619
- WPPA_EXIF => array(
620
- 'id' => 'bigint( 20 ) NOT NULL',
621
- 'photo' => 'bigint( 20 ) NOT NULL',
622
- 'tag' => 'tinytext NOT NULL',
623
- 'description' => 'text NOT NULL',
624
- 'status' => 'tinytext NOT NULL'
625
- ),
626
- WPPA_INDEX => array(
627
- 'id' => 'bigint( 20 ) NOT NULL',
628
- 'slug' => 'tinytext NOT NULL',
629
- 'albums' => 'text NOT NULL',
630
- 'photos' => 'text NOT NULL'
631
- )
632
- );
633
- $errtxt = '';
634
- $idx = 0;
635
- while ( $idx < 7 ) {
636
- // Test existence of table
637
- $ext = wppa_table_exists( $tn[$idx] );
638
- if ( ! $ext ) {
639
- if ( $verbose ) wppa_error_message( __( 'Unexpected error:' , 'wp-photo-album-plus').' '.__( 'Missing database table:' , 'wp-photo-album-plus').' '.$tn[$idx], 'red', 'force' );
640
- $any_error = true;
641
- }
642
- // Test columns
643
- else {
644
- $tablefields = $wpdb->get_results( "DESCRIBE {$tn[$idx]};", "ARRAY_A" );
645
- // unset flags for found fields
646
- foreach ( $tablefields as $field ) {
647
- if ( isset( $flds[$tn[$idx]][$field['Field']] ) ) unset( $flds[$tn[$idx]][$field['Field']] );
648
- }
649
- // Fields left?
650
- if ( is_array( $flds[$tn[$idx]] ) ) foreach ( array_keys( $flds[$tn[$idx]] ) as $field ) {
651
- $errtxt .= '<tr><td>'.$tn[$idx].'</td><td>'.$field.'</td><td>'.$flds[$tn[$idx]][$field].'</td></tr>';
652
- }
653
- }
654
- $idx++;
655
- }
656
- if ( $errtxt ) {
657
- $fulltxt = 'The latest update failed to update the database tables required for wppa+ to function properly<br /><br />';
658
- $fulltxt .= 'Make sure you have the rights to issue SQL commands like <i>"ALTER TABLE tablename ADD COLUMN columname datatype"</i> and run the action on <i>Table VIII-A1</i> on the Photo Albums -> Settings admin page.<br /><br />';
659
- $fulltxt .= 'The following table lists the missing columns:';
660
- $fulltxt .= '<br /><table id="wppa-err-table"><thead style="font-weight:bold;"><tr><td>Table name</td><td>Column name</td><td>Data type</td></thead>';
661
- $fulltxt .= $errtxt;
662
- $fulltxt .= '</table><b>';
663
- if ( $verbose ) wppa_error_message( $fulltxt, 'red', 'force' );
664
- $any_error = true;
665
- }
666
- // Check directories
667
- $dn = array( dirname(WPPA_DEPOT_PATH), WPPA_UPLOAD_PATH, WPPA_UPLOAD_PATH.'/thumbs', WPPA_UPLOAD_PATH.'/temp', WPPA_UPLOAD_PATH.'/fonts', WPPA_DEPOT_PATH );
668
- $idx = 0;
669
- while ( $idx < 6 ) {
670
- if ( ! file_exists( $dn[$idx] ) ) { // First try to repair
671
- wppa_mktree( $dn[$idx] );
672
- }
673
- else {
674
- wppa_chmod( $dn[$idx] ); // there are always people who destruct things
675
- }
676
-
677
- if ( ! file_exists( $dn[$idx] ) ) { // Test again
678
- if ( $verbose ) wppa_error_message( __( 'Unexpected error:' , 'wp-photo-album-plus').' '.__( 'Missing directory:' , 'wp-photo-album-plus').' '.$dn[$idx], 'red', 'force' );
679
- $any_error = true;
680
- }
681
- elseif ( ! is_writable( $dn[$idx] ) ) {
682
- if ( $verbose ) wppa_error_message( __( 'Unexpected error:' , 'wp-photo-album-plus').' '.__( 'Directory is not writable:' , 'wp-photo-album-plus').' '.$dn[$idx], 'red', 'force' );
683
- $any_error = true;
684
- }
685
- elseif ( ! is_readable( $dn[$idx] ) ) {
686
- if ( $verbose ) wppa_error_message( __( 'Unexpected error:' , 'wp-photo-album-plus').' '.__( 'Directory is not readable:' , 'wp-photo-album-plus').' '.$dn[$idx], 'red', 'force' );
687
- $any_error = true;
688
- }
689
- $idx++;
690
- }
691
-
692
- // Report errors
693
- if ( $any_error ) {
694
- if ( $verbose ) wppa_error_message( __( 'Please de-activate and re-activate the plugin. If this problem persists, ask your administrator.' , 'wp-photo-album-plus'), 'red', 'force' );
695
- }
696
-
697
- // No errors, save result
698
- else {
699
- $everything_ok = true;
700
- }
701
-
702
- return ! $any_error; // True = no error
703
- }
704
-
705
  function wppa_admin_page_links( $curpage, $pagesize, $count, $link, $extra = '' ) {
706
 
707
  if ( $pagesize < '1' ) return; // Pagination is off
3
  * Package: wp-photo-album-plus
4
  *
5
  * gp admin functions
6
+ * Version 6.8.09
7
  *
8
  */
9
 
152
  $modified_time = $photo['modified'];
153
  if ( $modified_time < $start_time ) {
154
  wppa_update_single_photo( $file, $photo['id'], $filename );
 
155
  $count++;
156
  }
157
  if ( wppa_is_time_up( $count ) ) {
161
  else { // No photo yet
162
  if ( wppa_switch( 'remake_add' ) ) {
163
  wppa_insert_photo( $file, $album['id'], $filename );
 
164
  $count++;
165
  }
166
  }
171
  }
172
  }
173
  }
174
+
175
  // Do it with a single photo
176
  elseif ( $pid ) {
177
  $photo = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `id` = %s", $pid ), ARRAY_A );
544
  return $count;
545
  }
546
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
547
  function wppa_admin_page_links( $curpage, $pagesize, $count, $link, $extra = '' ) {
548
 
549
  if ( $pagesize < '1' ) return; // Pagination is off
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.8.05
7
  *
8
  */
9
 
@@ -14,8 +14,6 @@ function _wppa_admin() {
14
  global $q_config;
15
  global $wppa_revno;
16
 
17
- if ( get_option('wppa_revision') != $wppa_revno ) wppa_check_database(true);
18
-
19
  echo '
20
  <script type="text/javascript" >
21
  /* <![CDATA[ */
@@ -1105,10 +1103,10 @@ function wppaTryScheduleAll( id ) {
1105
  else {
1106
  $full = true;
1107
  }
1108
-
1109
  // Goto Upload
1110
  if ( current_user_can( 'wppa_upload' ) ) {
1111
-
1112
  $onc = ( $full ?
1113
  'alert(\''.__('Change the upload limit or remove photos to enable new uploads.', 'wp-photo-album-plus').'\')' :
1114
  'document.location = \''.wppa_dbg_url(get_admin_url()).'/admin.php?page=wppa_upload_photos&wppa-set-album='.$id.'\''
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
+ * Version 6.8.09
7
  *
8
  */
9
 
14
  global $q_config;
15
  global $wppa_revno;
16
 
 
 
17
  echo '
18
  <script type="text/javascript" >
19
  /* <![CDATA[ */
1103
  else {
1104
  $full = true;
1105
  }
1106
+
1107
  // Goto Upload
1108
  if ( current_user_can( 'wppa_upload' ) ) {
1109
+
1110
  $onc = ( $full ?
1111
  'alert(\''.__('Change the upload limit or remove photos to enable new uploads.', 'wp-photo-album-plus').'\')' :
1112
  'document.location = \''.wppa_dbg_url(get_admin_url()).'/admin.php?page=wppa_upload_photos&wppa-set-album='.$id.'\''
wppa-breadcrumb.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Functions for breadcrumbs
6
- * Version 6.8.01
7
  *
8
  */
9
 
@@ -137,7 +137,7 @@ global $wppa_session;
137
  $hash = '#album-' . $a . '-';
138
  }
139
  }
140
- wppa_bcitem( $value, $href, $title, 'b3', $ajax, $hash );
141
  }
142
 
143
  // The album ( grand ) parents if not separate
@@ -216,7 +216,7 @@ global $wppa_session;
216
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
217
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
218
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
219
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
220
  }
221
 
222
  $href = '';
@@ -264,7 +264,7 @@ global $wppa_session;
264
  $thumbajax .= '&amp;wppa-catbox=' . trim( wppa( 'catbox' ), ',' );
265
  }
266
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
267
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
268
  }
269
  $href = '';
270
  $title = isset ( $wppa_session['display_searchstring'] ) ? wppa_dss_to_title( $wppa_session['display_searchstring'] ) : '';
@@ -322,7 +322,7 @@ global $wppa_session;
322
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-upldr='.wppa( 'is_upldr' );
323
  }
324
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
325
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
326
  }
327
  $value = sprintf( __( 'Photos by %s' , 'wp-photo-album-plus'), $user );
328
  $href = '';
@@ -346,7 +346,7 @@ global $wppa_session;
346
  $thumbajax .= '&amp;wppa-medals-only=1';
347
  }
348
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
349
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
350
  }
351
  $value = __( 'Top rated photos' , 'wp-photo-album-plus');
352
  $href = '';
@@ -371,7 +371,7 @@ global $wppa_session;
371
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-lasten='.wppa( 'lasten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
372
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-lasten='.wppa( 'lasten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
373
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
374
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
375
  }
376
  if ( wppa_switch( 'lasten_use_modified' ) ) {
377
  $value = __( 'Recently modified photos' , 'wp-photo-album-plus');
@@ -396,7 +396,7 @@ global $wppa_session;
396
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-comten='.wppa( 'comten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
397
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-comten='.wppa( 'comten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
398
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
399
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
400
  }
401
  $value = __( 'Recently commented photos' , 'wp-photo-album-plus');
402
  $href = '';
@@ -416,7 +416,7 @@ global $wppa_session;
416
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-featen='.wppa( 'featen_count' ).'&amp;wppa-album='.wppa( 'start_album' );
417
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-featen='.wppa( 'featen_count' ).'&amp;wppa-album='.wppa( 'start_album' );
418
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
419
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
420
  }
421
  $value = __( 'Featured photos' , 'wp-photo-album-plus');
422
  $href = '';
@@ -429,7 +429,7 @@ global $wppa_session;
429
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-tag='.wppa( 'is_tag' ).'&amp;wppa-album='.wppa( 'start_album' );
430
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-tag='.wppa( 'is_tag' ).'&amp;wppa-album='.wppa( 'start_album' );
431
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
432
- wppa_bcitem( $value, $href, $title, 'b8', $ajax );
433
  }
434
  $value = __( 'Related photos' , 'wp-photo-album-plus');
435
  $href = '';
@@ -444,7 +444,7 @@ global $wppa_session;
444
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
445
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
446
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
447
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
448
  }
449
  $value = __( 'Tagged photos:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
450
  $value .= '&nbsp;' . __( 'From albums with', 'wp-photo-album-plus' ) . '&nbsp;';
@@ -470,7 +470,7 @@ global $wppa_session;
470
  $thumbajax .= '&amp;wppa-inv=1';
471
  }
472
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
473
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
474
  }
475
  $value = __( 'Tagged photos:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
476
  if ( wppa( 'start_album' ) ) {
@@ -489,7 +489,7 @@ global $wppa_session;
489
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
490
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
491
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
492
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
493
  }
494
  $value = __( 'Category:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
495
  $href = '';
@@ -503,14 +503,14 @@ global $wppa_session;
503
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
504
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
505
  $title = __( 'Album:' , 'wp-photo-album-plus').' '.$value;
506
- wppa_bcitem( $value, $href, $title, 'b7', $ajax );
507
  }
508
  if ( wppa( 'is_slide' ) ) {
509
  $value = __( 'Recently updated albums' , 'wp-photo-album-plus');
510
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
511
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
512
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
513
- wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax );
514
  }
515
  $value = __( 'Recently updated albums' , 'wp-photo-album-plus');
516
  $href = '';
@@ -530,7 +530,7 @@ global $wppa_session;
530
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
531
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
532
  $title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
533
- wppa_bcitem( $value, $href, $title, 'b7', $ajax );
534
  }
535
  $value = $is_albenum ? $various : wppa_get_album_name( $alb );
536
  $href = '';
@@ -586,7 +586,7 @@ global $wppa_session;
586
 
587
  // Display a breadcrumb item with optionally a seperator if it is a link.
588
  // If it's a link, it's not the last item
589
- function wppa_bcitem( $value = '', $href = '', $title = '', $class = '', $ajax = '', $hash = '#wppa-container-' ) {
590
  static $sep;
591
 
592
  // Encrypt
@@ -625,7 +625,7 @@ static $sep;
625
  else { // No link, its the last item
626
  wppa_out( '<span' .
627
  ' id="' . $bc_pname . wppa( 'mocc' ) . '"' .
628
- ' class="wppa-nav-text '.$class.'"' .
629
  ' style="' .
630
  ( $title ? 'cursor:pointer;' : '' ) .
631
  wppa_wcs( 'wppa-nav-text' ) .
@@ -663,7 +663,7 @@ static $sep;
663
  }
664
  }
665
  wppa_out( '<span' .
666
- ' class="wppa-nav-text ' . $class . '"' .
667
  ' style="' . wppa_wcs( 'wppa-nav-text' ).'"' .
668
  ' >' .
669
  $sep .
@@ -676,8 +676,13 @@ global $wpdb;
676
 
677
  // Find parent
678
  $parent = wppa_get_parentalbumid( $alb );
679
- if ( $parent < '1' ) return; // No parent -> toplevel -> done.
680
-
 
 
 
 
 
681
  wppa_crumb_ancestors( $parent, $to_cover );
682
 
683
  // Find the album specific link type ( content, slide, page or none )
@@ -705,6 +710,7 @@ global $wpdb;
705
  $title = __( 'Album:' , 'wp-photo-album-plus') . ' ' . wppa_get_album_name( $parent );
706
  $class = 'b20';
707
  wppa_bcitem( $value, $href, $title, $class, $ajax );
 
708
  return;
709
  }
710
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Functions for breadcrumbs
6
+ * Version 6.8.09
7
  *
8
  */
9
 
137
  $hash = '#album-' . $a . '-';
138
  }
139
  }
140
+ wppa_bcitem( $value, $href, $title, 'b3', $ajax, false, $hash );
141
  }
142
 
143
  // The album ( grand ) parents if not separate
216
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
217
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
218
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
219
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
220
  }
221
 
222
  $href = '';
264
  $thumbajax .= '&amp;wppa-catbox=' . trim( wppa( 'catbox' ), ',' );
265
  }
266
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
267
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
268
  }
269
  $href = '';
270
  $title = isset ( $wppa_session['display_searchstring'] ) ? wppa_dss_to_title( $wppa_session['display_searchstring'] ) : '';
322
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-upldr='.wppa( 'is_upldr' );
323
  }
324
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
325
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
326
  }
327
  $value = sprintf( __( 'Photos by %s' , 'wp-photo-album-plus'), $user );
328
  $href = '';
346
  $thumbajax .= '&amp;wppa-medals-only=1';
347
  }
348
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
349
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
350
  }
351
  $value = __( 'Top rated photos' , 'wp-photo-album-plus');
352
  $href = '';
371
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-lasten='.wppa( 'lasten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
372
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-lasten='.wppa( 'lasten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
373
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
374
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
375
  }
376
  if ( wppa_switch( 'lasten_use_modified' ) ) {
377
  $value = __( 'Recently modified photos' , 'wp-photo-album-plus');
396
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-comten='.wppa( 'comten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
397
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-comten='.wppa( 'comten_count' ).'&amp;wppa-album='.wppa( 'start_album' );
398
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
399
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
400
  }
401
  $value = __( 'Recently commented photos' , 'wp-photo-album-plus');
402
  $href = '';
416
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-featen='.wppa( 'featen_count' ).'&amp;wppa-album='.wppa( 'start_album' );
417
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-featen='.wppa( 'featen_count' ).'&amp;wppa-album='.wppa( 'start_album' );
418
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
419
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
420
  }
421
  $value = __( 'Featured photos' , 'wp-photo-album-plus');
422
  $href = '';
429
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-tag='.wppa( 'is_tag' ).'&amp;wppa-album='.wppa( 'start_album' );
430
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-tag='.wppa( 'is_tag' ).'&amp;wppa-album='.wppa( 'start_album' );
431
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
432
+ wppa_bcitem( $value, $href, $title, 'b8', $ajax, true );
433
  }
434
  $value = __( 'Related photos' , 'wp-photo-album-plus');
435
  $href = '';
444
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
445
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
446
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
447
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
448
  }
449
  $value = __( 'Tagged photos:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
450
  $value .= '&nbsp;' . __( 'From albums with', 'wp-photo-album-plus' ) . '&nbsp;';
470
  $thumbajax .= '&amp;wppa-inv=1';
471
  }
472
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
473
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
474
  }
475
  $value = __( 'Tagged photos:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
476
  if ( wppa( 'start_album' ) ) {
489
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
490
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-cat='.wppa( 'is_cat' ).'&amp;wppa-album='.wppa( 'start_album' );
491
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
492
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
493
  }
494
  $value = __( 'Category:' , 'wp-photo-album-plus').'&nbsp;'.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
495
  $href = '';
503
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
504
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
505
  $title = __( 'Album:' , 'wp-photo-album-plus').' '.$value;
506
+ wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
507
  }
508
  if ( wppa( 'is_slide' ) ) {
509
  $value = __( 'Recently updated albums' , 'wp-photo-album-plus');
510
  $thumbhref = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
511
  $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
512
  $title = __( 'View the thumbnails' , 'wp-photo-album-plus');
513
+ wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
514
  }
515
  $value = __( 'Recently updated albums' , 'wp-photo-album-plus');
516
  $href = '';
530
  $href = wppa_get_permalink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
531
  $ajax = wppa_get_ajaxlink().'wppa-cover=0&amp;wppa-occur='.wppa( 'occur' ).'&amp;wppa-album='.wppa( 'start_album' );
532
  $title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
533
+ wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
534
  }
535
  $value = $is_albenum ? $various : wppa_get_album_name( $alb );
536
  $href = '';
586
 
587
  // Display a breadcrumb item with optionally a seperator if it is a link.
588
  // If it's a link, it's not the last item
589
+ function wppa_bcitem( $value = '', $href = '', $title = '', $class = '', $ajax = '', $is_pname = false, $hash = '#wppa-container-' ) {
590
  static $sep;
591
 
592
  // Encrypt
625
  else { // No link, its the last item
626
  wppa_out( '<span' .
627
  ' id="' . $bc_pname . wppa( 'mocc' ) . '"' .
628
+ ' class="wppa-nav-text ' . $class . ( wppa( 'is_slide' ) ? ' bc-pname' : '' ) . '"' .
629
  ' style="' .
630
  ( $title ? 'cursor:pointer;' : '' ) .
631
  wppa_wcs( 'wppa-nav-text' ) .
663
  }
664
  }
665
  wppa_out( '<span' .
666
+ ' class="wppa-nav-text ' . $class . ( wppa( 'is_slide' ) && $is_pname ? ' bc-pname' : '' ) . '"' .
667
  ' style="' . wppa_wcs( 'wppa-nav-text' ).'"' .
668
  ' >' .
669
  $sep .
676
 
677
  // Find parent
678
  $parent = wppa_get_parentalbumid( $alb );
679
+
680
+ // No parent -> toplevel -> done.
681
+ if ( $parent < '1' ) {
682
+ return;
683
+ }
684
+
685
+ // Next level
686
  wppa_crumb_ancestors( $parent, $to_cover );
687
 
688
  // Find the album specific link type ( content, slide, page or none )
710
  $title = __( 'Album:' , 'wp-photo-album-plus') . ' ' . wppa_get_album_name( $parent );
711
  $class = 'b20';
712
  wppa_bcitem( $value, $href, $title, $class, $ajax );
713
+
714
  return;
715
  }
716
 
wppa-import.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the import pages and functions
6
- * Version 6.8.08
7
  *
8
  */
9
 
@@ -24,9 +24,6 @@ global $wppa_session;
24
  $ngg_opts = get_option( 'ngg_options', false );
25
  $user = wppa_get_user();
26
 
27
- // Check database
28
- wppa_check_database( true );
29
-
30
  // Update watermark settings for the user if new values supplied
31
  if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
32
 
@@ -271,7 +268,7 @@ global $wppa_session;
271
  ;
272
 
273
  if ( $can_remote ) {
274
-
275
  echo
276
  '<input' .
277
  ' id="wppa-import-set-source"' .
@@ -281,7 +278,7 @@ global $wppa_session;
281
  // ' value="' . __( 'Set Local/Remote' ,'wp-photo-album-plus') . '"' .
282
  ' style="display:none;"' .
283
  '/>';
284
-
285
  }
286
  else {
287
  if ( ! ini_get( 'allow_url_fopen' ) ) {
@@ -310,7 +307,7 @@ global $wppa_session;
310
  ' >' .
311
  wppa_abs_walktree( wppa_opt( 'import_root' ), $source ) .
312
  '</select>' .
313
-
314
  '<input' .
315
  ' id="wppa-import-set-source-dir"' .
316
  ' type="submit"' .
@@ -358,7 +355,7 @@ global $wppa_session;
358
  ' value="' . $remote_max . '"' .
359
  ' onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"' .
360
  ' />' .
361
-
362
  '<input' .
363
  ' id="wppa-import-set-source-url"' .
364
  ' type="submit"' .
@@ -371,7 +368,7 @@ global $wppa_session;
371
  '<span id="rem-rem" style="display:none;" >' .
372
  ' ' . __( 'Working, please wait...', 'wp-photo-album-plus') .
373
  '</span>' .
374
-
375
  '<br />' .
376
  __( 'You can enter either a web page address like <i>http://mysite.com/mypage/</i> or a full url to an image file like <i>http://mysite.com/wp-content/uploads/wppa/4711.jpg</i>', 'wp-photo-album-plus' );
377
  }
@@ -1314,7 +1311,7 @@ global $wppa_session;
1314
  return true;
1315
  }
1316
  </script>
1317
- <?php if ( $albumcount || $dircount || $zipcount ) { ?>
1318
  <input type="submit" onclick="return wppaCheckInputVars()" class="button-primary" id="submit" name="wppa-import-submit" value="<?php _e( 'Import', 'wp-photo-album-plus' ); ?>" />
1319
  <?php } ?>
1320
  <script type="text/javascript" >
@@ -1412,7 +1409,7 @@ global $wppa_session;
1412
  jQuery( '#wppa-spinner' ).css( 'display', 'none' );
1413
  }
1414
  </script>
1415
- <?php if ( ( $photocount || $videocount || $audiocount ) && ! $albumcount && ! $dircount && ! $zipcount ) { ?>
1416
  <input id="wppa-start-ajax" type="button" onclick="if ( wppaVfyAlbum() ) { wppaImportRuns = true;wppaDoAjaxImport() }" class="button-primary" value="<?php esc_attr( _e( 'Start Import', 'wp-photo-album-plus' ) ) ?>" />
1417
  <input id="wppa-stop-ajax" style="display:none;" type="button" onclick="wppaStopAjaxImport()" class="button-primary" value="<?php esc_attr( _e( 'Stop Import', 'wp-photo-album-plus' ) ) ?>" />
1418
  <?php } ?>
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the import pages and functions
6
+ * Version 6.8.09
7
  *
8
  */
9
 
24
  $ngg_opts = get_option( 'ngg_options', false );
25
  $user = wppa_get_user();
26
 
 
 
 
27
  // Update watermark settings for the user if new values supplied
28
  if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
29
 
268
  ;
269
 
270
  if ( $can_remote ) {
271
+
272
  echo
273
  '<input' .
274
  ' id="wppa-import-set-source"' .
278
  // ' value="' . __( 'Set Local/Remote' ,'wp-photo-album-plus') . '"' .
279
  ' style="display:none;"' .
280
  '/>';
281
+
282
  }
283
  else {
284
  if ( ! ini_get( 'allow_url_fopen' ) ) {
307
  ' >' .
308
  wppa_abs_walktree( wppa_opt( 'import_root' ), $source ) .
309
  '</select>' .
310
+
311
  '<input' .
312
  ' id="wppa-import-set-source-dir"' .
313
  ' type="submit"' .
355
  ' value="' . $remote_max . '"' .
356
  ' onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"' .
357
  ' />' .
358
+
359
  '<input' .
360
  ' id="wppa-import-set-source-url"' .
361
  ' type="submit"' .
368
  '<span id="rem-rem" style="display:none;" >' .
369
  ' ' . __( 'Working, please wait...', 'wp-photo-album-plus') .
370
  '</span>' .
371
+
372
  '<br />' .
373
  __( 'You can enter either a web page address like <i>http://mysite.com/mypage/</i> or a full url to an image file like <i>http://mysite.com/wp-content/uploads/wppa/4711.jpg</i>', 'wp-photo-album-plus' );
374
  }
1311
  return true;
1312
  }
1313
  </script>
1314
+ <?php if ( $albumcount || $dircount || $zipcount || $csvcount ) { ?>
1315
  <input type="submit" onclick="return wppaCheckInputVars()" class="button-primary" id="submit" name="wppa-import-submit" value="<?php _e( 'Import', 'wp-photo-album-plus' ); ?>" />
1316
  <?php } ?>
1317
  <script type="text/javascript" >
1409
  jQuery( '#wppa-spinner' ).css( 'display', 'none' );
1410
  }
1411
  </script>
1412
+ <?php if ( ( $photocount || $videocount || $audiocount ) && ! $albumcount && ! $dircount && ! $zipcount && ! $csvcount ) { ?>
1413
  <input id="wppa-start-ajax" type="button" onclick="if ( wppaVfyAlbum() ) { wppaImportRuns = true;wppaDoAjaxImport() }" class="button-primary" value="<?php esc_attr( _e( 'Start Import', 'wp-photo-album-plus' ) ) ?>" />
1414
  <input id="wppa-stop-ajax" style="display:none;" type="button" onclick="wppaStopAjaxImport()" class="button-primary" value="<?php esc_attr( _e( 'Stop Import', 'wp-photo-album-plus' ) ) ?>" />
1415
  <?php } ?>
wppa-non-admin.php CHANGED
@@ -441,7 +441,7 @@ global $wppa_session;
441
  global $wppa_js_page_data_file;
442
 
443
  // If no wppa on the page, quit
444
- if ( ! wppa( 'mocc' ) && ! wppa_opt( 'lightbox_global' ) ) {
445
  return;
446
  }
447
 
@@ -621,7 +621,7 @@ global $wppa_js_page_data_file;
621
  // The init vars
622
  $data = '
623
  <script type="text/javascript" >
624
-
625
  /* START Lightbox vars */
626
  jQuery("#wppa-overlay-bg").css({height:window.innerHeight});
627
  wppaOvlModeInitial = "'.( wppa( 'is_mobile' ) ? wppa_opt( 'ovl_mode_initial_mob' ) : wppa_opt( 'ovl_mode_initial' ) ).'";
@@ -1056,6 +1056,7 @@ global $wppa_init_js_data;
1056
  wppaDone = "' . __( 'Done!', 'wp-photo-album-plus' ) . '";
1057
  wppaUploadFailed = "' . __( 'Upload failed', 'wp-photo-album-plus' ) . '";
1058
  wppaServerError = "' . __( 'Server error.', 'wp-photo-album-plus' ) . '";
 
1059
  ';
1060
 
1061
  // Open file
@@ -1140,28 +1141,6 @@ function wppa_nopti_js( $nopt_in, $html_in ) {
1140
  }
1141
  }
1142
 
1143
- /*
1144
- // If no wppa code on the page, remove enqueued scripts if in the footer
1145
- add_action( 'wp_footer', 'wppa_remove_js', 1 );
1146
- function wppa_remove_js() {
1147
- if ( ! wppa( 'mocc' ) ) {
1148
- $js_files = array (
1149
- 'wppa',
1150
- 'wppa-slideshow',
1151
- 'wppa-ajax-front',
1152
- 'wppa-lightbox',
1153
- 'wppa-popup',
1154
- 'wppa-touch',
1155
- 'wppa-utils',
1156
- 'wppa-init',
1157
- 'wppa-pagedata',
1158
- );
1159
- foreach( $js_files as $script ) {
1160
- wp_dequeue_script( $script );
1161
- }
1162
- }
1163
- }
1164
- */
1165
  // This function contains strings for i18n from files not included
1166
  // in the search for frontend required translatable strings
1167
  // Mainly from widgets
441
  global $wppa_js_page_data_file;
442
 
443
  // If no wppa on the page, quit
444
+ if ( ! wppa( 'mocc' ) && ! wppa_switch( 'lightbox_global' ) ) {
445
  return;
446
  }
447
 
621
  // The init vars
622
  $data = '
623
  <script type="text/javascript" >
624
+
625
  /* START Lightbox vars */
626
  jQuery("#wppa-overlay-bg").css({height:window.innerHeight});
627
  wppaOvlModeInitial = "'.( wppa( 'is_mobile' ) ? wppa_opt( 'ovl_mode_initial_mob' ) : wppa_opt( 'ovl_mode_initial' ) ).'";
1056
  wppaDone = "' . __( 'Done!', 'wp-photo-album-plus' ) . '";
1057
  wppaUploadFailed = "' . __( 'Upload failed', 'wp-photo-album-plus' ) . '";
1058
  wppaServerError = "' . __( 'Server error.', 'wp-photo-album-plus' ) . '";
1059
+ wppaGeoZoom = ' . wppa_opt( 'geo_zoom' ) . ';
1060
  ';
1061
 
1062
  // Open file
1141
  }
1142
  }
1143
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1144
  // This function contains strings for i18n from files not included
1145
  // in the search for frontend required translatable strings
1146
  // Mainly from widgets
wppa-qr-widget.php CHANGED
@@ -3,10 +3,9 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
- * Version 6.8.08
7
  */
8
 
9
-
10
  class wppaQRWidget extends WP_Widget {
11
 
12
  /** constructor */
@@ -51,11 +50,7 @@ class wppaQRWidget extends WP_Widget {
51
 
52
  $widget_content .=
53
  '<script type="text/javascript" >
54
- /*[CDATA[*/
55
  var wppaQRUrl = document.location.href;
56
-
57
- wppaConsoleLog( "doc.loc.href = " + wppaQRUrl );
58
-
59
  function wppaQRUpdate( arg ) {
60
  if ( arg ) {
61
  wppaQRUrl = arg;
@@ -64,11 +59,9 @@ class wppaQRWidget extends WP_Widget {
64
  document.getElementById( "wppa-qr-img" ).title = wppaQRUrl;
65
  return;
66
  }
67
-
68
  jQuery(document).ready(function(){
69
  wppaQRUpdate();
70
  });
71
- /*]]*/
72
  </script>';
73
 
74
  echo $before_widget . $before_title . $title . $after_title . $widget_content . $after_widget;
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
+ * Version 6.8.09
7
  */
8
 
 
9
  class wppaQRWidget extends WP_Widget {
10
 
11
  /** constructor */
50
 
51
  $widget_content .=
52
  '<script type="text/javascript" >
 
53
  var wppaQRUrl = document.location.href;
 
 
 
54
  function wppaQRUpdate( arg ) {
55
  if ( arg ) {
56
  wppaQRUrl = arg;
59
  document.getElementById( "wppa-qr-img" ).title = wppaQRUrl;
60
  return;
61
  }
 
62
  jQuery(document).ready(function(){
63
  wppaQRUpdate();
64
  });
 
65
  </script>';
66
 
67
  echo $before_widget . $before_title . $title . $after_title . $widget_content . $after_widget;
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 6.8.08
7
  *
8
  */
9
 
@@ -85,14 +85,17 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
85
  wppa_update_option('wppa_slide_order', implode(',', $indices));
86
  }
87
  break;
 
88
  // Should better be here
89
  case 'wppa_setup':
90
  wppa_setup(true); // Message on success or fail is in the routine
91
  break;
 
92
  // Must be here
93
  case 'wppa_backup':
94
  wppa_backup_settings(); // Message on success or fail is in the routine
95
  break;
 
96
  // Must be here
97
  case 'wppa_load_skin':
98
  $fname = wppa_opt( 'skinfile' );
@@ -122,6 +125,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
122
  // Error printed by wppa_restore_settings()
123
  }
124
  break;
 
125
  // Must be here
126
  case 'wppa_watermark_upload':
127
  if ( isset($_FILES['file_1']) && $_FILES['file_1']['error'] != 4 ) { // Expected a fileupload for a watermark
@@ -191,6 +195,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
191
  }
192
  copy( $file['tmp_name'], WPPA_UPLOAD_PATH . '/audiostub' . $ext );
193
  wppa_update_option( 'wppa_audiostub', 'audiostub'. $ext );
 
194
  // Thumbx, thumby, phtox and photoy must be cleared for the new stub
195
  $wpdb->query( "UPDATE `" . WPPA_PHOTOS ."` SET `thumbx` = 0, `thumby` = 0, `photox` = 0, `photoy` = 0 WHERE `ext` = 'xxx'" );
196
  wppa_alert( sprintf( __( 'Upload of %s done', 'wp-photo-album-plus'), basename( $file['name'] ) ) );
@@ -248,7 +253,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
248
  }
249
 
250
  // Make sure we are uptodate
251
- wppa_initialize_runtime(true);
252
 
253
  } // wppa-settings-submit
254
 
@@ -259,9 +264,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
259
  // Fix invalid source path
260
  wppa_fix_source_path();
261
 
262
- // Check database
263
- wppa_check_database(true);
264
-
265
  // Cleanup obsolete settings
266
  if ( $wpdb->get_var( "SELECT COUNT(*) FROM `".$wpdb->prefix.'options'."` WHERE `option_name` LIKE 'wppa_last_album_used-%'" ) > 100 ) {
267
  $iret = $wpdb->query( "DELETE FROM `".$wpdb->prefix.'options'."` WHERE `option_name` LIKE 'wppa_last_album_used-%'" );
@@ -329,10 +331,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
329
  }
330
 
331
  // Check for pending actions
332
- // if ( wppa_switch( 'indexed_search' ) ) {
333
- // if ( get_option( 'wppa_remake_index_albums_status' ) && get_option( 'wppa_remake_index_albums_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Rebuilding the Album index needs completion. See Table VIII' , 'wp-photo-album-plus') );
334
- // if ( get_option( 'wppa_remake_index_photos_status' ) && get_option( 'wppa_remake_index_photos_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Rebuilding the Photo index needs completion. See Table VIII' , 'wp-photo-album-plus') );
335
- // }
336
  if ( get_option( 'wppa_remove_empty_albums_status' ) && get_option( 'wppa_remove_empty_albums_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Remove empty albums needs completion. See Table VIII', 'wp-photo-album-plus') );
337
  if ( get_option( 'wppa_apply_new_photodesc_all_status' ) && get_option( 'wppa_apply_new_photodesc_all_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Applying new photo description needs completion. See Table VIII', 'wp-photo-album-plus') );
338
  if ( get_option( 'wppa_append_to_photodesc_status' ) && get_option( 'wppa_append_to_photodesc_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Appending to photo description needs completion. See Table VIII' , 'wp-photo-album-plus') );
@@ -486,50 +484,49 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
486
  }
487
  ?>
488
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
489
 
490
- <?php // Linkpages
491
- $options_page = false;
492
- $options_page_post = false;
493
- $values_page = false;
494
- $values_page_post = false;
495
- // First
496
- $options_page_post[] = __('--- the same page or post ---', 'wp-photo-album-plus');
497
- $values_page_post[] = '0';
498
- $options_page[] = __('--- please select a page ---', 'wp-photo-album-plus');
499
- $values_page[] = '0';
500
- // Pages if any
501
- $query = "SELECT ID, post_title, post_content, post_parent FROM " . $wpdb->posts . " WHERE post_type = 'page' AND post_status = 'publish' ORDER BY post_title ASC";
502
- $pages = $wpdb->get_results ($query, ARRAY_A);
503
- if ($pages) {
504
- if ( wppa_switch( 'hier_pagesel') ) $pages = wppa_add_parents($pages);
505
- else { // Just translate
506
- foreach ( array_keys($pages) as $index ) {
507
- $pages[$index]['post_title'] = __(stripslashes($pages[$index]['post_title']), 'wp-photo-album-plus');
508
- }
509
- }
510
- $pages = wppa_array_sort($pages, 'post_title');
511
- foreach ($pages as $page) {
512
- if (strpos($page['post_content'], '%%wppa%%') !== false || strpos($page['post_content'], '[wppa') !== false) {
513
- $options_page[] = __($page['post_title'], 'wp-photo-album-plus');
514
- $options_page_post[] = __($page['post_title'], 'wp-photo-album-plus');
515
- $values_page[] = $page['ID'];
516
- $values_page_post[] = $page['ID'];
517
- }
518
- else {
519
- $options_page[] = '|'.__($page['post_title'], 'wp-photo-album-plus').'|';
520
- $options_page_post[] = '|'.__($page['post_title'], 'wp-photo-album-plus').'|';
521
- $values_page[] = $page['ID'];
522
- $values_page_post[] = $page['ID'];
523
- }
524
- }
525
- }
526
- else {
527
- $options_page[] = __('--- No page to link to (yet) ---', 'wp-photo-album-plus');
528
- $values_page[] = '0';
529
- }
530
-
531
- $options_page_auto = $options_page;
532
- $options_page_auto[0] = __('--- Will be auto created ---', 'wp-photo-album-plus');
533
  ?>
534
 
535
  <div class="wppa-quick" style="display:none;" >
@@ -1670,6 +1667,15 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
1670
  $clas = 'wppa_bc';
1671
  $tags = 'navi,layout';
1672
  wppa_setting($slug, '4.3', $name, $desc, $html, $help, $clas, $tags);
 
 
 
 
 
 
 
 
 
1673
 
1674
  $name = __('Separator', 'wp-photo-album-plus');
1675
  $desc = __('Breadcrumb separator symbol.', 'wp-photo-album-plus');
@@ -1883,11 +1889,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
1883
  $desc = __('Enable the ugly browsing buttons.', 'wp-photo-album-plus');
1884
  $help = esc_js(__('If checked, the fullsize image is covered by two browse buttons.', 'wp-photo-album-plus'));
1885
  $slug = 'wppa_show_ubb';
1886
- // $slug2 = 'wppa_ubb_color';
1887
  $html = wppa_checkbox($slug);
1888
- // $opts = array( __('Black', 'wp-photo-album-plus'), __('Light gray', 'wp-photo-album-plus') );
1889
- // $vals = array( '', 'c');
1890
- // $html2 = wppa_select($slug2, $opts, $vals);
1891
  $clas = '';
1892
  $tags = 'slide,navi';
1893
  wppa_setting($slug, '13.1', $name, $desc, $html, $help, $clas, $tags);
@@ -1896,11 +1898,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
1896
  $desc = __('Show start and stop icons at the center of the slide', 'wp-photo-album-plus');
1897
  $help = '';
1898
  $slug = 'wppa_show_start_stop_icons';
1899
- // $slug2 = 'wppa_start_stop_icons_type';
1900
  $html = wppa_checkbox($slug);
1901
- // $opts = array( __('Black square', 'wp-photo-album-plus'), __('Blue square', 'wp-photo-album-plus'), __('Black round', 'wp-photo-album-plus') );
1902
- // $vals = array( '.jpg', 'b.jpg', 'r.png' );
1903
- // $html2 = wppa_select($slug2, $opts, $vals);
1904
  $clas = '';
1905
  $tags = 'slide,navi';
1906
  wppa_setting($slug, '13.2', $name, $desc, $html, $help, $clas, $tags);
@@ -2009,7 +2007,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
2009
 
2010
  $name = __('Show Share Buttons Thumbs', 'wp-photo-album-plus');
2011
  $desc = __('Display the share social media buttons under thumbnails.', 'wp-photo-album-plus');
2012
- $help = '';// __('This setting applies to normal slideshows in widgets, not to the slideshowwidget as that is a slideonly display.');
2013
  $slug = 'wppa_share_on_thumbs';
2014
  $onchange = 'wppaCheckShares()';
2015
  $html = wppa_checkbox($slug, $onchange);
@@ -2019,7 +2017,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
2019
 
2020
  $name = __('Show Share Buttons Lightbox', 'wp-photo-album-plus');
2021
  $desc = __('Display the share social media buttons on lightbox displays.', 'wp-photo-album-plus');
2022
- $help = '';// __('This setting applies to normal slideshows in widgets, not to the slideshowwidget as that is a slideonly display.');
2023
  $slug = 'wppa_share_on_lightbox';
2024
  $onchange = 'wppaCheckShares()';
2025
  $html = wppa_checkbox($slug, $onchange);
@@ -2504,17 +2502,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
2504
  }
2505
  wppa_setting_subheader( 'G', '1', __( 'Lightbox related settings. These settings have effect only when Table IX-J3 is set to wppa' , 'wp-photo-album-plus') );
2506
  {
2507
- /*
2508
- $name = __('Overlay Close label text', 'wp-photo-album-plus');
2509
- $desc = __('The text label for the cross exit symbol.', 'wp-photo-album-plus');
2510
- $help = __('This text may be multilingual according to the qTranslate short tags specs.', 'wp-photo-album-plus');
2511
- $slug = 'wppa_ovl_close_txt';
2512
- $html = wppa_input($slug, '200px');
2513
- $clas = '';
2514
- $tags = 'lightbox,layout';
2515
- wppa_setting($slug, '1', $name, $desc, $html, $help, $clas, $tags);
2516
- */
2517
-
2518
  $name = __('Overlay theme color', 'wp-photo-album-plus');
2519
  $desc = __('The color of the image border and text background.', 'wp-photo-album-plus');
2520
  $help = '';
@@ -3491,7 +3478,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
3491
  $slug2 = 'wppa_bcolor_modal';
3492
  $slug = array($slug1, $slug2);
3493
  $html1 = wppa_input($slug1, '100px', '', '', "checkColor('".$slug1."')") . '</td><td>' . wppa_color_box($slug1);
3494
- $html2 = '</td><td>'; // wppa_input($slug2, '100px', '', '', "checkColor('".$slug2."')") . '</td><td>' . wppa_color_box($slug2);
3495
  $html = array($html1, $html2);
3496
  $clas = '';
3497
  $tags = 'layout';
@@ -3522,20 +3509,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
3522
  $clas = 'svg';
3523
  $tags = 'layout,navi';
3524
  wppa_setting($slug, '15', $name, $desc, $html, $help, $clas, $tags);
3525
- /*
3526
- $name = __('Arrow color', 'wp-photo-album-plus');
3527
- $desc = __('Left/right browsing arrow color.', 'wp-photo-album-plus');
3528
- $help = esc_js(__('Enter the color of the filmstrip navigation arrows.', 'wp-photo-album-plus'));
3529
- $slug1 = 'wppa_arrow_color';
3530
- $slug2 = '';
3531
- $slug = array($slug1, $slug2);
3532
- $html1 = wppa_input($slug1, '70px', '', '');
3533
- $html2 = '';
3534
- $html = array($html1, $html2);
3535
- $clas = '-svg';
3536
- $tags = 'layout,navi';
3537
- wppa_setting($slug, '15.2', $name, $desc, $html, $help, $clas, $tags);
3538
- */
3539
  }
3540
  ?>
3541
  </tbody>
@@ -3857,16 +3830,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
3857
  $clas = '';
3858
  $tags = 'system,access';
3859
  wppa_setting($slug, '18', $name, $desc, $html, $help, $clas, $tags);
3860
- /*
3861
- $name = __('Lazy or HTML comp', 'wp-photo-album-plus');
3862
- $desc = __('Tick this box when you use lazy load or html compression.', 'wp-photo-album-plus');
3863
- $help = esc_js(__('If the filmstrip images do not show up and you have a lazy load or html optimizing plugin active: Check this box', 'wp-photo-album-plus'));
3864
- $slug = 'wppa_lazy_or_htmlcomp';
3865
- $html = wppa_checkbox($slug);
3866
- $clas = '';
3867
- $tags = 'system,layout';
3868
- wppa_setting($slug, '19', $name, $desc, $html, $help, $clas, $tags);
3869
- */
3870
  $name = __('Thumbs first', 'wp-photo-album-plus');
3871
  $desc = __('When displaying album content: thumbnails before subalbums.', 'wp-photo-album-plus');
3872
  $help = '';
@@ -3948,16 +3912,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
3948
  $clas = '';
3949
  $tags = 'system';
3950
  wppa_setting($slug, '28', $name, $desc, $html, $help, $clas, $tags);
3951
- /*
3952
- $name = __('JS and CSS when needed', 'wp-photo-album-plus');
3953
- $desc = __('Loads .js and .css files only when they are used on the page.', 'wp-photo-album-plus');
3954
- $help = esc_js(__('This is a self learning system. The first time a page is loaded that requires wppa .css or .js files, the page will reload.', 'wp-photo-album-plus'));
3955
- $slug = 'wppa_js_css_optional';
3956
- $html = wppa_checkbox($slug);
3957
- $clas = '';
3958
- $tags = 'system';
3959
- wppa_setting($slug, '29', $name, $desc, $html, $help, $clas, $tags);
3960
- */
3961
  $name = __('Enable pdf', 'wp-photo-album-plus');
3962
  $desc = __('Enable the support of pdf files', 'wp-photo-album-plus');
3963
  $help = esc_js(__('This feature requires the activation of ImageMagick. See Table IX-K7', 'wp-photo-album-plus'));
@@ -4947,16 +4902,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
4947
  $clas = '';
4948
  $tags = 'lightbox';
4949
  wppa_setting($slug, '3.2', $name, $desc, $html, $help, $clas, $tags);
4950
- /*
4951
- $name = __('Overlay at top in Chrome', 'wp-photo-album-plus');
4952
- $desc = __('Place the overlay (lightbox) image at the top of the page in Chrome browsers.', 'wp-photo-album-plus');
4953
- $help = esc_js(__('This is required for certain mobile devices.', 'wp-photo-album-plus'));
4954
- $slug = 'wppa_ovl_chrome_at_top';
4955
- $html = wppa_checkbox($slug);
4956
- $clas = '';
4957
- $tags = 'lightbox,layout';
4958
- wppa_setting($slug, '4', $name, $desc, $html, $help, $clas, $tags);
4959
- */
4960
  $name = __('WPPA+ Lightbox global', 'wp-photo-album-plus');
4961
  $desc = __('Use the wppa+ lightbox also for non-wppa images.', 'wp-photo-album-plus');
4962
  $help = '';
@@ -5248,13 +5194,11 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
5248
  $slug2 = 'wppa_fontsize_widget_thumb';
5249
  $slug3 = '';
5250
  $slug4 = '';
5251
- // $slug = array($slug1, $slug2, $slug3, $slug4);
5252
  $slug = $slug2;
5253
  $html1 = '';
5254
  $html2 = wppa_input($slug2, '40px', '', __('pixels', 'wp-photo-album-plus'));
5255
  $html3 = '';
5256
  $html4 = '';
5257
- // $html = array($html1, $html2, $html3, $html4);
5258
  $html = '</td><td>' . $html2 . '</td><td></td><td>';
5259
  $clas = '';
5260
  $tags = 'thumb,widget,size,layout';
@@ -5302,42 +5246,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
5302
  <?php
5303
  $wppa_table = 'VI';
5304
  $wppa_subtable = 'Z';
5305
- /*
5306
- // Linktypes
5307
- $options_linktype = array(
5308
- __('no link at all.'),
5309
- __('the plain photo (file).'),
5310
- __('the full size photo in a slideshow.'),
5311
- __('the fullsize photo on its own.'),
5312
- __('the single photo in the style of a slideshow.'),
5313
- __('the fs photo with download and print buttons.'),
5314
- __('a plain page without a querystring.'),
5315
- __('lightbox.')
5316
- );
5317
- $values_linktype = array(
5318
- 'none',
5319
- 'file',
5320
- 'photo',
5321
- 'single',
5322
- 'slphoto',
5323
- 'fullpopup',
5324
- 'plainpage',
5325
- 'lightbox'
5326
- );
5327
- $options_linktype_album = array(
5328
- __('no link at all.'),
5329
- __('the plain photo (file).'),
5330
- __('the content of the album.'),
5331
- __('the full size photo in a slideshow.'),
5332
- __('the fullsize photo on its own.'),
5333
- __('lightbox.')
5334
- );
5335
- $values_linktype_album = array('none', 'file', 'album', 'photo', 'single', 'lightbox');
5336
-
5337
-
5338
-
5339
- */
5340
-
5341
 
5342
  wppa_setting_subheader('A', '4', __('Links from images in WPPA+ Widgets', 'wp-photo-album-plus'));
5343
  {
@@ -6448,7 +6356,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
6448
  $desc = __('Enable frontend album creation.', 'wp-photo-album-plus');
6449
  $help = esc_js(__('If you check this item, frontend album creation will be enabled.', 'wp-photo-album-plus'));
6450
  $slug = 'wppa_user_create_on';
6451
- $onchange = '';//wppaCheckUserUpload()';
6452
  $html1 = wppa_checkbox($slug, $onchange);
6453
  $html2 = '';
6454
  $html = array( $html1, $html2 );
@@ -6492,8 +6400,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
6492
 
6493
  $name = __('User create Albums login', 'wp-photo-album-plus');
6494
  $desc = __('Frontend album creation requires the user is logged in.', 'wp-photo-album-plus');
6495
- $help = '';//esc_js(__('If you uncheck this box, make sure you check the item Owners only in the next sub-table.'));
6496
- // $help .= '\n'.esc_js(__('Set the owner to ---public--- of the albums that are allowed to be uploaded to.'));
6497
  $slug = 'wppa_user_create_login';
6498
  $html1 = wppa_checkbox($slug);
6499
  $html2 = '';
@@ -6855,7 +6762,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
6855
  $help = '';
6856
  $slug = 'wppa_upload_edit_users';
6857
  $opts = array( __('Admin and superuser', 'wp-photo-album-plus'), __('Owner, admin and superuser', 'wp-photo-album-plus' ) );
6858
- $vals = array( 'admin', 'owner' );//array( 'owner','equalname' );
6859
  $html1 = wppa_select($slug, $opts, $vals);
6860
  $html2 = '';
6861
  $html = array( $html1, $html2 );
@@ -7050,7 +6957,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
7050
  $desc = __('Set the status of all the users photos to \'pending\'.', 'wp-photo-album-plus');
7051
  $help = esc_js(__('Also inhibits further uploads.', 'wp-photo-album-plus'));
7052
  $slug = 'wppa_blacklist_user';
7053
- // $users = wppa_get_users(); // Already known
7054
  $blacklist = get_option( 'wppa_black_listed_users', array() );
7055
 
7056
  if ( wppa_get_user_count() <= wppa_opt( 'max_users' ) ) {
@@ -7114,7 +7020,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
7114
  $help = esc_js(__('This gives the user all the administrator privileges within wppa.', 'wp-photo-album-plus'));
7115
  $help .= '\n\n'.esc_js(__('Make sure the user also has a role that has all the boxes ticked in Table VII-A', 'wp-photo-album-plus'));
7116
  $slug = 'wppa_superuser_user';
7117
- // $users = wppa_get_users(); // Already known
7118
  $superlist = get_option( 'wppa_super_users', array() );
7119
 
7120
  if ( wppa_get_user_count() <= wppa_opt( 'max_users' ) ) {
@@ -7205,19 +7110,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
7205
 
7206
  wppa_setting_subheader('A', '4', __('Harmless and reverseable actions', 'wp-photo-album-plus'));
7207
 
7208
- /* $name = __('Ignore concurrency', 'wp-photo-album-plus');
7209
- $desc = __('Ignore the prevention of concurrent actions.', 'wp-photo-album-plus');
7210
- $help = esc_js(__('This setting is meant to recover from deadlock situations only. Use with care!', 'wp-photo-album-plus'));
7211
- $slug = 'wppa_maint_ignore_concurrency_error';
7212
- $html1 = wppa_checkbox( $slug );
7213
- $html2 = '';
7214
- $html3 = '';
7215
- $html4 = '';
7216
- $html = array($html1, $html2, $html3, $html4);
7217
- $clas = '';
7218
- $tags = 'system';
7219
- wppa_setting(false, '0.1', $name, $desc, $html, $help, $clas, $tags);
7220
- */
7221
  $name = __('Postpone cron', 'wp-photo-album-plus');
7222
  $desc = __('Temporary do no background processes.', 'wp-photo-album-plus');
7223
  $help = esc_js(__('This setting is meant to be used a.o. during bulk import/upload. Use with care!', 'wp-photo-album-plus'));
@@ -7375,7 +7267,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
7375
  $desc = __('Remakes the index database table for photos.', 'wp-photo-album-plus');
7376
  $help = '';
7377
  $slug2 = 'wppa_remake_index_photos';
7378
- $html1 = wppa_cronjob_button( $slug2 );// . __('ad inf', 'wp-photo-album-plus') . wppa_checkbox( $slug2.'_ad_inf' );
7379
  $html2 = wppa_maintenance_button( $slug2 );
7380
  $html3 = wppa_status_field( $slug2 );
7381
  $html4 = wppa_togo_field( $slug2 );
@@ -7388,7 +7280,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
7388
  $desc = __('Remove obsolete entries from index db table.', 'wp-photo-album-plus');
7389
  $help = '';
7390
  $slug2 = 'wppa_cleanup_index';
7391
- $html1 = wppa_cronjob_button( $slug2 );// . __('ad inf', 'wp-photo-album-plus') . wppa_checkbox( $slug2.'_ad_inf' );
7392
  $html2 = wppa_maintenance_button( $slug2 );
7393
  $html3 = wppa_status_field( $slug2 );
7394
  $html4 = wppa_togo_field( $slug2 );
@@ -8191,7 +8083,6 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
8191
  $help = esc_js(__('If your php config does not properly set the max execution time, you can set it here. Seconds, 0 means do not change.', 'wp-photo-album-plus'));
8192
  $help .= '\n'.esc_js(__('A safe value is 45 in most cases', 'wp-photo-album-plus'));
8193
  $help .= '\n'.esc_js(sprintf(__('The PHP setting max_execution_time is set to %s.', 'wp-photo-album-plus'), ini_get('max_execution_time')));
8194
- // $help .= '\n'.esc_js(sprintf(__('The PHP setting safe_mode is set to %s.', 'wp-photo-album-plus'), ini_get('safe_mode')));
8195
  $slug = 'wppa_max_execution_time';
8196
  $html = wppa_input($slug, '50px', '', 'seconds');
8197
  $clas = '';
@@ -9104,15 +8995,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
9104
  $clas = '';
9105
  $tags = 'system,search';
9106
  wppa_setting($slug, '6', $name, $desc, $html, $help, $clas, $tags);
9107
- /* per 5.5.0 indexed search only
9108
- $name = __('Indexed search');
9109
- $desc = __('Searching uses index db table.');
9110
- $help = '';
9111
- $slug = 'wppa_indexed_search';
9112
- $onchange = 'wppaCheckIndexSearch()';
9113
- $html = wppa_checkbox($slug, $onchange);
9114
- wppa_setting($slug, '7', $name, $desc, $html, $help, $clas, $tags);
9115
- */
9116
  $name = __('Max albums found', 'wp-photo-album-plus');
9117
  $desc = __('The maximum number of albums to be displayed.', 'wp-photo-album-plus');
9118
  $help = '';
@@ -9683,16 +9566,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
9683
  $clas = '';
9684
  $tags = 'system,meta';
9685
  wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
9686
- /*
9687
- $name = __('Max EXIF tag array size', 'wp-photo-album-plus');
9688
- $desc = __('Truncate array tags to ...', 'wp-photo-album-plus');
9689
- $help = esc_js(__('A value of 0 disables this feature', 'wp-photo-album-plus'));
9690
- $slug = 'wppa_exif_max_array_size';
9691
- $html = wppa_input($slug, '40px', '', __('elements', 'wp-photo-album-plus'));
9692
- $clas = '';
9693
- $tags = 'system,meta';
9694
- wppa_setting($slug, '9', $name, $desc, $html, $help, $clas, $tags);
9695
- */
9696
  $name = __('Import Create page', 'wp-photo-album-plus');
9697
  $desc = __('Create wp page that shows the album when a directory to album is imported.', 'wp-photo-album-plus');
9698
  $help = esc_js(__('As soon as an album is created when a directory is imported, a wp page is made that displays the album content.', 'wp-photo-album-plus'));
@@ -10123,6 +9997,17 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
10123
  $clas = 'wppa_gpx_plugin';
10124
  $tags = 'system';
10125
  wppa_setting($slug, '5.3', $name, $desc, $html, $help, $clas, $tags);
 
 
 
 
 
 
 
 
 
 
 
10126
 
10127
  $name = __('Fotomoto', 'wp-photo-album-plus');
10128
  $desc = __('Yes, we use Fotomoto on this site. Read the help text!', 'wp-photo-album-plus');
@@ -10563,10 +10448,7 @@ echo '<input type="button" vaue="Click me" onclick="wppaTimedConfirm( \'My Text\
10563
  <td><small><?php _e('Session db table name.', 'wp-photo-album-plus') ?></small></td>
10564
  <td><?php echo(WPPA_SESSION) ?></td>
10565
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
10566
- echo '<a onclick="wppaExportDbTable(\'' . WPPA_SESSION . '\')" >' .
10567
- __('Download', 'wp-photo-album-plus') . ' ' . WPPA_SESSION . '.csv' .
10568
- '</a> ' .
10569
- '<img id="' . WPPA_SESSION . '-spin" src="' . wppa_get_imgdir( 'spinner.gif' ) . '" style="display:none;" />';
10570
  } ?>
10571
  </td>
10572
  </tr>
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 6.8.09
7
  *
8
  */
9
 
85
  wppa_update_option('wppa_slide_order', implode(',', $indices));
86
  }
87
  break;
88
+
89
  // Should better be here
90
  case 'wppa_setup':
91
  wppa_setup(true); // Message on success or fail is in the routine
92
  break;
93
+
94
  // Must be here
95
  case 'wppa_backup':
96
  wppa_backup_settings(); // Message on success or fail is in the routine
97
  break;
98
+
99
  // Must be here
100
  case 'wppa_load_skin':
101
  $fname = wppa_opt( 'skinfile' );
125
  // Error printed by wppa_restore_settings()
126
  }
127
  break;
128
+
129
  // Must be here
130
  case 'wppa_watermark_upload':
131
  if ( isset($_FILES['file_1']) && $_FILES['file_1']['error'] != 4 ) { // Expected a fileupload for a watermark
195
  }
196
  copy( $file['tmp_name'], WPPA_UPLOAD_PATH . '/audiostub' . $ext );
197
  wppa_update_option( 'wppa_audiostub', 'audiostub'. $ext );
198
+
199
  // Thumbx, thumby, phtox and photoy must be cleared for the new stub
200
  $wpdb->query( "UPDATE `" . WPPA_PHOTOS ."` SET `thumbx` = 0, `thumby` = 0, `photox` = 0, `photoy` = 0 WHERE `ext` = 'xxx'" );
201
  wppa_alert( sprintf( __( 'Upload of %s done', 'wp-photo-album-plus'), basename( $file['name'] ) ) );
253
  }
254
 
255
  // Make sure we are uptodate
256
+ wppa_initialize_runtime( true );
257
 
258
  } // wppa-settings-submit
259
 
264
  // Fix invalid source path
265
  wppa_fix_source_path();
266
 
 
 
 
267
  // Cleanup obsolete settings
268
  if ( $wpdb->get_var( "SELECT COUNT(*) FROM `".$wpdb->prefix.'options'."` WHERE `option_name` LIKE 'wppa_last_album_used-%'" ) > 100 ) {
269
  $iret = $wpdb->query( "DELETE FROM `".$wpdb->prefix.'options'."` WHERE `option_name` LIKE 'wppa_last_album_used-%'" );
331
  }
332
 
333
  // Check for pending actions
 
 
 
 
334
  if ( get_option( 'wppa_remove_empty_albums_status' ) && get_option( 'wppa_remove_empty_albums_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Remove empty albums needs completion. See Table VIII', 'wp-photo-album-plus') );
335
  if ( get_option( 'wppa_apply_new_photodesc_all_status' ) && get_option( 'wppa_apply_new_photodesc_all_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Applying new photo description needs completion. See Table VIII', 'wp-photo-album-plus') );
336
  if ( get_option( 'wppa_append_to_photodesc_status' ) && get_option( 'wppa_append_to_photodesc_user', wppa_get_user() ) == wppa_get_user() ) wppa_warning_message( __( 'Appending to photo description needs completion. See Table VIII' , 'wp-photo-album-plus') );
484
  }
485
  ?>
486
 
487
+ <?php // Linkpages
488
+ $options_page = false;
489
+ $options_page_post = false;
490
+ $values_page = false;
491
+ $values_page_post = false;
492
+ // First
493
+ $options_page_post[] = __('--- the same page or post ---', 'wp-photo-album-plus');
494
+ $values_page_post[] = '0';
495
+ $options_page[] = __('--- please select a page ---', 'wp-photo-album-plus');
496
+ $values_page[] = '0';
497
+ // Pages if any
498
+ $query = "SELECT ID, post_title, post_content, post_parent FROM " . $wpdb->posts . " WHERE post_type = 'page' AND post_status = 'publish' ORDER BY post_title ASC";
499
+ $pages = $wpdb->get_results ($query, ARRAY_A);
500
+ if ($pages) {
501
+ if ( wppa_switch( 'hier_pagesel') ) $pages = wppa_add_parents($pages);
502
+ else { // Just translate
503
+ foreach ( array_keys($pages) as $index ) {
504
+ $pages[$index]['post_title'] = __(stripslashes($pages[$index]['post_title']), 'wp-photo-album-plus');
505
+ }
506
+ }
507
+ $pages = wppa_array_sort($pages, 'post_title');
508
+ foreach ($pages as $page) {
509
+ if (strpos($page['post_content'], '%%wppa%%') !== false || strpos($page['post_content'], '[wppa') !== false) {
510
+ $options_page[] = __($page['post_title'], 'wp-photo-album-plus');
511
+ $options_page_post[] = __($page['post_title'], 'wp-photo-album-plus');
512
+ $values_page[] = $page['ID'];
513
+ $values_page_post[] = $page['ID'];
514
+ }
515
+ else {
516
+ $options_page[] = '|'.__($page['post_title'], 'wp-photo-album-plus').'|';
517
+ $options_page_post[] = '|'.__($page['post_title'], 'wp-photo-album-plus').'|';
518
+ $values_page[] = $page['ID'];
519
+ $values_page_post[] = $page['ID'];
520
+ }
521
+ }
522
+ }
523
+ else {
524
+ $options_page[] = __('--- No page to link to (yet) ---', 'wp-photo-album-plus');
525
+ $values_page[] = '0';
526
+ }
527
 
528
+ $options_page_auto = $options_page;
529
+ $options_page_auto[0] = __('--- Will be auto created ---', 'wp-photo-album-plus');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
530
  ?>
531
 
532
  <div class="wppa-quick" style="display:none;" >
1667
  $clas = 'wppa_bc';
1668
  $tags = 'navi,layout';
1669
  wppa_setting($slug, '4.3', $name, $desc, $html, $help, $clas, $tags);
1670
+
1671
+ $name = __('Photo name', 'wp-photo-album-plus');
1672
+ $desc = __('Show name of photo above slideshow.', 'wp-photo-album-plus');
1673
+ $help = '';
1674
+ $slug = 'wppa_show_pname';
1675
+ $html = wppa_checkbox($slug);
1676
+ $clas = 'wppa_bc';
1677
+ $tags = 'navi,layout';
1678
+ wppa_setting($slug, '4.4', $name, $desc, $html, $help, $clas, $tags);
1679
 
1680
  $name = __('Separator', 'wp-photo-album-plus');
1681
  $desc = __('Breadcrumb separator symbol.', 'wp-photo-album-plus');
1889
  $desc = __('Enable the ugly browsing buttons.', 'wp-photo-album-plus');
1890
  $help = esc_js(__('If checked, the fullsize image is covered by two browse buttons.', 'wp-photo-album-plus'));
1891
  $slug = 'wppa_show_ubb';
 
1892
  $html = wppa_checkbox($slug);
 
 
 
1893
  $clas = '';
1894
  $tags = 'slide,navi';
1895
  wppa_setting($slug, '13.1', $name, $desc, $html, $help, $clas, $tags);
1898
  $desc = __('Show start and stop icons at the center of the slide', 'wp-photo-album-plus');
1899
  $help = '';
1900
  $slug = 'wppa_show_start_stop_icons';
 
1901
  $html = wppa_checkbox($slug);
 
 
 
1902
  $clas = '';
1903
  $tags = 'slide,navi';
1904
  wppa_setting($slug, '13.2', $name, $desc, $html, $help, $clas, $tags);
2007
 
2008
  $name = __('Show Share Buttons Thumbs', 'wp-photo-album-plus');
2009
  $desc = __('Display the share social media buttons under thumbnails.', 'wp-photo-album-plus');
2010
+ $help = '';
2011
  $slug = 'wppa_share_on_thumbs';
2012
  $onchange = 'wppaCheckShares()';
2013
  $html = wppa_checkbox($slug, $onchange);
2017
 
2018
  $name = __('Show Share Buttons Lightbox', 'wp-photo-album-plus');
2019
  $desc = __('Display the share social media buttons on lightbox displays.', 'wp-photo-album-plus');
2020
+ $help = '';
2021
  $slug = 'wppa_share_on_lightbox';
2022
  $onchange = 'wppaCheckShares()';
2023
  $html = wppa_checkbox($slug, $onchange);
2502
  }
2503
  wppa_setting_subheader( 'G', '1', __( 'Lightbox related settings. These settings have effect only when Table IX-J3 is set to wppa' , 'wp-photo-album-plus') );
2504
  {
 
 
 
 
 
 
 
 
 
 
 
2505
  $name = __('Overlay theme color', 'wp-photo-album-plus');
2506
  $desc = __('The color of the image border and text background.', 'wp-photo-album-plus');
2507
  $help = '';
3478
  $slug2 = 'wppa_bcolor_modal';
3479
  $slug = array($slug1, $slug2);
3480
  $html1 = wppa_input($slug1, '100px', '', '', "checkColor('".$slug1."')") . '</td><td>' . wppa_color_box($slug1);
3481
+ $html2 = '</td><td>';
3482
  $html = array($html1, $html2);
3483
  $clas = '';
3484
  $tags = 'layout';
3509
  $clas = 'svg';
3510
  $tags = 'layout,navi';
3511
  wppa_setting($slug, '15', $name, $desc, $html, $help, $clas, $tags);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3512
  }
3513
  ?>
3514
  </tbody>
3830
  $clas = '';
3831
  $tags = 'system,access';
3832
  wppa_setting($slug, '18', $name, $desc, $html, $help, $clas, $tags);
3833
+
 
 
 
 
 
 
 
 
 
3834
  $name = __('Thumbs first', 'wp-photo-album-plus');
3835
  $desc = __('When displaying album content: thumbnails before subalbums.', 'wp-photo-album-plus');
3836
  $help = '';
3912
  $clas = '';
3913
  $tags = 'system';
3914
  wppa_setting($slug, '28', $name, $desc, $html, $help, $clas, $tags);
3915
+
 
 
 
 
 
 
 
 
 
3916
  $name = __('Enable pdf', 'wp-photo-album-plus');
3917
  $desc = __('Enable the support of pdf files', 'wp-photo-album-plus');
3918
  $help = esc_js(__('This feature requires the activation of ImageMagick. See Table IX-K7', 'wp-photo-album-plus'));
4902
  $clas = '';
4903
  $tags = 'lightbox';
4904
  wppa_setting($slug, '3.2', $name, $desc, $html, $help, $clas, $tags);
4905
+
 
 
 
 
 
 
 
 
 
4906
  $name = __('WPPA+ Lightbox global', 'wp-photo-album-plus');
4907
  $desc = __('Use the wppa+ lightbox also for non-wppa images.', 'wp-photo-album-plus');
4908
  $help = '';
5194
  $slug2 = 'wppa_fontsize_widget_thumb';
5195
  $slug3 = '';
5196
  $slug4 = '';
 
5197
  $slug = $slug2;
5198
  $html1 = '';
5199
  $html2 = wppa_input($slug2, '40px', '', __('pixels', 'wp-photo-album-plus'));
5200
  $html3 = '';
5201
  $html4 = '';
 
5202
  $html = '</td><td>' . $html2 . '</td><td></td><td>';
5203
  $clas = '';
5204
  $tags = 'thumb,widget,size,layout';
5246
  <?php
5247
  $wppa_table = 'VI';
5248
  $wppa_subtable = 'Z';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
5249
 
5250
  wppa_setting_subheader('A', '4', __('Links from images in WPPA+ Widgets', 'wp-photo-album-plus'));
5251
  {
6356
  $desc = __('Enable frontend album creation.', 'wp-photo-album-plus');
6357
  $help = esc_js(__('If you check this item, frontend album creation will be enabled.', 'wp-photo-album-plus'));
6358
  $slug = 'wppa_user_create_on';
6359
+ $onchange = '';
6360
  $html1 = wppa_checkbox($slug, $onchange);
6361
  $html2 = '';
6362
  $html = array( $html1, $html2 );
6400
 
6401
  $name = __('User create Albums login', 'wp-photo-album-plus');
6402
  $desc = __('Frontend album creation requires the user is logged in.', 'wp-photo-album-plus');
6403
+ $help = '';
 
6404
  $slug = 'wppa_user_create_login';
6405
  $html1 = wppa_checkbox($slug);
6406
  $html2 = '';
6762
  $help = '';
6763
  $slug = 'wppa_upload_edit_users';
6764
  $opts = array( __('Admin and superuser', 'wp-photo-album-plus'), __('Owner, admin and superuser', 'wp-photo-album-plus' ) );
6765
+ $vals = array( 'admin', 'owner' );
6766
  $html1 = wppa_select($slug, $opts, $vals);
6767
  $html2 = '';
6768
  $html = array( $html1, $html2 );
6957
  $desc = __('Set the status of all the users photos to \'pending\'.', 'wp-photo-album-plus');
6958
  $help = esc_js(__('Also inhibits further uploads.', 'wp-photo-album-plus'));
6959
  $slug = 'wppa_blacklist_user';
 
6960
  $blacklist = get_option( 'wppa_black_listed_users', array() );
6961
 
6962
  if ( wppa_get_user_count() <= wppa_opt( 'max_users' ) ) {
7020
  $help = esc_js(__('This gives the user all the administrator privileges within wppa.', 'wp-photo-album-plus'));
7021
  $help .= '\n\n'.esc_js(__('Make sure the user also has a role that has all the boxes ticked in Table VII-A', 'wp-photo-album-plus'));
7022
  $slug = 'wppa_superuser_user';
 
7023
  $superlist = get_option( 'wppa_super_users', array() );
7024
 
7025
  if ( wppa_get_user_count() <= wppa_opt( 'max_users' ) ) {
7110
 
7111
  wppa_setting_subheader('A', '4', __('Harmless and reverseable actions', 'wp-photo-album-plus'));
7112
 
 
 
 
 
 
 
 
 
 
 
 
 
 
7113
  $name = __('Postpone cron', 'wp-photo-album-plus');
7114
  $desc = __('Temporary do no background processes.', 'wp-photo-album-plus');
7115
  $help = esc_js(__('This setting is meant to be used a.o. during bulk import/upload. Use with care!', 'wp-photo-album-plus'));
7267
  $desc = __('Remakes the index database table for photos.', 'wp-photo-album-plus');
7268
  $help = '';
7269
  $slug2 = 'wppa_remake_index_photos';
7270
+ $html1 = wppa_cronjob_button( $slug2 );
7271
  $html2 = wppa_maintenance_button( $slug2 );
7272
  $html3 = wppa_status_field( $slug2 );
7273
  $html4 = wppa_togo_field( $slug2 );
7280
  $desc = __('Remove obsolete entries from index db table.', 'wp-photo-album-plus');
7281
  $help = '';
7282
  $slug2 = 'wppa_cleanup_index';
7283
+ $html1 = wppa_cronjob_button( $slug2 );
7284
  $html2 = wppa_maintenance_button( $slug2 );
7285
  $html3 = wppa_status_field( $slug2 );
7286
  $html4 = wppa_togo_field( $slug2 );
8083
  $help = esc_js(__('If your php config does not properly set the max execution time, you can set it here. Seconds, 0 means do not change.', 'wp-photo-album-plus'));
8084
  $help .= '\n'.esc_js(__('A safe value is 45 in most cases', 'wp-photo-album-plus'));
8085
  $help .= '\n'.esc_js(sprintf(__('The PHP setting max_execution_time is set to %s.', 'wp-photo-album-plus'), ini_get('max_execution_time')));
 
8086
  $slug = 'wppa_max_execution_time';
8087
  $html = wppa_input($slug, '50px', '', 'seconds');
8088
  $clas = '';
8995
  $clas = '';
8996
  $tags = 'system,search';
8997
  wppa_setting($slug, '6', $name, $desc, $html, $help, $clas, $tags);
8998
+
 
 
 
 
 
 
 
 
8999
  $name = __('Max albums found', 'wp-photo-album-plus');
9000
  $desc = __('The maximum number of albums to be displayed.', 'wp-photo-album-plus');
9001
  $help = '';
9566
  $clas = '';
9567
  $tags = 'system,meta';
9568
  wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
9569
+
 
 
 
 
 
 
 
 
 
9570
  $name = __('Import Create page', 'wp-photo-album-plus');
9571
  $desc = __('Create wp page that shows the album when a directory to album is imported.', 'wp-photo-album-plus');
9572
  $help = esc_js(__('As soon as an album is created when a directory is imported, a wp page is made that displays the album content.', 'wp-photo-album-plus'));
9997
  $clas = 'wppa_gpx_plugin';
9998
  $tags = 'system';
9999
  wppa_setting($slug, '5.3', $name, $desc, $html, $help, $clas, $tags);
10000
+
10001
+ $name = __('Zoom level', 'wp-photo-album-plus');
10002
+ $desc = __('The zoomlevel for GPX maps', 'wp-photo-album-plus');
10003
+ $help = esc_js(__('This setting is for embedded implementation only.', 'wp-photo-album-plus'));
10004
+ $slug = 'wppa_geo_zoom';
10005
+ $opts = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25',);
10006
+ $vals = $opts;
10007
+ $html = wppa_select($slug, $opts, $vals);
10008
+ $clas = '';
10009
+ $tags = 'system';
10010
+ wppa_setting($slug, '5.4', $name, $desc, $html, $help, $clas, $tags);
10011
 
10012
  $name = __('Fotomoto', 'wp-photo-album-plus');
10013
  $desc = __('Yes, we use Fotomoto on this site. Read the help text!', 'wp-photo-album-plus');
10448
  <td><small><?php _e('Session db table name.', 'wp-photo-album-plus') ?></small></td>
10449
  <td><?php echo(WPPA_SESSION) ?></td>
10450
  <td><?php if ( wppa_user_is( 'administrator' ) ) {
10451
+ echo sprintf( __('Download %s is useless', 'wp-photo-album-plus'), WPPA_SESSION );
 
 
 
10452
  } ?>
10453
  </td>
10454
  </tr>
wppa-setup.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
- * Version 6.8.08
7
  *
8
  */
9
 
@@ -208,10 +208,6 @@ global $silent;
208
  $idx++;
209
  }
210
 
211
- // Clear Session
212
- // $wpdb->query( "TRUNCATE TABLE `".WPPA_SESSION."`" );
213
- // wppa_session_start();
214
-
215
  // Convert any changed and remove obsolete setting options
216
  if ( $old_rev > '100' ) { // On update only
217
  if ( $old_rev <= '402' ) {
@@ -646,10 +642,6 @@ global $silent;
646
  wppa_ok_message($msg);
647
  }
648
 
649
- // Check if db is ok
650
- if ( ! wppa_check_database() ) $wppa_error = true;
651
-
652
-
653
  // Remove dynamic files
654
  $files = glob( WPPA_PATH.'/wppa-init.*.js' );
655
  if ( $files ) {
@@ -859,6 +851,7 @@ Hide Camera info
859
  'wppa_show_home' => 'yes', // 4
860
  'wppa_home_text' => __( 'Home', 'wp-photo-album-plus' ),
861
  'wppa_show_page' => 'yes', // 4
 
862
  'wppa_bc_separator' => 'raquo', // 5
863
  'wppa_bc_txt' => htmlspecialchars('<span style="color:red; font_size:24px;">&bull;</span>'), // 6
864
  'wppa_bc_url' => wppa_get_imgdir().'arrow.gif', // 7
@@ -1786,6 +1779,7 @@ Hide Camera info
1786
  'wppa_map_apikey' => '',
1787
  'wppa_load_map_api' => 'no',
1788
  'wppa_gpx_shortcode' => '[map style="width: auto; height:300px; margin:0; " marker="yes" lat="w#lat" lon="w#lon"]',
 
1789
  'wppa_fotomoto_on' => 'no',
1790
  'wppa_fotomoto_fontsize' => '',
1791
  'wppa_fotomoto_hide_when_running' => 'no',
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
+ * Version 6.8.09
7
  *
8
  */
9
 
208
  $idx++;
209
  }
210
 
 
 
 
 
211
  // Convert any changed and remove obsolete setting options
212
  if ( $old_rev > '100' ) { // On update only
213
  if ( $old_rev <= '402' ) {
642
  wppa_ok_message($msg);
643
  }
644
 
 
 
 
 
645
  // Remove dynamic files
646
  $files = glob( WPPA_PATH.'/wppa-init.*.js' );
647
  if ( $files ) {
851
  'wppa_show_home' => 'yes', // 4
852
  'wppa_home_text' => __( 'Home', 'wp-photo-album-plus' ),
853
  'wppa_show_page' => 'yes', // 4
854
+ 'wppa_show_pname' => 'yes',
855
  'wppa_bc_separator' => 'raquo', // 5
856
  'wppa_bc_txt' => htmlspecialchars('<span style="color:red; font_size:24px;">&bull;</span>'), // 6
857
  'wppa_bc_url' => wppa_get_imgdir().'arrow.gif', // 7
1779
  'wppa_map_apikey' => '',
1780
  'wppa_load_map_api' => 'no',
1781
  'wppa_gpx_shortcode' => '[map style="width: auto; height:300px; margin:0; " marker="yes" lat="w#lat" lon="w#lon"]',
1782
+ 'wppa_geo_zoom' => '10',
1783
  'wppa_fotomoto_on' => 'no',
1784
  'wppa_fotomoto_fontsize' => '',
1785
  'wppa_fotomoto_hide_when_running' => 'no',
wppa-styles.php CHANGED
@@ -3,7 +3,7 @@
3
  /* Package: wp-photo-album-plus
4
  /*
5
  /* Various style computation routines
6
- /* Version 6.8.08
7
  /*
8
  */
9
 
@@ -253,6 +253,10 @@ global $wppa_dynamic_css_data;
253
  $content .= '
254
  #wppa-norms-btn, #wppa-fulls-btn { display:none; }';
255
  }
 
 
 
 
256
 
257
  // Add custom style
258
  $content .= wppa_opt( 'custom_style' );
3
  /* Package: wp-photo-album-plus
4
  /*
5
  /* Various style computation routines
6
+ /* Version 6.8.09
7
  /*
8
  */
9
 
253
  $content .= '
254
  #wppa-norms-btn, #wppa-fulls-btn { display:none; }';
255
  }
256
+ if ( ! wppa_switch( 'show_pname' ) ) {
257
+ $content .= '
258
+ .bc-pname { display:none; }';
259
+ }
260
 
261
  // Add custom style
262
  $content .= wppa_opt( 'custom_style' );
wppa-thumbnails.php CHANGED
@@ -5,7 +5,7 @@
5
  * Various funcions to display a thumbnail image
6
  * Contains all possible frontend thumbnail types
7
  *
8
- * Version 6.8.08
9
  *
10
  */
11
 
@@ -468,15 +468,7 @@ global $wpdb;
468
 
469
  // Close the image container
470
  $result .= '</div>';
471
- /*
472
- // The audio when popup
473
- if ( wppa_switch( 'use_thumb_popup' ) && wppa_switch( 'thumb_audio' ) && wppa_has_audio( $id ) && ! $com_alt ) {
474
- $result .= wppa_get_audio_html( array(
475
- 'id' => $id,
476
- 'width' => $imgwidth
477
- ));
478
- }
479
- */
480
  // Comten alt display?
481
  if ( $com_alt ) {
482
  $comaltwidth = wppa_get_container_width() - $imgwidth - 16 - wppa_get_thumbnail_area_delta();
5
  * Various funcions to display a thumbnail image
6
  * Contains all possible frontend thumbnail types
7
  *
8
+ * Version 6.8.09
9
  *
10
  */
11
 
468
 
469
  // Close the image container
470
  $result .= '</div>';
471
+
 
 
 
 
 
 
 
 
472
  // Comten alt display?
473
  if ( $com_alt ) {
474
  $comaltwidth = wppa_get_container_width() - $imgwidth - 16 - wppa_get_thumbnail_area_delta();
wppa-tinymce-photo-front.php CHANGED
@@ -2,7 +2,7 @@
2
  /* wppa-tinymce-photo-front.php
3
  * Pachkage: wp-photo-album-plus
4
  *
5
- * Version 6.8.08
6
  *
7
  */
8
 
@@ -91,4 +91,3 @@ $body . '
91
 
92
  }
93
  }
94
-
2
  /* wppa-tinymce-photo-front.php
3
  * Pachkage: wp-photo-album-plus
4
  *
5
+ * Version 6.8.09
6
  *
7
  */
8
 
91
 
92
  }
93
  }
 
wppa-tinymce-shortcodes.php CHANGED
@@ -2,9 +2,7 @@
2
  /* wppa-tinymce-shortcodes.php
3
  * Pachkage: wp-photo-album-plus
4
  *
5
- *
6
  * Version 6.8.08
7
- *
8
  */
9
 
10
  if ( ! defined( 'ABSPATH' ) )
2
  /* wppa-tinymce-shortcodes.php
3
  * Pachkage: wp-photo-album-plus
4
  *
 
5
  * Version 6.8.08
 
6
  */
7
 
8
  if ( ! defined( 'ABSPATH' ) )
wppa-upldr-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a list of users linking to their photos
6
- * Version 6.8.07
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -136,18 +136,19 @@ class UpldrWidget extends WP_Widget {
136
  $widget_content .= '<table><tbody>';
137
  $albs = $instance['parent'] ? wppa_expand_enum( wppa_alb_to_enum_children( wppa_expand_enum( $instance['parent'] ) ) ) : '';
138
  $a = $albs ? wppa_trim_wppa_( '&amp;wppa-album='.$albs ) : '';
 
139
 
140
  if ( $myline ) {
141
  $user = $myline;
142
  $widget_content .= '<tr class="wppa-user" >
143
- <td style="padding: 0 3px;" ><a href="'.wppa_encrypt_url(wppa_get_upldr_link($user['login']).$a).'" title="'.__('Photos uploaded by', 'wp-photo-album-plus').' '.$user['name'].'" ><b>'.$user['name'].'</b></a></td>
144
  <td style="padding: 0 3px;" ><b>'.$user['count'].'</b></td>
145
  <td style="padding: 0 3px;" ><b>'.wppa_get_time_since($user['date']).'</b></td>
146
  </tr>';
147
  }
148
  foreach ( $workarr as $user ) {
149
  $widget_content .= '<tr class="wppa-user" >
150
- <td style="padding: 0 3px;" ><a href="'.wppa_encrypt_url(wppa_get_upldr_link($user['login']).$a).'" title="'.__('Photos uploaded by', 'wp-photo-album-plus').' '.$user['name'].'" >'.$user['name'].'</a></td>
151
  <td style="padding: 0 3px;" >'.$user['count'].'</td>
152
  <td style="padding: 0 3px;" >'.wppa_get_time_since($user['date']).'</td>
153
  </tr>';
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a list of users linking to their photos
6
+ * Version 6.8.09
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
136
  $widget_content .= '<table><tbody>';
137
  $albs = $instance['parent'] ? wppa_expand_enum( wppa_alb_to_enum_children( wppa_expand_enum( $instance['parent'] ) ) ) : '';
138
  $a = $albs ? wppa_trim_wppa_( '&amp;wppa-album='.$albs ) : '';
139
+ $width = round( wppa_opt( 'widget_width' ) / 1.8 ) . 'px;';
140
 
141
  if ( $myline ) {
142
  $user = $myline;
143
  $widget_content .= '<tr class="wppa-user" >
144
+ <td style="padding: 0 3px;max-width:' . $width . 'overflow:hidden;" ><a href="'.wppa_encrypt_url(wppa_get_upldr_link($user['login']).$a).'" title="'.__('Photos uploaded by', 'wp-photo-album-plus').' '.$user['name'].'" ><b>'.$user['name'].'</b></a></td>
145
  <td style="padding: 0 3px;" ><b>'.$user['count'].'</b></td>
146
  <td style="padding: 0 3px;" ><b>'.wppa_get_time_since($user['date']).'</b></td>
147
  </tr>';
148
  }
149
  foreach ( $workarr as $user ) {
150
  $widget_content .= '<tr class="wppa-user" >
151
+ <td style="padding: 0 3px;max-width:' . $width . 'overflow:hidden;" ><a href="'.wppa_encrypt_url(wppa_get_upldr_link($user['login']).$a).'" title="'.__('Photos uploaded by', 'wp-photo-album-plus').' '.$user['name'].'" >'.$user['name'].'</a></td>
152
  <td style="padding: 0 3px;" >'.$user['count'].'</td>
153
  <td style="padding: 0 3px;" >'.wppa_get_time_since($user['date']).'</td>
154
  </tr>';
wppa-upload.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the upload pages and functions
6
- * Version 6.8.08
7
  *
8
  */
9
 
@@ -134,9 +134,7 @@ global $upload_album;
134
  }
135
  $max_size = ini_get( 'upload_max_filesize' );
136
  $max_tot_size = ini_get( 'post_max_size' );
137
- /* debug */
138
- // $max_size = '2G';
139
- /**/
140
  $max_tot_size_mbytes = substr( $max_tot_size, 0, strlen( $max_tot_size ) - 1 );
141
  if ( substr( $max_tot_size, -1 ) == 'G' ) { // May upload gigabytes!!
142
  $max_tot_size_mbytes *= 1024;
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the upload pages and functions
6
+ * Version 6.8.09
7
  *
8
  */
9
 
134
  }
135
  $max_size = ini_get( 'upload_max_filesize' );
136
  $max_tot_size = ini_get( 'post_max_size' );
137
+
 
 
138
  $max_tot_size_mbytes = substr( $max_tot_size, 0, strlen( $max_tot_size ) - 1 );
139
  if ( substr( $max_tot_size, -1 ) == 'G' ) { // May upload gigabytes!!
140
  $max_tot_size_mbytes *= 1024;
wppa-utils.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
- * Version 6.8.07
7
  *
8
  */
9
 
@@ -527,7 +527,7 @@ function wppa_add_paths( $albums ) {
527
  return $albums;
528
  }
529
 
530
- function wppa_add_parents($pages) {
531
  global $wpdb;
532
  static $parents;
533
  static $titles;
@@ -544,19 +544,19 @@ static $titles;
544
 
545
  if ( is_array($pages) ) foreach ( array_keys($pages) as $index ) {
546
  $tempid = $pages[$index]['ID'];
547
- $pages[$index]['post_title'] = __(stripslashes($pages[$index]['post_title']));
548
  while ( $tempid > '0') {
549
  if ( isset( $parents[$tempid] ) ) {
550
  $tempid = $parents[$tempid];
551
  }
552
  else {
553
- $t = $wpdb->get_var($wpdb->prepare("SELECT `post_parent` FROM `" . $wpdb->posts . "` WHERE `ID` = %s", $tempid));
554
  $parents[$tempid] = $t;
555
  $tempid = $t;
556
  }
557
  if ( $tempid > '0' ) {
558
  if ( ! isset( $titles[$tempid] ) ) {
559
- $titles[$tempid] = __(stripslashes($wpdb->get_var($wpdb->prepare("SELECT `post_title` FROM `" . $wpdb->posts . "` WHERE `ID` = %s", $tempid))));
560
  }
561
  $pages[$index]['post_title'] = $titles[$tempid].' > '.$pages[$index]['post_title'];
562
  }
@@ -567,16 +567,16 @@ static $titles;
567
  }
568
 
569
  // Sort an array on a column, keeping the indexes
570
- function wppa_array_sort($array, $on, $order=SORT_ASC) {
571
 
572
  $new_array = array();
573
  $sortable_array = array();
574
 
575
- if (count($array) > 0) {
576
- foreach ($array as $k => $v) {
577
- if (is_array($v)) {
578
- foreach ($v as $k2 => $v2) {
579
- if ($k2 == $on) {
580
  $sortable_array[$k] = $v2;
581
  }
582
  }
@@ -585,16 +585,16 @@ function wppa_array_sort($array, $on, $order=SORT_ASC) {
585
  }
586
  }
587
 
588
- switch ($order) {
589
  case SORT_ASC:
590
- asort($sortable_array);
591
  break;
592
  case SORT_DESC:
593
- arsort($sortable_array);
594
  break;
595
  }
596
 
597
- foreach ($sortable_array as $k => $v) {
598
  $new_array[$k] = $array[$k];
599
  }
600
  }
@@ -610,7 +610,7 @@ function wppa_get_taglist() {
610
  }
611
  else {
612
  if ( is_array($result) ) foreach ( array_keys($result) as $tag ) {
613
- $result[$tag]['ids'] = wppa_index_string_to_array($result[$tag]['ids']);
614
  }
615
  }
616
  return $result;
@@ -788,9 +788,6 @@ global $wppa_opt;
788
  // Update the local cache
789
  $wppa_opt[$option] = $value;
790
 
791
- // Delete the cached options
792
- // delete_option( 'wppa_cached_options' );
793
-
794
  // Remove init.js files, they will be auto re-created
795
  $files = glob( WPPA_PATH.'/wppa-init.*.js' );
796
  if ( $files ) {
@@ -2651,7 +2648,6 @@ static $wppa_void_keywords;
2651
  // Remove spaces and funny chars
2652
  $temp = str_replace( array( ' ', '-', '"', "'", '\\', '>', '<', ',', ':', ';', '!', '?', '=', '_', '[', ']', '(', ')', '{', '}' ), ',', $temp );
2653
  $temp = str_replace( ',,', ',', $temp );
2654
- //wppa_log('dbg', $temp);
2655
 
2656
  // Make array
2657
  $wppa_void_keywords = explode( ',', $temp );
@@ -3315,69 +3311,6 @@ global $wpdb;
3315
  return $result;
3316
  }
3317
 
3318
- /* Add page id to list of pages that need css and js
3319
- function wppa_add_wppa_on_page() {
3320
- global $wppa_first_id;
3321
-
3322
- // Feature enabled?
3323
- if ( ! wppa_switch( 'js_css_optional' ) ) {
3324
- return;
3325
- }
3326
-
3327
- // Init
3328
- $pages = wppa_index_string_to_array( get_option( 'wppa_on_pages_list' ) );
3329
- $ID = get_the_ID();
3330
- $doit = false;
3331
-
3332
- // Check for the current ID
3333
- if ( $ID ) {
3334
- if ( ! in_array( $ID, $pages ) ) {
3335
- $pages[] = $ID;
3336
- $doit = true;
3337
- }
3338
- }
3339
-
3340
- // Check for the first encountered ID that may not need wppa. Mark it as it is now the first post on a page, but posts further on the page will going to need it
3341
- if ( $wppa_first_id ) {
3342
- if ( ! in_array( $wppa_first_id, $pages ) ) {
3343
- $pages[] = $wppa_first_id;
3344
- $doit = true;
3345
- }
3346
- }
3347
-
3348
- if ( $doit ) {
3349
- sort( $pages, SORT_NUMERIC );
3350
- update_option( 'wppa_on_pages_list', wppa_index_array_to_string( $pages ) );
3351
- echo '<script type="text/javascript" >document.location.reload(true);</script>';
3352
- }
3353
- }
3354
-
3355
- // See during init if wppa styles and css is needed
3356
- function wppa_wppa_on_page() {
3357
- global $wppa_first_id;
3358
-
3359
- // Feature enabled?
3360
- if ( ! wppa_switch( 'js_css_optional' ) ) {
3361
- return true;
3362
- }
3363
-
3364
- // Init
3365
- $ID = get_the_ID();
3366
-
3367
- // Remember the first ID
3368
- if ( ! $wppa_first_id ) {
3369
- if ( $ID ) {
3370
- $wppa_first_id = $ID;
3371
- }
3372
- }
3373
-
3374
- // Look up
3375
- $pages = wppa_index_string_to_array( get_option( 'wppa_on_pages_list' ) );
3376
- $result = in_array( $ID, $pages );
3377
-
3378
- return $result;
3379
- }
3380
- */
3381
  // Get an svg image html
3382
  // @1: string: Name of the .svg file without extension
3383
  // @2: string: CSS height or empty, no ; required
@@ -3389,11 +3322,6 @@ global $wppa_first_id;
3389
  // @8: string: border radius in %: heavy
3390
  function wppa_get_svghtml( $name, $height = false, $lightbox = false, $border = false, $none = '0', $light = '10', $medium = '20', $heavy = '50' ) {
3391
 
3392
- // Slideonly has no navigation
3393
- // if ( wppa( 'is_slideonly' ) && ! wppa( 'is_slideonlyf' ) ) {
3394
- // return '';
3395
- // }
3396
-
3397
  // Find the colors
3398
  if ( $lightbox ) {
3399
  $fillcolor = wppa_opt( 'ovl_svg_color' );
@@ -3593,24 +3521,23 @@ function wppa_get_svghtml( $name, $height = false, $lightbox = false, $border =
3593
 
3594
  // Compose html. Non native svg or gif/png
3595
  else {
3596
- if ( $use_svg ) wppa_log('dbg','Still used for '.$name,true);
3597
- $result = '<img' .
3598
- ' src="' . wppa_get_imgdir( $src ) . '"' .
3599
- ( $use_svg ? ' class="wppa-svg"' : '' ) .
3600
- ' style="' .
3601
- ( $height ? 'height:' . $height . ';' : '' ) .
3602
- 'fill:' . $fillcolor . ';' .
3603
- 'background-color:' . $bgcolor . ';' .
3604
- ( $use_svg ? 'display:none;' : '' ) .
3605
- 'text-decoration:none !important;' .
3606
- 'vertical-align:middle;' .
3607
- ( $bradius ? 'border-radius:' . $bradius . '%;' : '' ) .
3608
- ( $border ? 'border:2px solid ' . $bgcolor . ';box-sizing:border-box;' : '' ) .
3609
-
3610
- '"' .
3611
- ' alt="' . $name . '"' .
3612
- // ' onload="wppaReplaceSvg()"' .
3613
- ' />';
3614
  }
3615
  return $result;
3616
  }
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
+ * Version 6.8.09
7
  *
8
  */
9
 
527
  return $albums;
528
  }
529
 
530
+ function wppa_add_parents( $pages ) {
531
  global $wpdb;
532
  static $parents;
533
  static $titles;
544
 
545
  if ( is_array($pages) ) foreach ( array_keys($pages) as $index ) {
546
  $tempid = $pages[$index]['ID'];
547
+ $pages[$index]['post_title'] = __( stripslashes( $pages[$index]['post_title'] ) );
548
  while ( $tempid > '0') {
549
  if ( isset( $parents[$tempid] ) ) {
550
  $tempid = $parents[$tempid];
551
  }
552
  else {
553
+ $t = $wpdb->get_var( $wpdb->prepare( "SELECT `post_parent` FROM `" . $wpdb->posts . "` WHERE `ID` = %s", $tempid ) );
554
  $parents[$tempid] = $t;
555
  $tempid = $t;
556
  }
557
  if ( $tempid > '0' ) {
558
  if ( ! isset( $titles[$tempid] ) ) {
559
+ $titles[$tempid] = __( stripslashes( $wpdb->get_var( $wpdb->prepare( "SELECT `post_title` FROM `" . $wpdb->posts . "` WHERE `ID` = %s", $tempid ) ) ) );
560
  }
561
  $pages[$index]['post_title'] = $titles[$tempid].' > '.$pages[$index]['post_title'];
562
  }
567
  }
568
 
569
  // Sort an array on a column, keeping the indexes
570
+ function wppa_array_sort( $array, $on, $order = SORT_ASC ) {
571
 
572
  $new_array = array();
573
  $sortable_array = array();
574
 
575
+ if ( count( $array ) > 0 ) {
576
+ foreach ( $array as $k => $v ) {
577
+ if ( is_array( $v ) ) {
578
+ foreach ( $v as $k2 => $v2 ) {
579
+ if ( $k2 == $on ) {
580
  $sortable_array[$k] = $v2;
581
  }
582
  }
585
  }
586
  }
587
 
588
+ switch ( $order ) {
589
  case SORT_ASC:
590
+ asort( $sortable_array );
591
  break;
592
  case SORT_DESC:
593
+ arsort( $sortable_array );
594
  break;
595
  }
596
 
597
+ foreach ( $sortable_array as $k => $v ) {
598
  $new_array[$k] = $array[$k];
599
  }
600
  }
610
  }
611
  else {
612
  if ( is_array($result) ) foreach ( array_keys($result) as $tag ) {
613
+ $result[$tag]['ids'] = wppa_index_string_to_array( $result[$tag]['ids'] );
614
  }
615
  }
616
  return $result;
788
  // Update the local cache
789
  $wppa_opt[$option] = $value;
790
 
 
 
 
791
  // Remove init.js files, they will be auto re-created
792
  $files = glob( WPPA_PATH.'/wppa-init.*.js' );
793
  if ( $files ) {
2648
  // Remove spaces and funny chars
2649
  $temp = str_replace( array( ' ', '-', '"', "'", '\\', '>', '<', ',', ':', ';', '!', '?', '=', '_', '[', ']', '(', ')', '{', '}' ), ',', $temp );
2650
  $temp = str_replace( ',,', ',', $temp );
 
2651
 
2652
  // Make array
2653
  $wppa_void_keywords = explode( ',', $temp );
3311
  return $result;
3312
  }
3313
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3314
  // Get an svg image html
3315
  // @1: string: Name of the .svg file without extension
3316
  // @2: string: CSS height or empty, no ; required
3322
  // @8: string: border radius in %: heavy
3323
  function wppa_get_svghtml( $name, $height = false, $lightbox = false, $border = false, $none = '0', $light = '10', $medium = '20', $heavy = '50' ) {
3324
 
 
 
 
 
 
3325
  // Find the colors
3326
  if ( $lightbox ) {
3327
  $fillcolor = wppa_opt( 'ovl_svg_color' );
3521
 
3522
  // Compose html. Non native svg or gif/png
3523
  else {
3524
+ $result =
3525
+ '<img' .
3526
+ ' src="' . wppa_get_imgdir( $src ) . '"' .
3527
+ ( $use_svg ? ' class="wppa-svg"' : '' ) .
3528
+ ' style="' .
3529
+ ( $height ? 'height:' . $height . ';' : '' ) .
3530
+ 'fill:' . $fillcolor . ';' .
3531
+ 'background-color:' . $bgcolor . ';' .
3532
+ ( $use_svg ? 'display:none;' : '' ) .
3533
+ 'text-decoration:none !important;' .
3534
+ 'vertical-align:middle;' .
3535
+ ( $bradius ? 'border-radius:' . $bradius . '%;' : '' ) .
3536
+ ( $border ? 'border:2px solid ' . $bgcolor . ';box-sizing:border-box;' : '' ) .
3537
+
3538
+ '"' .
3539
+ ' alt="' . $name . '"' .
3540
+ ' />';
 
3541
  }
3542
  return $result;
3543
  }
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.8.09.Beta.001
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 = '6808'; // WPPA db version
26
- global $wppa_api_version; $wppa_api_version = '6-8-09-Beta-001'; // 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.8.09.004
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 = '6809'; // WPPA db version
26
+ global $wppa_api_version; $wppa_api_version = '6-8-09-004'; // WPPA software version
27
 
28
  /* start timers */
29
  global $wppa_starttime; $wppa_starttime = microtime( true );