WP Photo Album Plus - Version 8.1.05.001

Version Description

= 8.1.02 =

This version addresses various bug fixes, feature requests and security fixes.

Release Info

Developer	opajaap
Plugin	WP Photo Album Plus
Version	8.1.05.001
Comparing to
See all releases

Code changes from version 8.1.04.004 to 8.1.05.001

Files changed (41) hide show

changelog.txt +5 -0
js/wppa-admin-scripts.js +7 -5
js/wppa-admin-scripts.min.js +1 -1
wppa-admin-functions.php +7 -6
wppa-ajax.php +6 -6
wppa-album-admin-autosave.php +32 -32
wppa-boxes-html.php +43 -55
wppa-cache.php +3 -3
wppa-comment-admin.php +3 -3
wppa-common-functions.php +2 -5
wppa-dashboard-widgets.php +10 -10
wppa-defaults.php +3 -3
wppa-export.php +3 -3
wppa-filter.php +2 -2
wppa-functions.php +13 -7
wppa-help.php +8 -8
wppa-import.php +1003 -1022
wppa-init.php +9 -9
wppa-input.php +2 -1
wppa-items.php +2 -2
wppa-mailing.php +15 -15
wppa-maintenance.php +9 -9
wppa-multitag-widget.php +2 -2
wppa-notify-widget.php +2 -2
wppa-photo-admin-autosave.php +14 -14
wppa-potd-widget.php +2 -2
wppa-scripts.php +1 -1
wppa-setting-functions.php +9 -4
wppa-settings-autosave.php +213 -213
wppa-slideshow.php +2 -2
wppa-stats-widget.php +17 -17
wppa-tagcloud-widget.php +2 -2
wppa-tinymce-common.php +7 -7
wppa-tinymce-shortcodes.php +11 -11
wppa-upldr-widget.php +3 -3
wppa-upload-widget.php +2 -10
wppa-upload.php +5 -5
wppa-utils.php +5 -5
wppa-widget-functions.php +5 -5
wppa-wrappers.php +10 -1
wppa.php +2 -2

changelog.txt CHANGED Viewed

	@@ -1,5 +1,10 @@
1	WP Photo Album Plus Changelog
2





3	= 8.1.04 =
4
5	* Fixed frontend upload.


1	WP Photo Album Plus Changelog
2
3	+ = 8.1.05 =
4	+
5	+ * Fixed a js error when no nicescroller active.
6	+ * Added list tags in allowed html tags for descriptions.
7	+
8	= 8.1.04 =
9
10	* Fixed frontend upload.

js/wppa-admin-scripts.js CHANGED Viewed

	@@ -1,7 +1,7 @@
1	/* admin-scripts.js */
2	/* Package: wp-photo-album-plus
3	/*
4	- /* Version 8.1.02.~~005~~
5	/* Various js routines used in admin pages
6	*/
7
	@@ -1144,9 +1144,11 @@ function wppaMaintenanceProc(slug, intern, asCronJob ) {
1144	}
1145
1146	// Continue if not stopped by user
1147	- if ( document.getElementById(slug+"_continue")~~.value~~ ~~== 'yes'~~ ) {
1148	- ~~setTimeout~~(~~'wppaMaintenanceProc~~(~~\''+~~slug+'\', ~~true~~)', ~~20);~~
1149	- ~~return~~;


1150	}
1151
1152	// Stopped but not ready yet
	@@ -1415,9 +1417,9 @@ function wppaPhotoStatusChange(id) {
1415
1416	// Init
1417	jQuery('#psdesc-'+id).css({display: 'none'});
1418	- if ( ! jQuery('#status-'+id) ) return;
1419
1420	elm = document.getElementById('status-'+id);

1421
1422	if ( elm.value == 'pending' \|\| elm.value == 'scheduled' ) {
1423	jQuery('#photoitem-'+id).css({backgroundColor: '#ffebe8', borderColor: '#cc0000'});


1	/* admin-scripts.js */
2	/* Package: wp-photo-album-plus
3	/*
4	+ /* Version 8.1.05.001
5	/* Various js routines used in admin pages
6	*/
7

1144	}
1145
1146	// Continue if not stopped by user
1147	+ if ( document.getElementById(slug+"_continue") ) {
1148	+ if ( document.getElementById(slug+"_continue").value == 'yes' ) {
1149	+ setTimeout('wppaMaintenanceProc(\''+slug+'\', true)', 20);
1150	+ return;
1151	+ }
1152	}
1153
1154	// Stopped but not ready yet

1417
1418	// Init
1419	jQuery('#psdesc-'+id).css({display: 'none'});

1420
1421	elm = document.getElementById('status-'+id);
1422	+ if ( ! elm ) return; // From frontend?
1423
1424	if ( elm.value == 'pending' \|\| elm.value == 'scheduled' ) {
1425	jQuery('#photoitem-'+id).css({backgroundColor: '#ffebe8', borderColor: '#cc0000'});

js/wppa-admin-scripts.min.js CHANGED Viewed

@@ -1 +1 @@

- function checkjQueryRev(e,t,a){var p=parseFloat(jQuery.fn.jquery);t.checked&&p<a&&(alert(e+"\nThe version of your jQuery library: "+p+" is too low for this feature. It requires version "+a),t.checked="")}function wppaReUpload(e,o,t,r){document.getElementById("wppa-re-up-form-"+o);var a=document.getElementById("wppa-re-up-file-"+o),u=document.getElementById("wppa-re-up-butn-"+o);e.preventDefault();a=a.files[0];if(a.type.match("image.*")){if(0==t.length)alert("Filename will be set to "+a.name);else if(a.name!=t&&!confirm("Filename is different.\nIf you continue, the filename will not be updated!.\n\nContinue?"))return void jQuery("#re-up-"+o).css("display","none");u.value="Uploading...",u.style.color="black";t=new FormData;t.append("photo",a,a.name);var l=new XMLHttpRequest,a="?action=wppa&wppa-action=update-photo&photo-id="+o+"&item=file&wppa-nonce="+document.getElementById("photo-nonce-"+o).value;l.open("POST",wppaAjaxUrl+a,!0),l.onload=function(){if(200===l.status){var e=wppaTrim(l.responseText).split("||");switch(""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),e[1]){case"0":var t,a,p,n=JSON.parse(e[2]);for(t in n)switch(p=n[t],t){case"remark":p=(p=(p=p.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),a="0"!=e[1]?''+p+"":''+p+"",r&&(a+=' Reloading...'),jQuery("#remark-"+o).html(a);break;case"photourl":wppaCropper[o]?wppaCropper[o].replace(p):jQuery("#photourl-"+o).attr("src",p),jQuery("#thumba-"+o).attr("href",p);break;case"thumburl":jQuery("#thumburl-"+o).attr("src",p);break;case"magickstack":jQuery("#magickstack-"+o).html(p),0<p.length?jQuery("#imstackbutton-"+o).css("display","inline"):jQuery("#imstackbutton-"+o).css("display","none");break;default:jQuery("#"+t+"-"+o).html(p)}u.value="Upload",jQuery("#re-up-"+o).css("display","none");break;case"99":document.getElementById("photoitem-"+o).innerHTML=''+e[2]+"";break;default:document.getElementById("remark-"+o).innerHTML=''+e[2]+" ("+e[1]+")",u.value="Error occured",u.style.color="red"}}else alert("An error occurred!")},l.send(t)}else alert("File is not an image file!")}jQuery(document).ready(function(){jQuery(window).on("DOMContentLoaded load resize scroll",function(){wppaMakeLazyVisible("windowon")}),wppaMakeLazyVisible("docready")});var _wppaRefreshAfter=!1;function wppaRefreshAfter(){_wppaRefreshAfter=!0}function wppaCheckWidgetMethod(){var e,t,a;if("4"==document.getElementById("wppa-wm").value?(document.getElementById("wppa-wp").style.visibility="visible","day-of-week"==(a=jQuery("#wppa-wp").val())||"day-of-month"==a||"day-of-year"==a?jQuery(".wppa-order").css("visibility",""):jQuery(".wppa-order").css("visibility","hidden")):(document.getElementById("wppa-wp").style.visibility="hidden",jQuery(".wppa-order").css("visibility","hidden")),"1"==document.getElementById("wppa-wm").value)for(e=document.getElementsByName("wppa-widget-photo"),t=0;t<e.length;)e[t].style.visibility="visible",t++;else for(e=document.getElementsByName("wppa-widget-photo"),t=0;t<e.length;)e[t].style.visibility="hidden",t++}function wppa_tablecookieon(e){wppa_setCookie("table_"+e,"on","365")}function wppa_tablecookieoff(e){wppa_setCookie("table_"+e,"off","365")}function wppaCookieCheckbox(e,t){e.checked?wppa_setCookie(t,"on","365"):wppa_setCookie(t,"off","365")}function wppa_move_up(e){document.location=wppa_moveup_url+e+"&wppa-nonce="+document.getElementById("wppa-nonce").value}function checkColor(e){var t=e.substr(5),e=jQuery("#"+t).val();jQuery("#colorbox-"+t).css("background-color",e)}function checkAll(e,t){e=document.getElementById(e);e&&(e.checked?jQuery(t).prop("checked",!0):jQuery(t).prop("checked",!1))}function impUpd(e,t){e.checked?(jQuery(t).val(wppa_update),jQuery(".hideifupdate").css("display","none")):(jQuery(t).val(wppa_import),jQuery(".hideifupdate").css("display",""))}function wppaAjaxDeletePhoto(t,e,a){var p="",n="",p=e||'<div style="padding-left:5px;" >';a?n=a:aftrer="</div>",wppaFeAjaxLog("in");var o=wppaGetXmlHttp(),a=wppaAjaxUrl+"?action=wppa&wppa-action=delete-photo&photo-id="+t;a+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,o.open("GET",a,!0),o.send(),o.onreadystatechange=function(){switch(o.readyState){case 1:document.getElementById("remark-"+t).innerHTML="server connection established";break;case 2:document.getElementById("remark-"+t).innerHTML="request received";break;case 3:document.getElementById("remark-"+t).innerHTML="processing request";break;case 4:var e;200==o.status?("ER"==(e=wppaTrim(o.responseText).split("||"))[0]?(e[3]&&alert(e[3]),jQuery("#wppa-delete-"+t).css("text-decoration","line-through")):""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),0==e[1]?document.getElementById("remark-"+t).innerHTML=e[2]:(document.getElementById("photoitem-"+t).innerHTML=p+e[2]+n,wppaProcessFull(e[3],e[4])),jQuery(window).trigger("scroll"),wppaFeAjaxLog("out")):document.getElementById("photoitem-"+t).innerHTML=p+'Comm error '+o.status+": "+o.statusText+""+n}}}function wppaAjaxUndeletePhoto(t){wppaFeAjaxLog("in");var a=wppaGetXmlHttp(),e=wppaAjaxUrl+"?action=wppa&wppa-action=undelete-photo&photo-id="+t;e+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,a.open("GET",e,!0),a.send(),a.onreadystatechange=function(){switch(a.readyState){case 1:document.getElementById("remark-"+t).innerHTML="server connection established";break;case 2:document.getElementById("remark-"+t).innerHTML="request received";break;case 3:document.getElementById("remark-"+t).innerHTML="processing request";break;case 4:var e;200==a.status?("ER"==(e=wppaTrim(a.responseText).split("||"))[0]?(e[3]&&alert(e[3]),jQuery("#wppa-delete-"+t).css("text-decoration","line-through")):""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),0==e[1]?document.getElementById("remark-"+t).innerHTML=e[2]:document.getElementById("photoitem-"+t).innerHTML='<div style="padding-left:5px;" >'+e[2]+"</div>",wppaFeAjaxLog("out")):document.getElementById("photoitem-"+t).innerHTML=before+'Comm error '+a.status+": "+a.statusText+""+after}}}function wppaAjaxApplyWatermark(t,e,a){wppaFeAjaxLog("in");var p=wppaGetXmlHttp();jQuery("#wppa-water-spin-"+t).css({visibility:"visible"});var n="action=wppa&wppa-action=watermark-photo&photo-id="+t;n+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,e&&(n+="&wppa-watermark-file="+e),a&&(n+="&wppa-watermark-pos="+a),p.open("POST",wppaAjaxUrl,!0),p.setRequestHeader("Content-type","application/x-www-form-urlencoded"),p.send(n),p.onreadystatechange=function(){var e;4==p.readyState&&(200==p.status?(""!=(e=wppaTrim(p.responseText).split("||"))[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?(document.getElementById("remark-"+t).innerHTML=e[2],setTimeout(function(){document.location.reload(!0)},500)):document.getElementById("remark-"+t).innerHTML=''+e[2]+"",jQuery("#wppa-water-spin-"+t).css({visibility:"hidden"}),wppaFeAjaxLog("out")):document.getElementById("remark-"+t).innerHTML='Comm error '+p.status+": "+p.statusText+"")}}function wppaAjaxUpdateIptc(l,e,t,a){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-iptc&photo-id="+l+"&item="+e+"&wppa-nonce="+document.getElementById("photo-nonce-"+l).value+"&value="+wppaEncode(t)+"&tagname="+a,async:!0,type:"POST",timeout:6e4,beforeSend:function(e){jQuery("#remark-"+l).html("Working, please wait...")},success:function(e,t,a){var p=wppaTrim(e).split("||");if(""!=p[0]&&alert("The server returned unexpected output:\n"+p[0]),"99"===p[1])jQuery("#photoitem-"+l).html(bef+''+p[2]+""+aft);else{var n,o,r,u=JSON.parse(p[2]);for(n in u)switch(r=u[n],n){case"remark":r=(r=(r=r.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),o="0"!=p[1]?''+r+"":''+r+"",jQuery("#remark-"+l).html(o);break;case"photourl":wppaCropper[l]?wppaCropper[l].replace(r):jQuery("#photourl-"+l).attr("src",r),jQuery("#thumba-"+l).attr("href",r);break;case"thumburl":jQuery("#thumburl-"+l).attr("src",r);break;case"magickstack":jQuery("#magickstack-"+l).html(r),0<r.length?jQuery("#imstackbutton-"+l).css("display","inline"):jQuery("#imstackbutton-"+l).css("display","none")}}wppaFeAjaxLog("out")},error:function(e,t,a){jQuery("#remark-"+l).html('Comm error '+t+""),wppaConsoleLog("wppaAjaxUpdatePhoto failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){jQuery("#wppa-admin-spinner").css("display","none"),jQuery(window).trigger("scroll")}})}function wppaAjaxUpdatePhoto(l,i,e,s,c,d){c=c||"",d=d||"",wppaFeAjaxLog("in"),jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-photo&photo-id="+l+"&item="+i+"&wppa-nonce="+document.getElementById("photo-nonce-"+l).value+"&value="+wppaEncode(e),async:!0,type:"POST",timeout:6e4,beforeSend:function(e){"description"==i&&jQuery("#wppa-photo-spin-"+l).css({visibility:"visible"}),jQuery("#remark-"+l).html("Working, please wait...")},success:function(e,t,a){var p=wppaTrim(e).split("||");if(""!=p[0]&&alert("The server returned unexpected output:\n"+p[0]),"99"===p[1])jQuery("#photoitem-"+l).html(c+''+p[2]+""+d);else{var n,o,r,u=JSON.parse(p[2]);for(n in u)switch(r=u[n],n){case"remark":r=(r=(r=r.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),o="0"!=p[1]?''+r+"":''+r+"",s&&(o+=' Reloading...'),jQuery("#remark-"+l).html(o);break;case"photourl":wppaCropper[l]?wppaCropper[l].replace(r):jQuery("#photourl-"+l).attr("src",r),jQuery("#thumba-"+l).attr("href",r);break;case"thumburl":jQuery("#thumburl-"+l).attr("src",r);break;case"magickstack":jQuery("#magickstack-"+l).html(r),0<r.length?jQuery("#imstackbutton-"+l).css("display","inline"):jQuery("#imstackbutton-"+l).css("display","none");break;default:jQuery("#"+n+"-"+l).html(r)}}"description"==i&&jQuery("#wppa-photo-spin-"+l).css({visibility:"hidden"}),wppaFeAjaxLog("out")},error:function(e,t,a){jQuery("#remark-"+l).html('Comm error '+t+""),wppaConsoleLog("wppaAjaxUpdatePhoto failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){var p=(p=document.location.href).replace(/&pano-val=./,"");s?setTimeout(function(){document.location.href=p},300):(jQuery("#wppa-admin-spinner").css("display","none"),jQuery(window).trigger("scroll"))}})}function wppaChangeScheduleAlbum(e,t){jQuery(t).prop("checked")?jQuery(".wppa-datetime-"+e).css("display","inline"):(jQuery(".wppa-datetime-"+e).css("display","none"),wppaAjaxUpdateAlbum(e,"scheduledtm",Math.rand()))}function wppaChangeScheduleDelAlbum(e,t){jQuery(t).prop("checked")?jQuery(".wppa-datetimedel-"+e).css("display","inline"):(jQuery(".wppa-datetimedel-"+e).css("display","none"),wppaAjaxUpdateAlbum(e,"scheduledel",Math.rand()))}var _wppaRefreshAfter=!1,wppaAjaxAlbumCount=0,wppaAlbumUpdateMatrix=new Array;function wppaAjaxUpdateAlbum(e,t,a,p){var n=0==jQuery("#wppaalbumdesc:visible").length;jQuery("#wppaalbumdesc-html").click();for(var o=wppaAlbumUpdateMatrix.length,r=0,u=!1,l=-1;r<o;)wppaAlbumUpdateMatrix[r][0]==e&&wppaAlbumUpdateMatrix[r][1]==t&&(u=!0,l=r),r++;u||(wppaAlbumUpdateMatrix[o]=[e,t,"undefined",!1,!1,p],l=o),wppaAlbumUpdateMatrix[l][3]="number"==typeof a?a:a.value,wppaAlbumUpdateMatrix[l][5]=p,wppaAjaxUpdateAlbumMonitor(n)}function wppaAjaxUpdateAlbumMonitor(e){for(var t=wppaAlbumUpdateMatrix.length,a=0;a<t;)wppaAlbumUpdateMatrix[a][2]==wppaAlbumUpdateMatrix[a][3]||wppaAlbumUpdateMatrix[a][4]||(wppaAlbumUpdateMatrix[a][4]=!0,_wppaAjaxUpdateAlbum(wppaAlbumUpdateMatrix[a][0],wppaAlbumUpdateMatrix[a][1],wppaAlbumUpdateMatrix[a][3],e,wppaAlbumUpdateMatrix[a][5])),a++;e&&jQuery("#wppaalbumdesc-tmce").click()}function _wppaAjaxUpdateAlbum(r,u,l,i,s){wppaAjaxAlbumCount++;jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-album&album-id="+r+"&item="+u+"&wppa-nonce="+document.getElementById("album-nonce-"+r).value+"&value="+wppaEncode(l),async:!0,type:"POST",timeout:6e4,beforeSend:function(e){"description"==u&&jQuery("#wppa-album-spin").css({visibility:"visible"}),jQuery("#albumstatus-"+r).html("Working, please wait... ("+wppaAjaxAlbumCount+")")},success:function(e,t,a){e=wppaTrim(e).split("||");if(wppaAjaxAlbumCount--,""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?0==wppaAjaxAlbumCount?jQuery("#albumstatus-"+r).html(e[2]):jQuery("#albumstatus-"+r).html("Working, please wait... ("+wppaAjaxAlbumCount+")"):jQuery("#albumstatus-"+r).html=''+e[2]+" ("+e[1]+")",void 0!==e[3]&&wppaProcessFull(e[3],e[4]),s&&"0"==e[1])return jQuery("#albumstatus-"+r).after(' Reloading...'),jQuery("#wppa-admin-spinner").fadeIn(),void setTimeout(function(){wppaReload()},100);"description"==u&&jQuery("#wppa-album-spin").css({visibility:"hidden"});for(var p=0,n=-1,o=wppaAlbumUpdateMatrix.length;p<o;)wppaAlbumUpdateMatrix[p][0]==r&&wppaAlbumUpdateMatrix[p][1]==u&&(n=p),p++;wppaAlbumUpdateMatrix[n][2]=l||0,wppaAlbumUpdateMatrix[n][4]=!1,wppaAlbumUpdateMatrix[n][5]=!1,wppaAjaxUpdateAlbumMonitor(i)},error:function(e,t,a){wppaAjaxAlbumCount--,jQuery("#albumstatus-"+r).html('Comm error '+t+""),wppaConsoleLog("_wppaAjaxUpdateAlbum failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){}})}function wppaProcessFull(e,t){"full"==e&&(jQuery("#full").css("display",""),jQuery("#notfull").css("display","none")),"notfull"==e&&(jQuery("#full").css("display","none"),0<t?jQuery("#notfull").attr("value",wppaUploadToThisAlbum+" (max "+t+")"):jQuery("#notfull").attr("value",wppaUploadToThisAlbum),jQuery("#notfull").css("display",""))}function wppaAjaxUpdateCommentStatus(t,a,e){var p=wppaGetXmlHttp(),e=wppaAjaxUrl+"?action=wppa&wppa-action=update-comment-status&wppa-photo-id="+t+"&wppa-comment-id="+a+"&wppa-comment-status="+e+"&wppa-nonce="+document.getElementById("photo-nonce-"+t).value;p.onreadystatechange=function(){var e;4==p.readyState&&(200==p.status?(""!=(e=wppaTrim(p.responseText).split("||"))[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?jQuery("#remark-"+t).html(e[2]):jQuery("#remark-"+t).html(''+e[2]+""),jQuery("#wppa-comment-spin-"+a).css("visibility","hidden")):jQuery("#remark-"+t).html('Comm error '+p.status+": "+p.statusText+""))},p.open("GET",e,!0),p.send()}function wppaAjaxUpdateOptionCheckBox(t,e){var a=wppaGetXmlHttp(),p=wppaAjaxUrl+"?action=wppa&wppa-action=update-option&wppa-option="+t;p+="&wppa-nonce="+document.getElementById("wppa-nonce").value,e.checked?p+="&value=yes":p+="&value=no",a.onreadystatechange=function(){switch(a.readyState){case 1:case 2:case 3:jQuery("#img_"+t).attr("src",wppaImageDirectory+"spinner.gif");break;case 4:var e=wppaTrim(a.responseText).split("||");""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),404!=a.status?("0"===e[1]?(jQuery("#img_"+t).attr("src",wppaImageDirectory+"tick.png"),jQuery("#img_"+t).attr("title",e[2])):(jQuery("#img_"+t).attr("src",wppaImageDirectory+"cross.png"),jQuery("#img_"+t).attr("title","Error #"+e[1]+", message: "+e[2]+", status: "+a.status)),e[3]&&alert(e[3]),_wppaRefreshAfter&&(_wppaRefreshAfter=!1,document.location.reload(!0))):(jQuery("#img_"+t).attr("src",wppaImageDirectory+"cross.png"),jQuery("#img_"+t).attr("title","Communication error, status = "+a.status)),wppaCheckInconsistencies()}},a.open("GET",p,!0),a.send()}var wppaAlwaysContinue=100;function wppaMaintenanceProc(p,e,r){if(!r&&!e&&"yes"==document.getElementById(p+"_continue").value)return document.getElementById(p+"_continue").value="no",document.getElementById(p+"_button").value="Start!",void(0<jQuery("#"+p+"_togo").html()&&(jQuery("#"+p+"_status").html("Pausing..."),jQuery("#"+p+"_button").css("display","none")));r||(document.getElementById(p+"_continue").value="yes",document.getElementById(p+"_button").value="Stop!",""==jQuery("#"+p+"_status").html()&&jQuery("#"+p+"_status").html("Wait...")),jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=maintenance&slug="+p+"&wppa-nonce="+jQuery("#wppa-nonce").val()+(r?"&wppa-cron=1":""),async:!0,type:"POST",timeout:3e5,beforeSend:function(e){},success:function(e,t,a){var p=e.split("||"),n=p[1],o=!1;return n?(10<p[0].length&&(alert("An error occurred:\n"+p[0]),o=!0),jQuery("#"+n+"_status").html(p[2]),jQuery("#"+n+"_togo").html(p[3]),jQuery("#"+n+"_button").css("display",""),o||"0"==p[3]?"reload"==p[4]?(alert("This page will now be reloaded to finish the operation. Please stay tuned..."),void wppaReload()):void setTimeout("wppaMaintenanceProc('"+n+"', false)",20):void("yes"!=document.getElementById(n+"_continue").value?(r||jQuery("#"+n+"_status").html("Pending"),setTimeout(function(){wppaAjaxUpdateTogo(n)},1e3)):setTimeout("wppaMaintenanceProc('"+n+"', true)",20))):(alert("The server returned unexpected output:\n"+e+"\nIf the current procedure has a Skip One button, press it before retrying. Reloading page..."),void wppaReload())},error:function(e,t,a){wppaConsoleLog("wppaMaintenanceProc failed. Slug = "+p+", Error = "+a+", status = "+t,"force"),jQuery("#"+p+"_status").html("Server error #"+(11-wppaAlwaysContinue));t=!1;--wppaAlwaysContinue<1&&(t=confirm("10 Server errors happened.\nDo you want to continue?"))&&(wppaAlwaysContinue=100),(t||0<wppaAlwaysContinue)&&("wppa_remake"==p&&wppaAjaxUpdateOptionValue("wppa_remake_skip_one",0),"wppa_regen_thumbs"==p&&wppaAjaxUpdateOptionValue("wppa_regen_thumbs_skip_one",0),"wppa_create_o1_files"==p&&wppaAjaxUpdateOptionValue("wppa_create_o1_files_skip_one",0),setTimeout("wppaMaintenanceProc('"+p+"', true)",2e3))},complete:function(e,t,a){}})}function wppaAjaxPopupWindow(e){switch(e){case"wppa_list_index":0;break;case"wppa_list_errorlog":0;break;case"wppa_list_rating":0;break;case"wppa_list_session":0;break;case"wppa_list_comments":0}var t=.9*wppaWindowWidth(),a=wppaGetXmlHttp(),p=wppaAjaxUrl,e="action=wppa&wppa-action=maintenancepopup&slug="+e;e+="&wppa-nonce="+document.getElementById("wppa-nonce").value,a.open("POST",p,!1),a.setRequestHeader("Content-type","application/x-www-form-urlencoded"),a.send(e),4==a.readyState&&200==a.status&&(a=(e=wppaEntityDecode(a.responseText).split("|"))[0],e[0]="",e=e.join("|").substring(1),t={modal:!0,resizable:!0,width:t,show:{effect:"fadeIn",duration:800},closeText:wppaCloseText},jQuery("#wppa-modal-container").html(e).dialog(t).dialog("open"),jQuery("#wppa-modal-container").css({width:"100%"}),jQuery(".ui-dialog").css({boxShadow:"0px 0px 5px 5px #aaaaaa",padding:"8px",backgroundColor:"#cccccc",boxSizing:"content-box",zIndex:"200200"}),jQuery(".ui-dialog-titlebar").css({lineHeight:"0px",height:"50px"}),jQuery(".ui-dialog-title").html("<h2>"+a+"</h2>"),jQuery(".ui-button").css({position:"absolute",top:"12px",right:"12px"}),jQuery(".ui-button").attr("title",wppaCloseText),jQuery(".ui-widget-overlay").css({backgroundColor:"transparent"}),setTimeout(function(){jQuery("#wppa-maintenance-list").niceScroll&&jQuery("#wppa-maintenance-list").niceScroll(".wppa-nicewrap",{})},1e3))}function wppaAjaxUpdateOptionValue(l,e,t){var a="action=wppa&wppa-action=update-option&wppa-option="+wppaEncode(l)+"&wppa-nonce="+document.getElementById("wppa-nonce").value;0!=e&&(a+="number"==typeof e?"&value="+e:t?"&value="+wppaGetSelectionEnumByClass("."+l,","):"&value="+wppaEncode(e.value)),jQuery.ajax({url:wppaAjaxUrl,data:a,async:!0,type:"POST",timeout:1e5,beforeSend:function(e){jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"spinner.gif")},success:function(e,t,a){e=wppaTrim(e).split("||");if(""!=e[0])alert("The server returned unexpected output:\n"+e[0]);else if("0"===e[1]?(jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"tick.png"),e[3]&&alert(e[3]),_wppaRefreshAfter&&(_wppaRefreshAfter=!1,document.location.reload(!0))):(jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"cross.png"),e[3]&&alert(e[3])),jQuery("#img_"+l.replace("#","H")).attr("title",e[2]),e[4])for(var p,n,o,r=e[4].split(";"),u=0;u<r.length;)p=r[u].split(":"),n=jQuery("#"+p[0]).html(),o=p[1],""!=n&&""==o&&(o='<input type="button" class="button-secundary" style="border-radius:3px;font-size:11px;height:18px;margin: 0 4px;padding:0px;color:red;background-color:pink;" onclick="document.location.reload(true)" value="Reload" />'),jQuery("#"+p[0]).html(o),u++},error:function(e){jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"cross.png"),document.getElementById("img_"+l).title="Communication error"},complete:function(e){wppaCheckInconsistencies(),"spinner_shape"!=l&&"icon_corner_style"!=l||(wppaAjaxGetSpinnerHtml("normal","wppa-spin-pre-1"),wppaAjaxGetSpinnerHtml("lightbox","wppa-spin-pre-2")),"svg_color"!=l&&"svg_bg_color"!=l||wppaAjaxGetSpinnerHtml("normal","wppa-spin-pre-1"),"ovl_svg_color"!=l&&"ovl_svg_bg_color"!=l||wppaAjaxGetSpinnerHtml("lightbox","wppa-spin-pre-2")}})}function wppaEncode(e){if(void 0!==e){if("number"==typeof e)return e;for(var t=(p=(p=e.replace(/#/g,"||HASH||")).replace(/&/g,"||AMP||")).split("+"),a=0,p="";a<t.length;)p+=t[a],++a<t.length&&(p+="||PLUS||");return p}}function wppaCheckInconsistencies(){jQuery("#use_thumb_popup").prop("checked")&&"lightbox"==jQuery("#thumb_linktype").val()?jQuery(".popup-lightbox-err").css("display",""):jQuery(".popup-lightbox-err").css("display","none")}function wppaGetXmlHttp(){return xmlhttp=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"),xmlhttp}function wppaPhotoStatusChange(e){if(jQuery("#psdesc-"+e).css({display:"none"}),jQuery("#status-"+e)){if(elm=document.getElementById("status-"+e),"pending"!=elm.value&&"scheduled"!=elm.value||jQuery("#photoitem-"+e).css({backgroundColor:"#ffebe8",borderColor:"#cc0000"}),"publish"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ffffe0",borderColor:"#e6db55"}),"featured"==elm.value){jQuery("#photoitem-"+e).css({backgroundColor:"#e0ffe0",borderColor:"#55ee55"});var t=document.getElementById("pname-"+e).value.split(".");if(1<t.length)for(var a=0;a<t.length;)"jpg"!=t[a]&&"JPG"!=t[a]||jQuery("#psdesc-"+e).css({display:""}),a++}"gold"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#eeeecc",borderColor:"#ddddbb"}),"silver"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ffffff",borderColor:"#eeeeee"}),"bronze"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ddddbb",borderColor:"#ccccaa"}),"scheduled"==elm.value?jQuery(".wppa-datetime-"+e).css("display",""):jQuery(".wppa-datetime-"+e).css("display","none"),jQuery("#scheduledel-"+e).prop("checked")?jQuery(".wppa-del-datetime-"+e).css("display",""):jQuery(".wppa-del-datetime-"+e).css("display","none")}}function wppaSetComBgCol(e){"approved"==jQuery("#com-stat-"+e).val()?jQuery("#com-tr-"+e).css({backgroundColor:"#ffffe0"}):jQuery("#com-tr-"+e).css({backgroundColor:"#ffebe8"})}function wppaAddCat(e,t){wppaAddTag(e,t)}function wppaAddTag(e,t){t=document.getElementById(t);e&&(t.value?t.value+=","+e:t.value=e,"-clear-"==e&&(t.value=""))}function wppaRefresh(e){e=new String(document.location).split("#")[0]+"#"+e;document.location=e}function wppaReload(e){e?(url=document.location.href.split("#"),document.location.href=url[0]+e,setTimeout(function(){document.location.reload(!0)},10)):document.location.reload(!0)}var wppaFeCount=0;function wppaFeAjaxLog(e){"in"==e&&(0==wppaFeCount&&jQuery("#wppa-fe-exit").css("display","none"),wppaFeCount++,jQuery("#wppa-fe-count").html(wppaFeCount)),"out"==e&&(1==wppaFeCount&&(jQuery("#wppa-fe-count").html(""),jQuery("#wppa-fe-exit").css("display","inline"),wppaFeCount--),1<wppaFeCount&&(wppaFeCount--,jQuery("#wppa-fe-count").html(wppaFeCount)))}function wppaArrayToEnum(e,t){temp=e.sort(function(e,t){return e-t});for(var a,p="",n=-1,o=-2,r=0,u=!1,l=0;l<e.length;)0!=(a=e[l].valueOf())&&(r=n,a==++r?u=!0:u?(p+=n==o?t+n+t+a:t+t+n+t+a,u=!1):p+=t+a,u||(o=a,o++),n=a),l++;for(u&&(p+=".."+n);"."==p.substr(0,1);)p=p.substr(1);for(;p.substr(0,1)==t;)p=p.substr(1);return p}function wppaGetSelEnumToId(e,t){p=jQuery("."+e);var a=[];for(i=0,j=0;i<p.length;)p[i].selected&&(a[j]=p[i].value,j++),i++;jQuery("#"+t).val(wppaArrayToEnum(a,"."))}function wppaGetSelectionEnumByClass(e,t){var a,p=[],n=0,o=0;for(t=t||".",a=jQuery(e),o=n=0;n<a.length;)a[n].selected&&(p[o]=a[n].value,o++),n++;return wppaArrayToEnum(p,t)}function wppaEditSearch(e,t){t=jQuery("#"+t).val();0==t.length?alert("Please enter searchstring"):document.location.href=e+"&wppa-searchstring="+t}function wppaEditTrash(e){document.location.href=e}function wppaExportDbTable(p){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=export-table&table="+p,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){jQuery("#"+p+"-spin").css("display","inline")},success:function(e,t,a){e=e.split("||");"0"==e[1]?document.location=e[2]:alert("Error: "+e[1]+"\n\n"+e[2])},error:function(e,t,a){alert("Export Db Table "+p+" failed. Error = "+a+", status = "+t)},complete:function(e,t,a){jQuery("#"+p+"-spin").css("display","none")}})}function wppaDismissAdminNotice(e,t){wppaAjaxUpdateOptionCheckBox(e,t),jQuery("#wppa-wr-").css("display","none")}function wppaAjaxUpdateTogo(n){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=gettogo&slug="+n,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){wppaConsoleLog("Requesting togo for slug "+n,"force")},success:function(e,t,a){var p=e.split("|");jQuery("#"+n+"_togo").html(p[0]);e=jQuery("#"+n+"_status").html(),p=p[1];""!=e&&""==p&&(p='<input type="button" class="button-secundary" style="border-radius:3px;font-size:11px;height:18px;margin: 0 4px;padding:0px;color:red;background-color:pink;" onclick="document.location.reload(true)" value="Reload" />'),jQuery("#"+n+"_status").html(p),setTimeout(function(){wppaAjaxUpdateTogo(n)},1e3)},error:function(e){},complete:function(e){}})}function wppaIsEmpty(e){return(null==e||void 0===e||""==e||0==e)&&!0}function wppaTimedConfirm(e){var t={modal:!0,resizable:!1,width:400,show:{effect:"fadeIn",duration:800},closeText:"X",buttons:[{text:"NO",click:function(){jQuery(this).dialog("close")}},{text:"YES",click:function(){jQuery(this).dialog("close")}}]};jQuery("#wppa-modal-container").html(e).dialog(t).dialog("open"),jQuery(".ui-dialog").css({boxShadow:"0px 0px 5px 5px #aaaaaa",padding:"8px",backgroundColor:"#cccccc",boxSizing:"content-box",zIndex:"200200"}),jQuery(".ui-dialog-titlebar").css({lineHeight:"0px",height:"32px"}),jQuery(".ui-button").css({float:"right",position:"relative",bottom:"40px"}),jQuery(".ui-dialog-titlebar-close").css({display:"none"}),jQuery(".ui-widget-overlay").css({backgroundColor:"transparent"}),jQuery(".ui-button").attr("title",wppaCloseText),setTimeout(function(){jQuery(".ui-button").trigger("click")},6e4)}function wppaAjaxGetSpinnerHtml(e,p){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-option&wppa-option=getspinnerpreview&type="+e+"&wppa-nonce="+document.getElementById("wppa-nonce").value,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){},success:function(e,t,a){e=e.split("|");jQuery("#"+p).html(e[0])},error:function(e){},complete:function(e){}})}function wppaDragHorizon(t){var a=0,p=0;function n(e){(e=e||window.event).preventDefault(),a=p-e.clientY,p=e.clientY,t.style.top=t.offsetTop-a+"px"}function o(){document.onmouseup=null,document.onmousemove=null}t.onmousedown=function(e){(e=e||window.event).preventDefault(),pos3=e.clientX,p=e.clientY,document.onmouseup=o,document.onmousemove=n}}function wppaBulkActionChange(e,t){wppa_setCookie("wppa_bulk_action",e.value,365),"wppa-bulk-move-to"==e.value||"wppa-bulk-copy-to"==e.value?jQuery("#wppa-bulk-album").css("display","inline"):jQuery("#wppa-bulk-album").css("display","none"),"wppa-bulk-status"==e.value?jQuery("#wppa-bulk-status").css("display","inline"):jQuery("#wppa-bulk-status").css("display","none"),"wppa-bulk-owner"==e.value?jQuery("#wppa-bulk-owner").css("display","inline"):jQuery("#wppa-bulk-owner").css("display","none")}function wppaBulkDoitOnClick(){var e=jQuery(".wppa-bulk-photo"),t=0;for(i=0;i<e.length;i++)e[i].checked&&t++;if(0==t)return alert("No photos selected"),!1;var a=document.getElementById("wppa-bulk-action").value;switch(a){case"":return alert("No action selected"),!1;case"wppa-bulk-delete":break;case"wppa-bulk-move-to":case"wppa-bulk-copy-to":if(0==document.getElementById("wppa-bulk-album").value)return alert("No album selected"),!1;break;case"wppa-bulk-status":if(0==document.getElementById("wppa-bulk-status").value)return alert("No status selected"),!1;break;case"wppa-bulk-owner":if(0==documnet.getElementById("wppa-bulk-owner").value)return alert("No new owner selected"),!1;break;default:return alert("Unimplemented action requested: "+a),!1}return!0}function wppaSetThumbsize(e){e=e.value;wppa_setCookie("wppa_bulk_thumbsize",e,365),jQuery(".wppa-bulk-thumb").css("max-width",e+"px"),jQuery(".wppa-bulk-thumb").css("max-height",e/2+"px"),jQuery(".wppa-bulk-dec").css("height",e/2+"px")}function wppaToggleConfirmDelete(e){jQuery(e).prop("checked")?wppa_setCookie("wppaConfirmDelete","checked",365):wppa_setCookie("wppaConfirmDelete","unchecked",365)}function wppaToggleConfirmMove(e){jQuery(e).prop("checked")?wppa_setCookie("wppaConfirmMove","checked",365):wppa_setCookie("wppaConfirmMove","unchecked",365)}function wppaSetConfirmDelete(e){"checked"==wppa_getCookie("wppaConfirmDelete")?jQuery("#"+e).prop("checked",!0):jQuery("#"+e).prop("checked",!1)}function wppaSetConfirmMove(e){"checked"==wppa_getCookie("wppaConfirmMove")?jQuery("#"+e).prop("checked",!0):jQuery("#"+e).prop("checked",!1)}function wppaAjaxReplaceLog(){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=maintenancepopup&slug=wppa_list_errorlog&raw=1&wppa-nonce="+jQuery("#wppa-nonce").val(),async:!0,type:"GET",timeout:1e5,beforeSend:function(e){jQuery("#wppa-spinner").show()},success:function(e,t,a){e=wppaEntityDecode(e),jQuery("#wppa-logbody").html(e),jQuery("#wppa-spinner").hide()}})}function wppaTestAdminReady(){"complete"===document.readyState?jQuery("#wppa-admin-spinner").fadeOut():setTimeout("wppaTestAdminReady()",200)}function wppaCommentAdminUpdateHref(e){var t=encodeURIComponent(jQuery("#commenttext-"+e).val()),a=jQuery("#href-"+e).attr("href"),p=a.split("commenttext=");p[1]=t,a=p[0]+"commenttext="+p[1],jQuery("#href-"+e).attr("href",a),jQuery("#href-"+e).css("display","inline")}jQuery(document).ready(function(){var e;document.getElementById("wppa-bulk-action")&&(e=wppa_getCookie("wppa_bulk_action"),"wppa-bulk-move-to"!=(document.getElementById("wppa-bulk-action").value=e)&&"wppa-bulk-copy-to"!=e||(jQuery("#wppa-bulk-album").css("display","inline"),document.getElementById("wppa-bulk-album").value=wppa_getCookie("wppa_bulk_album")),"wppa-bulk-status"==e&&(jQuery("#wppa-bulk-status").css("display","inline"),document.getElementById("wppa-bulk-status").value=wppa_getCookie("wppa_bulk_status")),"wppa-bulk-owner"==e&&(jQuery("#wppa-bulk-owner").css("display","inline"),document.getElementById("wppa-bulk-owner").value=wppa_getCookie("wppa_bulk_owner")))}),jQuery(document).ready(function(){setTimeout("wppaTestAdminReady()",200)});

+ function checkjQueryRev(e,t,a){var p=parseFloat(jQuery.fn.jquery);t.checked&&p<a&&(alert(e+"\nThe version of your jQuery library: "+p+" is too low for this feature. It requires version "+a),t.checked="")}function wppaReUpload(e,o,t,r){document.getElementById("wppa-re-up-form-"+o);var a=document.getElementById("wppa-re-up-file-"+o),u=document.getElementById("wppa-re-up-butn-"+o);e.preventDefault();a=a.files[0];if(a.type.match("image.*")){if(0==t.length)alert("Filename will be set to "+a.name);else if(a.name!=t&&!confirm("Filename is different.\nIf you continue, the filename will not be updated!.\n\nContinue?"))return void jQuery("#re-up-"+o).css("display","none");u.value="Uploading...",u.style.color="black";t=new FormData;t.append("photo",a,a.name);var l=new XMLHttpRequest,a="?action=wppa&wppa-action=update-photo&photo-id="+o+"&item=file&wppa-nonce="+document.getElementById("photo-nonce-"+o).value;l.open("POST",wppaAjaxUrl+a,!0),l.onload=function(){if(200===l.status){var e=wppaTrim(l.responseText).split("||");switch(""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),e[1]){case"0":var t,a,p,n=JSON.parse(e[2]);for(t in n)switch(p=n[t],t){case"remark":p=(p=(p=p.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),a="0"!=e[1]?''+p+"":''+p+"",r&&(a+=' Reloading...'),jQuery("#remark-"+o).html(a);break;case"photourl":wppaCropper[o]?wppaCropper[o].replace(p):jQuery("#photourl-"+o).attr("src",p),jQuery("#thumba-"+o).attr("href",p);break;case"thumburl":jQuery("#thumburl-"+o).attr("src",p);break;case"magickstack":jQuery("#magickstack-"+o).html(p),0<p.length?jQuery("#imstackbutton-"+o).css("display","inline"):jQuery("#imstackbutton-"+o).css("display","none");break;default:jQuery("#"+t+"-"+o).html(p)}u.value="Upload",jQuery("#re-up-"+o).css("display","none");break;case"99":document.getElementById("photoitem-"+o).innerHTML=''+e[2]+"";break;default:document.getElementById("remark-"+o).innerHTML=''+e[2]+" ("+e[1]+")",u.value="Error occured",u.style.color="red"}}else alert("An error occurred!")},l.send(t)}else alert("File is not an image file!")}jQuery(document).ready(function(){jQuery(window).on("DOMContentLoaded load resize scroll",function(){wppaMakeLazyVisible("windowon")}),wppaMakeLazyVisible("docready")});var _wppaRefreshAfter=!1;function wppaRefreshAfter(){_wppaRefreshAfter=!0}function wppaCheckWidgetMethod(){var e,t,a;if("4"==document.getElementById("wppa-wm").value?(document.getElementById("wppa-wp").style.visibility="visible","day-of-week"==(a=jQuery("#wppa-wp").val())||"day-of-month"==a||"day-of-year"==a?jQuery(".wppa-order").css("visibility",""):jQuery(".wppa-order").css("visibility","hidden")):(document.getElementById("wppa-wp").style.visibility="hidden",jQuery(".wppa-order").css("visibility","hidden")),"1"==document.getElementById("wppa-wm").value)for(e=document.getElementsByName("wppa-widget-photo"),t=0;t<e.length;)e[t].style.visibility="visible",t++;else for(e=document.getElementsByName("wppa-widget-photo"),t=0;t<e.length;)e[t].style.visibility="hidden",t++}function wppa_tablecookieon(e){wppa_setCookie("table_"+e,"on","365")}function wppa_tablecookieoff(e){wppa_setCookie("table_"+e,"off","365")}function wppaCookieCheckbox(e,t){e.checked?wppa_setCookie(t,"on","365"):wppa_setCookie(t,"off","365")}function wppa_move_up(e){document.location=wppa_moveup_url+e+"&wppa-nonce="+document.getElementById("wppa-nonce").value}function checkColor(e){var t=e.substr(5),e=jQuery("#"+t).val();jQuery("#colorbox-"+t).css("background-color",e)}function checkAll(e,t){e=document.getElementById(e);e&&(e.checked?jQuery(t).prop("checked",!0):jQuery(t).prop("checked",!1))}function impUpd(e,t){e.checked?(jQuery(t).val(wppa_update),jQuery(".hideifupdate").css("display","none")):(jQuery(t).val(wppa_import),jQuery(".hideifupdate").css("display",""))}function wppaAjaxDeletePhoto(t,e,a){var p="",n="",p=e||'<div style="padding-left:5px;" >';a?n=a:aftrer="</div>",wppaFeAjaxLog("in");var o=wppaGetXmlHttp(),a=wppaAjaxUrl+"?action=wppa&wppa-action=delete-photo&photo-id="+t;a+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,o.open("GET",a,!0),o.send(),o.onreadystatechange=function(){switch(o.readyState){case 1:document.getElementById("remark-"+t).innerHTML="server connection established";break;case 2:document.getElementById("remark-"+t).innerHTML="request received";break;case 3:document.getElementById("remark-"+t).innerHTML="processing request";break;case 4:var e;200==o.status?("ER"==(e=wppaTrim(o.responseText).split("||"))[0]?(e[3]&&alert(e[3]),jQuery("#wppa-delete-"+t).css("text-decoration","line-through")):""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),0==e[1]?document.getElementById("remark-"+t).innerHTML=e[2]:(document.getElementById("photoitem-"+t).innerHTML=p+e[2]+n,wppaProcessFull(e[3],e[4])),jQuery(window).trigger("scroll"),wppaFeAjaxLog("out")):document.getElementById("photoitem-"+t).innerHTML=p+'Comm error '+o.status+": "+o.statusText+""+n}}}function wppaAjaxUndeletePhoto(t){wppaFeAjaxLog("in");var a=wppaGetXmlHttp(),e=wppaAjaxUrl+"?action=wppa&wppa-action=undelete-photo&photo-id="+t;e+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,a.open("GET",e,!0),a.send(),a.onreadystatechange=function(){switch(a.readyState){case 1:document.getElementById("remark-"+t).innerHTML="server connection established";break;case 2:document.getElementById("remark-"+t).innerHTML="request received";break;case 3:document.getElementById("remark-"+t).innerHTML="processing request";break;case 4:var e;200==a.status?("ER"==(e=wppaTrim(a.responseText).split("||"))[0]?(e[3]&&alert(e[3]),jQuery("#wppa-delete-"+t).css("text-decoration","line-through")):""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),0==e[1]?document.getElementById("remark-"+t).innerHTML=e[2]:document.getElementById("photoitem-"+t).innerHTML='<div style="padding-left:5px;" >'+e[2]+"</div>",wppaFeAjaxLog("out")):document.getElementById("photoitem-"+t).innerHTML=before+'Comm error '+a.status+": "+a.statusText+""+after}}}function wppaAjaxApplyWatermark(t,e,a){wppaFeAjaxLog("in");var p=wppaGetXmlHttp();jQuery("#wppa-water-spin-"+t).css({visibility:"visible"});var n="action=wppa&wppa-action=watermark-photo&photo-id="+t;n+="&wppa-nonce="+document.getElementById("photo-nonce-"+t).value,e&&(n+="&wppa-watermark-file="+e),a&&(n+="&wppa-watermark-pos="+a),p.open("POST",wppaAjaxUrl,!0),p.setRequestHeader("Content-type","application/x-www-form-urlencoded"),p.send(n),p.onreadystatechange=function(){var e;4==p.readyState&&(200==p.status?(""!=(e=wppaTrim(p.responseText).split("||"))[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?(document.getElementById("remark-"+t).innerHTML=e[2],setTimeout(function(){document.location.reload(!0)},500)):document.getElementById("remark-"+t).innerHTML=''+e[2]+"",jQuery("#wppa-water-spin-"+t).css({visibility:"hidden"}),wppaFeAjaxLog("out")):document.getElementById("remark-"+t).innerHTML='Comm error '+p.status+": "+p.statusText+"")}}function wppaAjaxUpdateIptc(l,e,t,a){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-iptc&photo-id="+l+"&item="+e+"&wppa-nonce="+document.getElementById("photo-nonce-"+l).value+"&value="+wppaEncode(t)+"&tagname="+a,async:!0,type:"POST",timeout:6e4,beforeSend:function(e){jQuery("#remark-"+l).html("Working, please wait...")},success:function(e,t,a){var p=wppaTrim(e).split("||");if(""!=p[0]&&alert("The server returned unexpected output:\n"+p[0]),"99"===p[1])jQuery("#photoitem-"+l).html(bef+''+p[2]+""+aft);else{var n,o,r,u=JSON.parse(p[2]);for(n in u)switch(r=u[n],n){case"remark":r=(r=(r=r.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),o="0"!=p[1]?''+r+"":''+r+"",jQuery("#remark-"+l).html(o);break;case"photourl":wppaCropper[l]?wppaCropper[l].replace(r):jQuery("#photourl-"+l).attr("src",r),jQuery("#thumba-"+l).attr("href",r);break;case"thumburl":jQuery("#thumburl-"+l).attr("src",r);break;case"magickstack":jQuery("#magickstack-"+l).html(r),0<r.length?jQuery("#imstackbutton-"+l).css("display","inline"):jQuery("#imstackbutton-"+l).css("display","none")}}wppaFeAjaxLog("out")},error:function(e,t,a){jQuery("#remark-"+l).html('Comm error '+t+""),wppaConsoleLog("wppaAjaxUpdatePhoto failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){jQuery("#wppa-admin-spinner").css("display","none"),jQuery(window).trigger("scroll")}})}function wppaAjaxUpdatePhoto(l,i,e,s,c,d){c=c||"",d=d||"",wppaFeAjaxLog("in"),jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-photo&photo-id="+l+"&item="+i+"&wppa-nonce="+document.getElementById("photo-nonce-"+l).value+"&value="+wppaEncode(e),async:!0,type:"POST",timeout:6e4,beforeSend:function(e){"description"==i&&jQuery("#wppa-photo-spin-"+l).css({visibility:"visible"}),jQuery("#remark-"+l).html("Working, please wait...")},success:function(e,t,a){var p=wppaTrim(e).split("||");if(""!=p[0]&&alert("The server returned unexpected output:\n"+p[0]),"99"===p[1])jQuery("#photoitem-"+l).html(c+''+p[2]+""+d);else{var n,o,r,u=JSON.parse(p[2]);for(n in u)switch(r=u[n],n){case"remark":r=(r=(r=r.replace(/</g,"<")).replace(/>/g,">")).replace(/\\/g,""),o="0"!=p[1]?''+r+"":''+r+"",s&&(o+=' Reloading...'),jQuery("#remark-"+l).html(o);break;case"photourl":wppaCropper[l]?wppaCropper[l].replace(r):jQuery("#photourl-"+l).attr("src",r),jQuery("#thumba-"+l).attr("href",r);break;case"thumburl":jQuery("#thumburl-"+l).attr("src",r);break;case"magickstack":jQuery("#magickstack-"+l).html(r),0<r.length?jQuery("#imstackbutton-"+l).css("display","inline"):jQuery("#imstackbutton-"+l).css("display","none");break;default:jQuery("#"+n+"-"+l).html(r)}}"description"==i&&jQuery("#wppa-photo-spin-"+l).css({visibility:"hidden"}),wppaFeAjaxLog("out")},error:function(e,t,a){jQuery("#remark-"+l).html('Comm error '+t+""),wppaConsoleLog("wppaAjaxUpdatePhoto failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){var p=(p=document.location.href).replace(/&pano-val=./,"");s?setTimeout(function(){document.location.href=p},300):(jQuery("#wppa-admin-spinner").css("display","none"),jQuery(window).trigger("scroll"))}})}function wppaChangeScheduleAlbum(e,t){jQuery(t).prop("checked")?jQuery(".wppa-datetime-"+e).css("display","inline"):(jQuery(".wppa-datetime-"+e).css("display","none"),wppaAjaxUpdateAlbum(e,"scheduledtm",Math.rand()))}function wppaChangeScheduleDelAlbum(e,t){jQuery(t).prop("checked")?jQuery(".wppa-datetimedel-"+e).css("display","inline"):(jQuery(".wppa-datetimedel-"+e).css("display","none"),wppaAjaxUpdateAlbum(e,"scheduledel",Math.rand()))}var _wppaRefreshAfter=!1,wppaAjaxAlbumCount=0,wppaAlbumUpdateMatrix=new Array;function wppaAjaxUpdateAlbum(e,t,a,p){var n=0==jQuery("#wppaalbumdesc:visible").length;jQuery("#wppaalbumdesc-html").click();for(var o=wppaAlbumUpdateMatrix.length,r=0,u=!1,l=-1;r<o;)wppaAlbumUpdateMatrix[r][0]==e&&wppaAlbumUpdateMatrix[r][1]==t&&(u=!0,l=r),r++;u||(wppaAlbumUpdateMatrix[o]=[e,t,"undefined",!1,!1,p],l=o),wppaAlbumUpdateMatrix[l][3]="number"==typeof a?a:a.value,wppaAlbumUpdateMatrix[l][5]=p,wppaAjaxUpdateAlbumMonitor(n)}function wppaAjaxUpdateAlbumMonitor(e){for(var t=wppaAlbumUpdateMatrix.length,a=0;a<t;)wppaAlbumUpdateMatrix[a][2]==wppaAlbumUpdateMatrix[a][3]||wppaAlbumUpdateMatrix[a][4]||(wppaAlbumUpdateMatrix[a][4]=!0,_wppaAjaxUpdateAlbum(wppaAlbumUpdateMatrix[a][0],wppaAlbumUpdateMatrix[a][1],wppaAlbumUpdateMatrix[a][3],e,wppaAlbumUpdateMatrix[a][5])),a++;e&&jQuery("#wppaalbumdesc-tmce").click()}function _wppaAjaxUpdateAlbum(r,u,l,i,s){wppaAjaxAlbumCount++;jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-album&album-id="+r+"&item="+u+"&wppa-nonce="+document.getElementById("album-nonce-"+r).value+"&value="+wppaEncode(l),async:!0,type:"POST",timeout:6e4,beforeSend:function(e){"description"==u&&jQuery("#wppa-album-spin").css({visibility:"visible"}),jQuery("#albumstatus-"+r).html("Working, please wait... ("+wppaAjaxAlbumCount+")")},success:function(e,t,a){e=wppaTrim(e).split("||");if(wppaAjaxAlbumCount--,""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?0==wppaAjaxAlbumCount?jQuery("#albumstatus-"+r).html(e[2]):jQuery("#albumstatus-"+r).html("Working, please wait... ("+wppaAjaxAlbumCount+")"):jQuery("#albumstatus-"+r).html=''+e[2]+" ("+e[1]+")",void 0!==e[3]&&wppaProcessFull(e[3],e[4]),s&&"0"==e[1])return jQuery("#albumstatus-"+r).after(' Reloading...'),jQuery("#wppa-admin-spinner").fadeIn(),void setTimeout(function(){wppaReload()},100);"description"==u&&jQuery("#wppa-album-spin").css({visibility:"hidden"});for(var p=0,n=-1,o=wppaAlbumUpdateMatrix.length;p<o;)wppaAlbumUpdateMatrix[p][0]==r&&wppaAlbumUpdateMatrix[p][1]==u&&(n=p),p++;wppaAlbumUpdateMatrix[n][2]=l||0,wppaAlbumUpdateMatrix[n][4]=!1,wppaAlbumUpdateMatrix[n][5]=!1,wppaAjaxUpdateAlbumMonitor(i)},error:function(e,t,a){wppaAjaxAlbumCount--,jQuery("#albumstatus-"+r).html('Comm error '+t+""),wppaConsoleLog("_wppaAjaxUpdateAlbum failed. Error = "+a+", status = "+t,"force")},complete:function(e,t,a){}})}function wppaProcessFull(e,t){"full"==e&&(jQuery("#full").css("display",""),jQuery("#notfull").css("display","none")),"notfull"==e&&(jQuery("#full").css("display","none"),0<t?jQuery("#notfull").attr("value",wppaUploadToThisAlbum+" (max "+t+")"):jQuery("#notfull").attr("value",wppaUploadToThisAlbum),jQuery("#notfull").css("display",""))}function wppaAjaxUpdateCommentStatus(t,a,e){var p=wppaGetXmlHttp(),e=wppaAjaxUrl+"?action=wppa&wppa-action=update-comment-status&wppa-photo-id="+t+"&wppa-comment-id="+a+"&wppa-comment-status="+e+"&wppa-nonce="+document.getElementById("photo-nonce-"+t).value;p.onreadystatechange=function(){var e;4==p.readyState&&(200==p.status?(""!=(e=wppaTrim(p.responseText).split("||"))[0]&&alert("The server returned unexpected output:\n"+e[0]),"0"===e[1]?jQuery("#remark-"+t).html(e[2]):jQuery("#remark-"+t).html(''+e[2]+""),jQuery("#wppa-comment-spin-"+a).css("visibility","hidden")):jQuery("#remark-"+t).html('Comm error '+p.status+": "+p.statusText+""))},p.open("GET",e,!0),p.send()}function wppaAjaxUpdateOptionCheckBox(t,e){var a=wppaGetXmlHttp(),p=wppaAjaxUrl+"?action=wppa&wppa-action=update-option&wppa-option="+t;p+="&wppa-nonce="+document.getElementById("wppa-nonce").value,e.checked?p+="&value=yes":p+="&value=no",a.onreadystatechange=function(){switch(a.readyState){case 1:case 2:case 3:jQuery("#img_"+t).attr("src",wppaImageDirectory+"spinner.gif");break;case 4:var e=wppaTrim(a.responseText).split("||");""!=e[0]&&alert("The server returned unexpected output:\n"+e[0]),404!=a.status?("0"===e[1]?(jQuery("#img_"+t).attr("src",wppaImageDirectory+"tick.png"),jQuery("#img_"+t).attr("title",e[2])):(jQuery("#img_"+t).attr("src",wppaImageDirectory+"cross.png"),jQuery("#img_"+t).attr("title","Error #"+e[1]+", message: "+e[2]+", status: "+a.status)),e[3]&&alert(e[3]),_wppaRefreshAfter&&(_wppaRefreshAfter=!1,document.location.reload(!0))):(jQuery("#img_"+t).attr("src",wppaImageDirectory+"cross.png"),jQuery("#img_"+t).attr("title","Communication error, status = "+a.status)),wppaCheckInconsistencies()}},a.open("GET",p,!0),a.send()}var wppaAlwaysContinue=100;function wppaMaintenanceProc(p,e,r){if(!r&&!e&&"yes"==document.getElementById(p+"_continue").value)return document.getElementById(p+"_continue").value="no",document.getElementById(p+"_button").value="Start!",void(0<jQuery("#"+p+"_togo").html()&&(jQuery("#"+p+"_status").html("Pausing..."),jQuery("#"+p+"_button").css("display","none")));r||(document.getElementById(p+"_continue").value="yes",document.getElementById(p+"_button").value="Stop!",""==jQuery("#"+p+"_status").html()&&jQuery("#"+p+"_status").html("Wait...")),jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=maintenance&slug="+p+"&wppa-nonce="+jQuery("#wppa-nonce").val()+(r?"&wppa-cron=1":""),async:!0,type:"POST",timeout:3e5,beforeSend:function(e){},success:function(e,t,a){var p=e.split("||"),n=p[1],o=!1;return n?(10<p[0].length&&(alert("An error occurred:\n"+p[0]),o=!0),jQuery("#"+n+"_status").html(p[2]),jQuery("#"+n+"_togo").html(p[3]),jQuery("#"+n+"_button").css("display",""),o||"0"==p[3]?"reload"==p[4]?(alert("This page will now be reloaded to finish the operation. Please stay tuned..."),void wppaReload()):void setTimeout("wppaMaintenanceProc('"+n+"', false)",20):void(document.getElementById(n+"_continue")&&"yes"==document.getElementById(n+"_continue").value?setTimeout("wppaMaintenanceProc('"+n+"', true)",20):(r||jQuery("#"+n+"_status").html("Pending"),setTimeout(function(){wppaAjaxUpdateTogo(n)},1e3)))):(alert("The server returned unexpected output:\n"+e+"\nIf the current procedure has a Skip One button, press it before retrying. Reloading page..."),void wppaReload())},error:function(e,t,a){wppaConsoleLog("wppaMaintenanceProc failed. Slug = "+p+", Error = "+a+", status = "+t,"force"),jQuery("#"+p+"_status").html("Server error #"+(11-wppaAlwaysContinue));t=!1;--wppaAlwaysContinue<1&&(t=confirm("10 Server errors happened.\nDo you want to continue?"))&&(wppaAlwaysContinue=100),(t||0<wppaAlwaysContinue)&&("wppa_remake"==p&&wppaAjaxUpdateOptionValue("wppa_remake_skip_one",0),"wppa_regen_thumbs"==p&&wppaAjaxUpdateOptionValue("wppa_regen_thumbs_skip_one",0),"wppa_create_o1_files"==p&&wppaAjaxUpdateOptionValue("wppa_create_o1_files_skip_one",0),setTimeout("wppaMaintenanceProc('"+p+"', true)",2e3))},complete:function(e,t,a){}})}function wppaAjaxPopupWindow(e){switch(e){case"wppa_list_index":0;break;case"wppa_list_errorlog":0;break;case"wppa_list_rating":0;break;case"wppa_list_session":0;break;case"wppa_list_comments":0}var t=.9*wppaWindowWidth(),a=wppaGetXmlHttp(),p=wppaAjaxUrl,e="action=wppa&wppa-action=maintenancepopup&slug="+e;e+="&wppa-nonce="+document.getElementById("wppa-nonce").value,a.open("POST",p,!1),a.setRequestHeader("Content-type","application/x-www-form-urlencoded"),a.send(e),4==a.readyState&&200==a.status&&(a=(e=wppaEntityDecode(a.responseText).split("|"))[0],e[0]="",e=e.join("|").substring(1),t={modal:!0,resizable:!0,width:t,show:{effect:"fadeIn",duration:800},closeText:wppaCloseText},jQuery("#wppa-modal-container").html(e).dialog(t).dialog("open"),jQuery("#wppa-modal-container").css({width:"100%"}),jQuery(".ui-dialog").css({boxShadow:"0px 0px 5px 5px #aaaaaa",padding:"8px",backgroundColor:"#cccccc",boxSizing:"content-box",zIndex:"200200"}),jQuery(".ui-dialog-titlebar").css({lineHeight:"0px",height:"50px"}),jQuery(".ui-dialog-title").html("<h2>"+a+"</h2>"),jQuery(".ui-button").css({position:"absolute",top:"12px",right:"12px"}),jQuery(".ui-button").attr("title",wppaCloseText),jQuery(".ui-widget-overlay").css({backgroundColor:"transparent"}),setTimeout(function(){jQuery("#wppa-maintenance-list").niceScroll&&jQuery("#wppa-maintenance-list").niceScroll(".wppa-nicewrap",{})},1e3))}function wppaAjaxUpdateOptionValue(l,e,t){var a="action=wppa&wppa-action=update-option&wppa-option="+wppaEncode(l)+"&wppa-nonce="+document.getElementById("wppa-nonce").value;0!=e&&(a+="number"==typeof e?"&value="+e:t?"&value="+wppaGetSelectionEnumByClass("."+l,","):"&value="+wppaEncode(e.value)),jQuery.ajax({url:wppaAjaxUrl,data:a,async:!0,type:"POST",timeout:1e5,beforeSend:function(e){jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"spinner.gif")},success:function(e,t,a){e=wppaTrim(e).split("||");if(""!=e[0])alert("The server returned unexpected output:\n"+e[0]);else if("0"===e[1]?(jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"tick.png"),e[3]&&alert(e[3]),_wppaRefreshAfter&&(_wppaRefreshAfter=!1,document.location.reload(!0))):(jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"cross.png"),e[3]&&alert(e[3])),jQuery("#img_"+l.replace("#","H")).attr("title",e[2]),e[4])for(var p,n,o,r=e[4].split(";"),u=0;u<r.length;)p=r[u].split(":"),n=jQuery("#"+p[0]).html(),o=p[1],""!=n&&""==o&&(o='<input type="button" class="button-secundary" style="border-radius:3px;font-size:11px;height:18px;margin: 0 4px;padding:0px;color:red;background-color:pink;" onclick="document.location.reload(true)" value="Reload" />'),jQuery("#"+p[0]).html(o),u++},error:function(e){jQuery("#img_"+l.replace("#","H")).attr("src",wppaImageDirectory+"cross.png"),document.getElementById("img_"+l).title="Communication error"},complete:function(e){wppaCheckInconsistencies(),"spinner_shape"!=l&&"icon_corner_style"!=l||(wppaAjaxGetSpinnerHtml("normal","wppa-spin-pre-1"),wppaAjaxGetSpinnerHtml("lightbox","wppa-spin-pre-2")),"svg_color"!=l&&"svg_bg_color"!=l||wppaAjaxGetSpinnerHtml("normal","wppa-spin-pre-1"),"ovl_svg_color"!=l&&"ovl_svg_bg_color"!=l||wppaAjaxGetSpinnerHtml("lightbox","wppa-spin-pre-2")}})}function wppaEncode(e){if(void 0!==e){if("number"==typeof e)return e;for(var t=(p=(p=e.replace(/#/g,"||HASH||")).replace(/&/g,"||AMP||")).split("+"),a=0,p="";a<t.length;)p+=t[a],++a<t.length&&(p+="||PLUS||");return p}}function wppaCheckInconsistencies(){jQuery("#use_thumb_popup").prop("checked")&&"lightbox"==jQuery("#thumb_linktype").val()?jQuery(".popup-lightbox-err").css("display",""):jQuery(".popup-lightbox-err").css("display","none")}function wppaGetXmlHttp(){return xmlhttp=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"),xmlhttp}function wppaPhotoStatusChange(e){if(jQuery("#psdesc-"+e).css({display:"none"}),elm=document.getElementById("status-"+e),elm){if("pending"!=elm.value&&"scheduled"!=elm.value||jQuery("#photoitem-"+e).css({backgroundColor:"#ffebe8",borderColor:"#cc0000"}),"publish"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ffffe0",borderColor:"#e6db55"}),"featured"==elm.value){jQuery("#photoitem-"+e).css({backgroundColor:"#e0ffe0",borderColor:"#55ee55"});var t=document.getElementById("pname-"+e).value.split(".");if(1<t.length)for(var a=0;a<t.length;)"jpg"!=t[a]&&"JPG"!=t[a]||jQuery("#psdesc-"+e).css({display:""}),a++}"gold"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#eeeecc",borderColor:"#ddddbb"}),"silver"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ffffff",borderColor:"#eeeeee"}),"bronze"==elm.value&&jQuery("#photoitem-"+e).css({backgroundColor:"#ddddbb",borderColor:"#ccccaa"}),"scheduled"==elm.value?jQuery(".wppa-datetime-"+e).css("display",""):jQuery(".wppa-datetime-"+e).css("display","none"),jQuery("#scheduledel-"+e).prop("checked")?jQuery(".wppa-del-datetime-"+e).css("display",""):jQuery(".wppa-del-datetime-"+e).css("display","none")}}function wppaSetComBgCol(e){"approved"==jQuery("#com-stat-"+e).val()?jQuery("#com-tr-"+e).css({backgroundColor:"#ffffe0"}):jQuery("#com-tr-"+e).css({backgroundColor:"#ffebe8"})}function wppaAddCat(e,t){wppaAddTag(e,t)}function wppaAddTag(e,t){t=document.getElementById(t);e&&(t.value?t.value+=","+e:t.value=e,"-clear-"==e&&(t.value=""))}function wppaRefresh(e){e=new String(document.location).split("#")[0]+"#"+e;document.location=e}function wppaReload(e){e?(url=document.location.href.split("#"),document.location.href=url[0]+e,setTimeout(function(){document.location.reload(!0)},10)):document.location.reload(!0)}var wppaFeCount=0;function wppaFeAjaxLog(e){"in"==e&&(0==wppaFeCount&&jQuery("#wppa-fe-exit").css("display","none"),wppaFeCount++,jQuery("#wppa-fe-count").html(wppaFeCount)),"out"==e&&(1==wppaFeCount&&(jQuery("#wppa-fe-count").html(""),jQuery("#wppa-fe-exit").css("display","inline"),wppaFeCount--),1<wppaFeCount&&(wppaFeCount--,jQuery("#wppa-fe-count").html(wppaFeCount)))}function wppaArrayToEnum(e,t){temp=e.sort(function(e,t){return e-t});for(var a,p="",n=-1,o=-2,r=0,u=!1,l=0;l<e.length;)0!=(a=e[l].valueOf())&&(r=n,a==++r?u=!0:u?(p+=n==o?t+n+t+a:t+t+n+t+a,u=!1):p+=t+a,u||(o=a,o++),n=a),l++;for(u&&(p+=".."+n);"."==p.substr(0,1);)p=p.substr(1);for(;p.substr(0,1)==t;)p=p.substr(1);return p}function wppaGetSelEnumToId(e,t){p=jQuery("."+e);var a=[];for(i=0,j=0;i<p.length;)p[i].selected&&(a[j]=p[i].value,j++),i++;jQuery("#"+t).val(wppaArrayToEnum(a,"."))}function wppaGetSelectionEnumByClass(e,t){var a,p=[],n=0,o=0;for(t=t||".",a=jQuery(e),o=n=0;n<a.length;)a[n].selected&&(p[o]=a[n].value,o++),n++;return wppaArrayToEnum(p,t)}function wppaEditSearch(e,t){t=jQuery("#"+t).val();0==t.length?alert("Please enter searchstring"):document.location.href=e+"&wppa-searchstring="+t}function wppaEditTrash(e){document.location.href=e}function wppaExportDbTable(p){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=export-table&table="+p,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){jQuery("#"+p+"-spin").css("display","inline")},success:function(e,t,a){e=e.split("||");"0"==e[1]?document.location=e[2]:alert("Error: "+e[1]+"\n\n"+e[2])},error:function(e,t,a){alert("Export Db Table "+p+" failed. Error = "+a+", status = "+t)},complete:function(e,t,a){jQuery("#"+p+"-spin").css("display","none")}})}function wppaDismissAdminNotice(e,t){wppaAjaxUpdateOptionCheckBox(e,t),jQuery("#wppa-wr-").css("display","none")}function wppaAjaxUpdateTogo(n){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=gettogo&slug="+n,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){wppaConsoleLog("Requesting togo for slug "+n,"force")},success:function(e,t,a){var p=e.split("|");jQuery("#"+n+"_togo").html(p[0]);e=jQuery("#"+n+"_status").html(),p=p[1];""!=e&&""==p&&(p='<input type="button" class="button-secundary" style="border-radius:3px;font-size:11px;height:18px;margin: 0 4px;padding:0px;color:red;background-color:pink;" onclick="document.location.reload(true)" value="Reload" />'),jQuery("#"+n+"_status").html(p),setTimeout(function(){wppaAjaxUpdateTogo(n)},1e3)},error:function(e){},complete:function(e){}})}function wppaIsEmpty(e){return(null==e||void 0===e||""==e||0==e)&&!0}function wppaTimedConfirm(e){var t={modal:!0,resizable:!1,width:400,show:{effect:"fadeIn",duration:800},closeText:"X",buttons:[{text:"NO",click:function(){jQuery(this).dialog("close")}},{text:"YES",click:function(){jQuery(this).dialog("close")}}]};jQuery("#wppa-modal-container").html(e).dialog(t).dialog("open"),jQuery(".ui-dialog").css({boxShadow:"0px 0px 5px 5px #aaaaaa",padding:"8px",backgroundColor:"#cccccc",boxSizing:"content-box",zIndex:"200200"}),jQuery(".ui-dialog-titlebar").css({lineHeight:"0px",height:"32px"}),jQuery(".ui-button").css({float:"right",position:"relative",bottom:"40px"}),jQuery(".ui-dialog-titlebar-close").css({display:"none"}),jQuery(".ui-widget-overlay").css({backgroundColor:"transparent"}),jQuery(".ui-button").attr("title",wppaCloseText),setTimeout(function(){jQuery(".ui-button").trigger("click")},6e4)}function wppaAjaxGetSpinnerHtml(e,p){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=update-option&wppa-option=getspinnerpreview&type="+e+"&wppa-nonce="+document.getElementById("wppa-nonce").value,async:!0,type:"GET",timeout:1e5,beforeSend:function(e){},success:function(e,t,a){e=e.split("|");jQuery("#"+p).html(e[0])},error:function(e){},complete:function(e){}})}function wppaDragHorizon(t){var a=0,p=0;function n(e){(e=e||window.event).preventDefault(),a=p-e.clientY,p=e.clientY,t.style.top=t.offsetTop-a+"px"}function o(){document.onmouseup=null,document.onmousemove=null}t.onmousedown=function(e){(e=e||window.event).preventDefault(),pos3=e.clientX,p=e.clientY,document.onmouseup=o,document.onmousemove=n}}function wppaBulkActionChange(e,t){wppa_setCookie("wppa_bulk_action",e.value,365),"wppa-bulk-move-to"==e.value||"wppa-bulk-copy-to"==e.value?jQuery("#wppa-bulk-album").css("display","inline"):jQuery("#wppa-bulk-album").css("display","none"),"wppa-bulk-status"==e.value?jQuery("#wppa-bulk-status").css("display","inline"):jQuery("#wppa-bulk-status").css("display","none"),"wppa-bulk-owner"==e.value?jQuery("#wppa-bulk-owner").css("display","inline"):jQuery("#wppa-bulk-owner").css("display","none")}function wppaBulkDoitOnClick(){var e=jQuery(".wppa-bulk-photo"),t=0;for(i=0;i<e.length;i++)e[i].checked&&t++;if(0==t)return alert("No photos selected"),!1;var a=document.getElementById("wppa-bulk-action").value;switch(a){case"":return alert("No action selected"),!1;case"wppa-bulk-delete":break;case"wppa-bulk-move-to":case"wppa-bulk-copy-to":if(0==document.getElementById("wppa-bulk-album").value)return alert("No album selected"),!1;break;case"wppa-bulk-status":if(0==document.getElementById("wppa-bulk-status").value)return alert("No status selected"),!1;break;case"wppa-bulk-owner":if(0==documnet.getElementById("wppa-bulk-owner").value)return alert("No new owner selected"),!1;break;default:return alert("Unimplemented action requested: "+a),!1}return!0}function wppaSetThumbsize(e){e=e.value;wppa_setCookie("wppa_bulk_thumbsize",e,365),jQuery(".wppa-bulk-thumb").css("max-width",e+"px"),jQuery(".wppa-bulk-thumb").css("max-height",e/2+"px"),jQuery(".wppa-bulk-dec").css("height",e/2+"px")}function wppaToggleConfirmDelete(e){jQuery(e).prop("checked")?wppa_setCookie("wppaConfirmDelete","checked",365):wppa_setCookie("wppaConfirmDelete","unchecked",365)}function wppaToggleConfirmMove(e){jQuery(e).prop("checked")?wppa_setCookie("wppaConfirmMove","checked",365):wppa_setCookie("wppaConfirmMove","unchecked",365)}function wppaSetConfirmDelete(e){"checked"==wppa_getCookie("wppaConfirmDelete")?jQuery("#"+e).prop("checked",!0):jQuery("#"+e).prop("checked",!1)}function wppaSetConfirmMove(e){"checked"==wppa_getCookie("wppaConfirmMove")?jQuery("#"+e).prop("checked",!0):jQuery("#"+e).prop("checked",!1)}function wppaAjaxReplaceLog(){jQuery.ajax({url:wppaAjaxUrl,data:"action=wppa&wppa-action=maintenancepopup&slug=wppa_list_errorlog&raw=1&wppa-nonce="+jQuery("#wppa-nonce").val(),async:!0,type:"GET",timeout:1e5,beforeSend:function(e){jQuery("#wppa-spinner").show()},success:function(e,t,a){e=wppaEntityDecode(e),jQuery("#wppa-logbody").html(e),jQuery("#wppa-spinner").hide()}})}function wppaTestAdminReady(){"complete"===document.readyState?jQuery("#wppa-admin-spinner").fadeOut():setTimeout("wppaTestAdminReady()",200)}function wppaCommentAdminUpdateHref(e){var t=encodeURIComponent(jQuery("#commenttext-"+e).val()),a=jQuery("#href-"+e).attr("href"),p=a.split("commenttext=");p[1]=t,a=p[0]+"commenttext="+p[1],jQuery("#href-"+e).attr("href",a),jQuery("#href-"+e).css("display","inline")}jQuery(document).ready(function(){var e;document.getElementById("wppa-bulk-action")&&(e=wppa_getCookie("wppa_bulk_action"),"wppa-bulk-move-to"!=(document.getElementById("wppa-bulk-action").value=e)&&"wppa-bulk-copy-to"!=e||(jQuery("#wppa-bulk-album").css("display","inline"),document.getElementById("wppa-bulk-album").value=wppa_getCookie("wppa_bulk_album")),"wppa-bulk-status"==e&&(jQuery("#wppa-bulk-status").css("display","inline"),document.getElementById("wppa-bulk-status").value=wppa_getCookie("wppa_bulk_status")),"wppa-bulk-owner"==e&&(jQuery("#wppa-bulk-owner").css("display","inline"),document.getElementById("wppa-bulk-owner").value=wppa_getCookie("wppa_bulk_owner")))}),jQuery(document).ready(function(){setTimeout("wppaTestAdminReady()",200)});

wppa-admin-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* gp admin functions
6	- * Version 8.1.02.~~003~~
7	*
8	*/
9
	@@ -597,7 +597,7 @@ function wppa_admin_page_links( $curpage, $pagesize, $count, $link, $extra = ''
597	esc_html__( 'Next page', 'wp-photo-album-plus' ) .
598	'</a>';
599	}
600	- $result .= '</div><br ~~/>&~~nbsp;';
601
602	wppa_echo( $result );
603	}
	@@ -993,12 +993,12 @@ global $wpdb;
993
994	$lastalbum = $wpdb->get_row( "SELECT id, name FROM $wpdb->wppa_albums ORDER BY id DESC LIMIT 1", ARRAY_A );
995	if ( $lastalbum ) {
996	- $result .= '<br />' . sprintf( __( 'The most recently added album is <strong>%s</strong> (%d).', 'wp-photo-album-plus' ), sanitize_text_field( $lastalbum['name'] ), $lastalbum['id'] );
997	}
998	$lastphoto = $wpdb->get_row( "SELECT id, name, album FROM $wpdb->wppa_photos ORDER BY timestamp DESC LIMIT 1", ARRAY_A );
999	if ( ! $lastphoto ) {
1000	- $result .= '<br />' . __( 'There are no photos yet', 'wp-photo-album-plus' );
1001	- return;
1002	}
1003	if ( $lastphoto['album'] < '1' ) {
1004	$trashed = true;
	@@ -1010,7 +1010,7 @@ global $wpdb;
1010	}
1011	$lastphotoalbum = $wpdb->get_row( $wpdb->prepare( "SELECT id, name FROM $wpdb->wppa_albums WHERE id = %s", $album ), ARRAY_A );
1012	if ( $lastphoto ) {
1013	- $result .= '<br />' . sprintf( __( 'The most recently added photo is <strong>%s</strong> (%d)', 'wp-photo-album-plus' ), sanitize_text_field( $lastphoto['name'] ), $lastphoto['id'] );
1014	if ( $lastphotoalbum ) {
1015	$result .= ' ' . sprintf( __( 'in album <strong>%s</strong> (%d).', 'wp-photo-album-plus' ), sanitize_text_field( $lastphotoalbum['name'] ), $lastphotoalbum['id'] );
1016	}
	@@ -1018,6 +1018,7 @@ global $wpdb;
1018	$result .= ' <span style="color:red" >' . __( 'Deleted', 'wp-photo-album-plus' ) . '</span>';
1019	}
1020	}

1021	}
1022
1023	// edit album url


3	* Package: wp-photo-album-plus
4	*
5	* gp admin functions
6	+ * Version 8.1.05.001
7	*
8	*/
9

597	esc_html__( 'Next page', 'wp-photo-album-plus' ) .
598	'</a>';
599	}
600	+ $result .= '</div><br> ';
601
602	wppa_echo( $result );
603	}

993
994	$lastalbum = $wpdb->get_row( "SELECT id, name FROM $wpdb->wppa_albums ORDER BY id DESC LIMIT 1", ARRAY_A );
995	if ( $lastalbum ) {
996	+ $result .= '<br>' . sprintf( __( 'The most recently added album is <strong>%s</strong> (%d).', 'wp-photo-album-plus' ), sanitize_text_field( $lastalbum['name'] ), $lastalbum['id'] );
997	}
998	$lastphoto = $wpdb->get_row( "SELECT id, name, album FROM $wpdb->wppa_photos ORDER BY timestamp DESC LIMIT 1", ARRAY_A );
999	if ( ! $lastphoto ) {
1000	+ $result .= '<br>' . __( 'There are no photos yet', 'wp-photo-album-plus' );
1001	+ return $result;
1002	}
1003	if ( $lastphoto['album'] < '1' ) {
1004	$trashed = true;

1010	}
1011	$lastphotoalbum = $wpdb->get_row( $wpdb->prepare( "SELECT id, name FROM $wpdb->wppa_albums WHERE id = %s", $album ), ARRAY_A );
1012	if ( $lastphoto ) {
1013	+ $result .= '<br>' . sprintf( __( 'The most recently added photo is <strong>%s</strong> (%d)', 'wp-photo-album-plus' ), sanitize_text_field( $lastphoto['name'] ), $lastphoto['id'] );
1014	if ( $lastphotoalbum ) {
1015	$result .= ' ' . sprintf( __( 'in album <strong>%s</strong> (%d).', 'wp-photo-album-plus' ), sanitize_text_field( $lastphotoalbum['name'] ), $lastphotoalbum['id'] );
1016	}

1018	$result .= ' <span style="color:red" >' . __( 'Deleted', 'wp-photo-album-plus' ) . '</span>';
1019	}
1020	}
1021	+ return $result;
1022	}
1023
1024	// edit album url

wppa-ajax.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-ajax.php
3	*
4	* Functions used in ajax requests
5	- * Version 8.1.02.~~003~~
6	*
7	*/
8
	@@ -911,7 +911,7 @@ global $wppa;
911	wppa_get_photo_name( $photo )
912	);
913	$content .=
914	- '<br ~~/><~~br />' . __('His request specification is', 'wp-photo-album-plus') . '<br />' .
915
916	'<blockquote style="color:#000077; background-color: #dddddd; border:1px solid black; padding: 6px; border-radius: 4px;" >
917	<em> ' . sanitize_text_field( wppa_get( 'emailtext' ) ) . '</em>
	@@ -1064,7 +1064,7 @@ global $wppa;
1064	break;
1065
1066	case 'getshortcodedrendered':
1067	- wppa_get( 'shortcode', 'text' );
1068	$shortcode = str_replace( ['HASH', 'QUOTE', 'APOS'], ['#', '"', "'"], $shortcode );
1069	$_REQUEST['shortcode'] = $shortcode;
1070
	@@ -1720,14 +1720,14 @@ global $wppa;
1720	$value = trim( strip_tags( $value ) );
1721	if ( ! wppa_sanitize_file_name( $value ) ) { // Empty album name is not allowed
1722	$value = 'Album-#' . $album;
1723	- wppa_echo( '\|\|5\|\|' . sprintf( __( 'Album name may not be empty.<br />Reset to %s', 'wp-photo-album-plus' ), htmlentities( $value ) ) );
1724	}
1725	$itemname = __( 'Name' , 'wp-photo-album-plus');
1726	wppa_update_album( array( 'id' => $album, 'name' => $value, 'modified' => time() ) );
1727	break;
1728	case 'description':
1729	$itemname = __( 'Description' , 'wp-photo-album-plus');
1730	- $value = str_replace( array( '<br/>','<br>' ), '<br />', $value );
1731	$value = trim( $value );
1732	wppa_update_album( array( 'id' => $album, 'description' => $value, 'modified' => time() ) );
1733	break;
	@@ -3161,7 +3161,7 @@ global $wppa;
3161	if ( ! wppa_is_dir( dirname( $path ) ) ) {
3162	wppa_mkdir( dirname( $path ) );
3163	}
3164	- $bret = wppa_put_contents( $path, $value );
3165
3166	if ( ! $bret ) {
3167	$title = __( 'Failed to save code', 'wp-photo-album-plus' );


2	/* wppa-ajax.php
3	*
4	* Functions used in ajax requests
5	+ * Version 8.1.05.001
6	*
7	*/
8

911	wppa_get_photo_name( $photo )
912	);
913	$content .=
914	+ '<br><br>' . __('His request specification is', 'wp-photo-album-plus') . '<br>' .
915
916	'<blockquote style="color:#000077; background-color: #dddddd; border:1px solid black; padding: 6px; border-radius: 4px;" >
917	<em> ' . sanitize_text_field( wppa_get( 'emailtext' ) ) . '</em>

1064	break;
1065
1066	case 'getshortcodedrendered':
1067	+ $shortcode = wppa_get( 'shortcode', 'text' );
1068	$shortcode = str_replace( ['HASH', 'QUOTE', 'APOS'], ['#', '"', "'"], $shortcode );
1069	$_REQUEST['shortcode'] = $shortcode;
1070

1720	$value = trim( strip_tags( $value ) );
1721	if ( ! wppa_sanitize_file_name( $value ) ) { // Empty album name is not allowed
1722	$value = 'Album-#' . $album;
1723	+ wppa_echo( '\|\|5\|\|' . sprintf( __( 'Album name may not be empty.<br>Reset to %s', 'wp-photo-album-plus' ), htmlentities( $value ) ) );
1724	}
1725	$itemname = __( 'Name' , 'wp-photo-album-plus');
1726	wppa_update_album( array( 'id' => $album, 'name' => $value, 'modified' => time() ) );
1727	break;
1728	case 'description':
1729	$itemname = __( 'Description' , 'wp-photo-album-plus');
1730	+ $value = str_replace( array( '<br/>','<br>' ), '<br>', $value );
1731	$value = trim( $value );
1732	wppa_update_album( array( 'id' => $album, 'description' => $value, 'modified' => time() ) );
1733	break;

3161	if ( ! wppa_is_dir( dirname( $path ) ) ) {
3162	wppa_mkdir( dirname( $path ) );
3163	}
3164	+ $bret = wppa_put_contents( $path, '<?php ' . $value );
3165
3166	if ( ! $bret ) {
3167	$title = __( 'Failed to save code', 'wp-photo-album-plus' );

wppa-album-admin-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* create, edit and delete albums
6	- * Version 8.1.04.~~003~~
7	*
8	*/
9
	@@ -125,7 +125,7 @@ global $wppa_revno;
125	<h2>' . __( 'Manage Photos', 'wp-photo-album-plus' ) . ' - <small><i>' . $task . '</i></small></h2>
126	<a href="' . $back_url . '" >' .
127	$back_title .
128	- '</a><br ~~/><~~br />' );
129
130	if ( wppa_get( 'bulk' ) ) {
131	wppa_album_photos_bulk( $ei );
	@@ -140,7 +140,7 @@ global $wppa_revno;
140	' . __( 'Top of page', 'wp-photo-album-plus' ) . '
141	</div>
142	</a>
143	- <br />
144	<a href="' . $back_url . '" >' .
145	$back_title .
146	'</a>' );
	@@ -487,7 +487,7 @@ global $wppa_revno;
487	<p class="description">' .
488	__( 'All modifications are instantly updated on the server, except for those that require a button push.', 'wp-photo-album-plus' ) . ' ' .
489	__( 'After entering/modification of text, click outside the textfield to get it updated.', 'wp-photo-album-plus' ) . ' ' .
490	- '<br />' . __( 'The <b style="color:#070" >Remark</b> fields keep you informed on the actions taken at the background.', 'wp-photo-album-plus' ) . '
491	</p>
492	<input
493	type="hidden"
	@@ -548,7 +548,7 @@ global $wppa_revno;
548	__( 'Clicks:', 'wp-photo-album-plus' ) . ' ' . array_sum( $click_arr ) . '. ';
549	}
550
551	- $result .= '<br />';
552
553	// Owner
554	$result .=
	@@ -604,7 +604,7 @@ global $wppa_revno;
604	if ( wppa_opt( 'list_albums_by' ) != '1' && $a_order != '0' ) {
605	$result .=
606	'<small class="description" style="color:red" >' .
607	- __( 'Album sequence number has only effect if you set the album sort order method to <b>Order #</b> in the Photo Albums -> Settings screen.<br />', 'wp-photo-album-plus' ) .
608	'</small>' . ' ';
609	}
610
	@@ -884,7 +884,7 @@ global $wppa_revno;
884	style="cursor:pointer;"
885	/>' .
886
887	- '<br />';
888
889	// Need this the next 5 items
890	$yes = __( 'yes', 'wp-photo-album-plus' );
	@@ -965,7 +965,7 @@ global $wppa_revno;
965	if ( wppa_switch( 'watermark_on' ) ) {
966
967	// Newline
968	- $result .= '<br />' .
969
970	__( 'Watermark file:', 'wp-photo-album-plus' ) . '
971	<select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'wmfile\', this )" >' .
	@@ -1003,7 +1003,7 @@ global $wppa_revno;
1003	}
1004
1005	// Status
1006	- $result .= '<br />' .
1007	__( 'Remark', 'wp-photo-album-plus' ) . ':
1008	<span
1009	id="albumstatus-' . $id . '"
	@@ -1077,7 +1077,7 @@ global $wppa_revno;
1077	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'cats\', this )"
1078	value="' . esc_attr( $cats ) . '"
1079	/>
1080	- <br />
1081	<span class="description" >' .
1082	__( 'Separate categories with commas.', 'wp-photo-album-plus' ) . '
1083	</span>
	@@ -1116,7 +1116,7 @@ global $wppa_revno;
1116	style="width:100%"
1117	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'default_tags\', this )"
1118	/>
1119	- <br />
1120	<span class="description">' .
1121	__( 'Enter the tags that you want to be assigned to new photos in this album.', 'wp-photo-album-plus' ) . '
1122	</span>
	@@ -1181,7 +1181,7 @@ global $wppa_revno;
1181	<option value="page"' . ( $lt == 'page' ? $sel : '' ) . ' >' . __( 'the link page with a clean url', 'wp-photo-album-plus' ) . '</option>
1182	<option value="none"' . ( $lt == 'none' ? $sel : '' ) . ' >' . __( 'no link at all', 'wp-photo-album-plus' ) . '</option>
1183	</select>
1184	- <br />
1185	<span class="description">';
1186	if ( wppa_switch( 'auto_page' ) ) {
1187	$result .= __( 'If you select "the link page with a clean url", select an Auto Page of one of the photos in this album.', 'wp-photo-album-plus' );
	@@ -1238,7 +1238,7 @@ global $wppa_revno;
1238	}
1239	$result .= '
1240	</select>
1241	- <br />
1242	<span class="description" >' .
1243	__( 'If you want, you can link the title to a WP page or post instead of the album\'s content. If so, select the page the title links to.', 'wp-photo-album-plus' ) .
1244	'</span>';
	@@ -1270,7 +1270,7 @@ global $wppa_revno;
1270	' >' .
1271	wppa_get_date_time_select_html( 'album', $id, true ) .
1272	'</span>
1273	- <br />
1274	<span class="description" >' .
1275	__( 'If enabled, new photos will have their status set scheduled for publication on the date/time specified here.', 'wp-photo-album-plus' ) .
1276	'</span>
	@@ -1529,7 +1529,7 @@ global $wppa_revno;
1529	wppa_album_photos( $edit_id );
1530
1531	$result = '
1532	- <br />
1533	<a href="' . $back_url . '" >' .
1534	$back_title .
1535	'</a>
	@@ -1596,14 +1596,14 @@ global $wppa_revno;
1596	<h1 style="display:inline;" >' . __( 'Delete Album', 'wp-photo-album-plus' ) . '</h1>
1597
1598	<p>' . __( 'Album:', 'wp-photo-album-plus' ) . '<b>' . htmlspecialchars( wppa_get_album_name( wppa_get( 'edit-id' ) ) ) . '</b></p>
1599	- <p>' . __( 'Are you sure you want to delete this album?', 'wp-photo-album-plus' ) . '<br />' .
1600	__( 'Press Delete to continue, and Cancel to go back.', 'wp-photo-album-plus' ) . '
1601	</p>
1602	<form name="wppa-del-form" action="' . esc_url( wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu' ) ) . '" method="post">' .
1603	wp_nonce_field( 'wppa-nonce', 'wppa-nonce' ) . '
1604	<p>' .
1605	- __( 'What would you like to do with photos currently in the album?', 'wp-photo-album-plus' ) . '<br />
1606	- <input type="radio" name="wppa-del-photos" value="delete" checked="checked" />' . __( 'Delete', 'wp-photo-album-plus' ) . '<br />
1607	<input type="radio" name="wppa-del-photos" value="move" />' . __( 'Move to:', 'wp-photo-album-plus' ) . '
1608	<select name="wppa-move-album">' .
1609	wppa_album_select_a( array( 'checkaccess' => true,
	@@ -1704,7 +1704,7 @@ global $wppa_revno;
1704	/>
1705	</form>';
1706	if ( wppa_is_mobile() ) {
1707	- $result .= '<br />';
1708	}
1709	}
1710
	@@ -1728,7 +1728,7 @@ global $wppa_revno;
1728	/>';
1729	}
1730	if ( wppa_is_mobile() ) {
1731	- $result .= '<br />';
1732	}
1733	if ( $style != 'flat' ) {
1734	$result .= '
	@@ -1759,7 +1759,7 @@ global $wppa_revno;
1759	value="' . esc_attr__( 'Close all', 'wp-photo-album-plus' ) . '"
1760	/>';
1761	if ( wppa_is_mobile() ) {
1762	- $result .= '<br />';
1763	}
1764	}
1765
	@@ -1777,7 +1777,7 @@ global $wppa_revno;
1777	$result .=
1778	'</select>';
1779	if ( wppa_is_mobile() ) {
1780	- $result .= '<br />';
1781	}
1782
1783
	@@ -1804,14 +1804,14 @@ global $wppa_revno;
1804	wppa_add_inline_script( 'wppa-admin', $the_js );
1805
1806
1807	- $result .= '<br />';
1808	wppa_echo( $result );
1809
1810	// The table of existing albums
1811	if ( $style == 'flat' ) wppa_admin_albums_flat();
1812	else wppa_admin_albums_collapsible();
1813
1814	- wppa_echo( '<br />' );
1815
1816	wppa_album_sequence( '0' );
1817
	@@ -2116,7 +2116,7 @@ global $wpdb;
2116
2117	wppa_echo( $result );
2118
2119	- wppa_album_admin_footer();
2120
2121	}
2122	else {
	@@ -2408,7 +2408,7 @@ global $wpdb;
2408
2409	wppa_echo( $result );
2410
2411	- wppa_album_admin_footer();
2412
2413	$the_js = '
2414	function checkArrows() {
	@@ -2999,14 +2999,14 @@ global $wpdb;
2999	if ( $albumorder_col != 'a_order' ) {
3000	if ( $parent == '0') {
3001	$result = '
3002	- <br />' .
3003	__( 'You can edit top-level album sequence number here when you set the album sequence to "Order #" or "Order # desc" in Basic settings -> Misc -> I -> Item 1.' );
3004	}
3005	else {
3006	$result =
3007	__( 'You can edit sub-album sequence number here when you set the album sequence to "Order #" or "Order # desc" in the "Sub album sort order:" selection box above.' );
3008	}
3009	- $result .= '<br />';
3010
3011	wppa_echo( $result );
3012	return;
	@@ -3205,7 +3205,7 @@ global $wpdb;
3205	wppa_add_inline_script( 'wppa-admin', $the_js );
3206
3207	$result = '
3208	- <br />
3209	<div id="wppa-progbar" style="width:100%;height:12px;" >';
3210
3211	$c = count( $albums );
	@@ -3223,7 +3223,7 @@ global $wpdb;
3223	$result .= '
3224	</div>
3225
3226	- <br />
3227
3228	<div class="widefat" style="max-width:600px;" >
3229	<div id="sortable-albums">';
	@@ -3261,7 +3261,7 @@ global $wpdb;
3261	</div>
3262	<div style="height:100%;width:40%;float:left;font-size:12px;overflow:hidden;" >
3263	<b>' . htmlspecialchars( wppa_get_album_name( $albid ) ) . '</b>
3264	- <br />' .
3265	wppa_get_album_desc( $albid ) . '
3266	</div>
3267	<div style="float:right;width:10%;" >
	@@ -3320,7 +3320,7 @@ global $wpdb;
3320	<span> ' . __( 'Id:' , 'wp-photo-album-plus' ) . ' ' . $albid . '</span>
3321	<span> - ' . __( 'Ord:' , 'wp-photo-album-plus' ) . '</span>
3322	<span id="wppa-album-seqno-' . $albid . '" > ' . $album['a_order'] . '</span>
3323	- <br />
3324	<a href="' . wppa_ea_url( $albid ) . '" style="position:absolute;bottom:0;" >' . __( 'Edit', 'wp-photo-album-plus' ) . '</a>
3325	</div>
3326	<input type="hidden" id="album-nonce-' . $albid . '" value="' . wp_create_nonce( 'wppa-nonce_' . $albid ) . '" />


3	* Package: wp-photo-album-plus
4	*
5	* create, edit and delete albums
6	+ * Version 8.1.05.001
7	*
8	*/
9

125	<h2>' . __( 'Manage Photos', 'wp-photo-album-plus' ) . ' - <small><i>' . $task . '</i></small></h2>
126	<a href="' . $back_url . '" >' .
127	$back_title .
128	+ '</a><br><br>' );
129
130	if ( wppa_get( 'bulk' ) ) {
131	wppa_album_photos_bulk( $ei );

140	' . __( 'Top of page', 'wp-photo-album-plus' ) . '
141	</div>
142	</a>
143	+ <br>
144	<a href="' . $back_url . '" >' .
145	$back_title .
146	'</a>' );

487	<p class="description">' .
488	__( 'All modifications are instantly updated on the server, except for those that require a button push.', 'wp-photo-album-plus' ) . ' ' .
489	__( 'After entering/modification of text, click outside the textfield to get it updated.', 'wp-photo-album-plus' ) . ' ' .
490	+ '<br>' . __( 'The <b style="color:#070" >Remark</b> fields keep you informed on the actions taken at the background.', 'wp-photo-album-plus' ) . '
491	</p>
492	<input
493	type="hidden"

548	__( 'Clicks:', 'wp-photo-album-plus' ) . ' ' . array_sum( $click_arr ) . '. ';
549	}
550
551	+ $result .= '<br>';
552
553	// Owner
554	$result .=

604	if ( wppa_opt( 'list_albums_by' ) != '1' && $a_order != '0' ) {
605	$result .=
606	'<small class="description" style="color:red" >' .
607	+ __( 'Album sequence number has only effect if you set the album sort order method to <b>Order #</b> in the Photo Albums -> Settings screen.<br>', 'wp-photo-album-plus' ) .
608	'</small>' . ' ';
609	}
610

884	style="cursor:pointer;"
885	/>' .
886
887	+ '<br>';
888
889	// Need this the next 5 items
890	$yes = __( 'yes', 'wp-photo-album-plus' );

965	if ( wppa_switch( 'watermark_on' ) ) {
966
967	// Newline
968	+ $result .= '<br>' .
969
970	__( 'Watermark file:', 'wp-photo-album-plus' ) . '
971	<select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'wmfile\', this )" >' .

1003	}
1004
1005	// Status
1006	+ $result .= '<br>' .
1007	__( 'Remark', 'wp-photo-album-plus' ) . ':
1008	<span
1009	id="albumstatus-' . $id . '"

1077	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'cats\', this )"
1078	value="' . esc_attr( $cats ) . '"
1079	/>
1080	+ <br>
1081	<span class="description" >' .
1082	__( 'Separate categories with commas.', 'wp-photo-album-plus' ) . '
1083	</span>

1116	style="width:100%"
1117	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'default_tags\', this )"
1118	/>
1119	+ <br>
1120	<span class="description">' .
1121	__( 'Enter the tags that you want to be assigned to new photos in this album.', 'wp-photo-album-plus' ) . '
1122	</span>

1181	<option value="page"' . ( $lt == 'page' ? $sel : '' ) . ' >' . __( 'the link page with a clean url', 'wp-photo-album-plus' ) . '</option>
1182	<option value="none"' . ( $lt == 'none' ? $sel : '' ) . ' >' . __( 'no link at all', 'wp-photo-album-plus' ) . '</option>
1183	</select>
1184	+ <br>
1185	<span class="description">';
1186	if ( wppa_switch( 'auto_page' ) ) {
1187	$result .= __( 'If you select "the link page with a clean url", select an Auto Page of one of the photos in this album.', 'wp-photo-album-plus' );

1238	}
1239	$result .= '
1240	</select>
1241	+ <br>
1242	<span class="description" >' .
1243	__( 'If you want, you can link the title to a WP page or post instead of the album\'s content. If so, select the page the title links to.', 'wp-photo-album-plus' ) .
1244	'</span>';

1270	' >' .
1271	wppa_get_date_time_select_html( 'album', $id, true ) .
1272	'</span>
1273	+ <br>
1274	<span class="description" >' .
1275	__( 'If enabled, new photos will have their status set scheduled for publication on the date/time specified here.', 'wp-photo-album-plus' ) .
1276	'</span>

1529	wppa_album_photos( $edit_id );
1530
1531	$result = '
1532	+ <br>
1533	<a href="' . $back_url . '" >' .
1534	$back_title .
1535	'</a>

1596	<h1 style="display:inline;" >' . __( 'Delete Album', 'wp-photo-album-plus' ) . '</h1>
1597
1598	<p>' . __( 'Album:', 'wp-photo-album-plus' ) . '<b>' . htmlspecialchars( wppa_get_album_name( wppa_get( 'edit-id' ) ) ) . '</b></p>
1599	+ <p>' . __( 'Are you sure you want to delete this album?', 'wp-photo-album-plus' ) . '<br>' .
1600	__( 'Press Delete to continue, and Cancel to go back.', 'wp-photo-album-plus' ) . '
1601	</p>
1602	<form name="wppa-del-form" action="' . esc_url( wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu' ) ) . '" method="post">' .
1603	wp_nonce_field( 'wppa-nonce', 'wppa-nonce' ) . '
1604	<p>' .
1605	+ __( 'What would you like to do with photos currently in the album?', 'wp-photo-album-plus' ) . '<br>
1606	+ <input type="radio" name="wppa-del-photos" value="delete" checked="checked" />' . __( 'Delete', 'wp-photo-album-plus' ) . '<br>
1607	<input type="radio" name="wppa-del-photos" value="move" />' . __( 'Move to:', 'wp-photo-album-plus' ) . '
1608	<select name="wppa-move-album">' .
1609	wppa_album_select_a( array( 'checkaccess' => true,

1704	/>
1705	</form>';
1706	if ( wppa_is_mobile() ) {
1707	+ $result .= '<br>';
1708	}
1709	}
1710

1728	/>';
1729	}
1730	if ( wppa_is_mobile() ) {
1731	+ $result .= '<br>';
1732	}
1733	if ( $style != 'flat' ) {
1734	$result .= '

1759	value="' . esc_attr__( 'Close all', 'wp-photo-album-plus' ) . '"
1760	/>';
1761	if ( wppa_is_mobile() ) {
1762	+ $result .= '<br>';
1763	}
1764	}
1765

1777	$result .=
1778	'</select>';
1779	if ( wppa_is_mobile() ) {
1780	+ $result .= '<br>';
1781	}
1782
1783

1804	wppa_add_inline_script( 'wppa-admin', $the_js );
1805
1806
1807	+ $result .= '<br>';
1808	wppa_echo( $result );
1809
1810	// The table of existing albums
1811	if ( $style == 'flat' ) wppa_admin_albums_flat();
1812	else wppa_admin_albums_collapsible();
1813
1814	+ wppa_echo( '<br>' );
1815
1816	wppa_album_sequence( '0' );
1817

2116
2117	wppa_echo( $result );
2118
2119	+ wppa_echo( wppa_album_admin_footer() );
2120
2121	}
2122	else {

2408
2409	wppa_echo( $result );
2410
2411	+ wppa_echo( wppa_album_admin_footer() );
2412
2413	$the_js = '
2414	function checkArrows() {

2999	if ( $albumorder_col != 'a_order' ) {
3000	if ( $parent == '0') {
3001	$result = '
3002	+ <br>' .
3003	__( 'You can edit top-level album sequence number here when you set the album sequence to "Order #" or "Order # desc" in Basic settings -> Misc -> I -> Item 1.' );
3004	}
3005	else {
3006	$result =
3007	__( 'You can edit sub-album sequence number here when you set the album sequence to "Order #" or "Order # desc" in the "Sub album sort order:" selection box above.' );
3008	}
3009	+ $result .= '<br>';
3010
3011	wppa_echo( $result );
3012	return;

3205	wppa_add_inline_script( 'wppa-admin', $the_js );
3206
3207	$result = '
3208	+ <br>
3209	<div id="wppa-progbar" style="width:100%;height:12px;" >';
3210
3211	$c = count( $albums );

3223	$result .= '
3224	</div>
3225
3226	+ <br>
3227
3228	<div class="widefat" style="max-width:600px;" >
3229	<div id="sortable-albums">';

3261	</div>
3262	<div style="height:100%;width:40%;float:left;font-size:12px;overflow:hidden;" >
3263	<b>' . htmlspecialchars( wppa_get_album_name( $albid ) ) . '</b>
3264	+ <br>' .
3265	wppa_get_album_desc( $albid ) . '
3266	</div>
3267	<div style="float:right;width:10%;" >

3320	<span> ' . __( 'Id:' , 'wp-photo-album-plus' ) . ' ' . $albid . '</span>
3321	<span> - ' . __( 'Ord:' , 'wp-photo-album-plus' ) . '</span>
3322	<span id="wppa-album-seqno-' . $albid . '" > ' . $album['a_order'] . '</span>
3323	+ <br>
3324	<a href="' . wppa_ea_url( $albid ) . '" style="position:absolute;bottom:0;" >' . __( 'Edit', 'wp-photo-album-plus' ) . '</a>
3325	</div>
3326	<input type="hidden" id="album-nonce-' . $albid . '" value="' . wp_create_nonce( 'wppa-nonce_' . $albid ) . '" />

wppa-boxes-html.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	- * Version 8.1.04.~~004~~
7	*
8	*/
9
	@@ -203,7 +203,7 @@ global $wpdb;
203
204	if ( ! $photos ) {
205	$result .= __( 'There are no rated photos to display', 'wp-photo-album-plus' );
206	- $result .= '<br />';
207	return $result;
208	}
209
	@@ -241,7 +241,7 @@ global $wpdb;
241	<a href="' . wppa_get_hires_url( $id ) . '" data-rel="wppa" data-wppa="yes" >
242	<img src="' . wppa_get_photo_url( $id ) . '" alt="' . esc_attr( $photo['name'] ) . '" >
243	</a>
244	- <br /> ';
245	$result .= htmlspecialchars( $photo['name'] );
246	if ( $numb == 'id' ) $result .= ' (' . $id . ')';
247	if ( $numb == 'seqno' ) $result .= ' (' . wppa_get_seqno( $alb, $id ) . ')';
	@@ -263,13 +263,13 @@ global $wpdb;
263	onclick="alert(\'' . esc_js( $comment ) . '\')"
264	>' . wppa_get_user_by( 'id', $rating['userid'] )->display_name . '
265	</a>
266	- <br />';
267	}
268	else {
269	- $result .= wppa_get_user_by( 'id', $rating['userid'] )->display_name . '<br />';
270	}
271	}
272	- $result .= ' <br />';
273	if ( $type == 'total' ) $result .= __( 'Total', 'wp-photo-album-plus' );
274	if ( $type == 'average' ) $result .= __( 'Average', 'wp-photo-album-plus' );
275	$result .= '
	@@ -277,9 +277,9 @@ global $wpdb;
277	<td class="wppa-contest-table-points" >';
278	foreach( $ratings as $rating ) {
279	$t = $rating['value'];
280	- $result .= $t . '<br />';
281	}
282	- $result .= '-----<br ~~/><~~b>';
283	$prev_score = $this_score;
284	if ( $type == 'total' ) {
285	$this_score = $photo['total'];
	@@ -345,7 +345,7 @@ global $wpdb;
345	$result .= '
346	</tbody>
347	</table>
348	- <br ~~/><~~div style="clear:both;" ></div>';
349
350	return wppa_compress_html( $result );
351	}
	@@ -1415,7 +1415,7 @@ global $wppa_session;
1415	'sort' => $sort,
1416	'path' => ( ! wppa_in_widget() ),
1417	) ) . '
1418	- </select><br />
1419	<input
1420	type="radio"
1421	name="wppa-slide"
	@@ -1423,7 +1423,7 @@ global $wppa_session;
1423	( $wppa_session['superview'] == 'thumbs' ? 'checked' : '' ) . '
1424	/>' .
1425	__( 'Thumbnails', 'wp-photo-album-plus') . '
1426	- <br />
1427	<input
1428	type="radio"
1429	name="wppa-slide"
	@@ -1431,7 +1431,7 @@ global $wppa_session;
1431	( $wppa_session['superview'] == 'slide' ? 'checked' : '' ) . '
1432	/>' .
1433	__( 'Slideshow', 'wp-photo-album-plus' ) . '
1434	- <br />
1435	<input type="hidden" name="wppa-occur" value="1" />
1436	<input type="hidden" name="wppa-superview" value="1" />
1437	<input type="submit" value="' . __( 'Submit', 'wp-photo-album-plus' ) . '" />
	@@ -4026,7 +4026,7 @@ global $wpdb;
4026
4027	// Spam?
4028	elseif ( $comment['status'] == 'spam' && stripslashes( $comment['user'] ) == wppa( 'comment_user' ) ) {
4029	- $commentblock .= '<br ~~/><~~span style="color:red; font-size:9px;" >'.__( 'Marked as spam', 'wp-photo-album-plus' ).'</span>';
4030	}
4031
4032	$commentblock .=
	@@ -4354,9 +4354,9 @@ global $wpdb;
4354	if ( $need_captcha ) {
4355
4356	$result .= '
4357	- <br ~~/><~~br />' .
4358	$captcha_label . '
4359	- <br />' .
4360	$captcha_input;
4361	}
4362
	@@ -5025,22 +5025,22 @@ global $other_deps;
5025
5026	// The subtitles
5027	$result .= "\n\t".'<div style="font-size:'.$fontsize.'px; line-height:'.$lineheight.'px; position:absolute; width:'.$maxw.'px; ">';
5028	- $result .= sprintf( __( 'Photo by: %s', 'wp-photo-album-plus' ), $data[$id]['user'] ).'<br />';
5029	if ( $maxratings == 'yes' ) {
5030	$n = $data[$id]['maxratingcount'];
5031	- $result .= sprintf( _n( '%d max rating', '%d max ratings', $n, 'wp-photo-album-plus' ), $n ) . '<br />';
5032	}
5033	if ( $ratcount == 'yes' ) {
5034	$n = $data[$id]['ratingcount'];
5035	- $result .= sprintf( _n( '%d vote', '%d votes', 'wp-photo-album-plus'), $n ) . '<br />';
5036	}
5037	if ( $meanrat == 'yes' ) {
5038	$m = $data[$id]['meanrating'];
5039	- $result .= sprintf( __( 'Rating: %4.2f.', 'wp-photo-album-plus' ), $m ) . '<br />';
5040	}
5041	if ( $totvalue == 'yes' ) {
5042	$t = $data[$id]['totvalue'];
5043	- $result .= sprintf( __( 'Total rating: %d', 'wp-photo-album-plus' ), $t ) . '<br />';
5044	}
5045
5046	$result .= '</div>';
	@@ -5109,19 +5109,19 @@ global $other_deps;
5109	'<div style="font-size:'.wppa_opt( 'fontsize_widget_thumb' ).'px; line-height:'.$lineheight.'px; ">';
5110	if ( $maxratings == 'yes' ) {
5111	$n = $data[$author]['maxratingcount'];
5112	- $result .= sprintf( _n( '%d max rating', '%d max ratings', $n, 'wp-photo-album-plus' ), $n ).'<br />';
5113	}
5114	if ( $ratcount == 'yes' ) {
5115	$n = $data[$author]['ratingcount'];
5116	- $result .= sprintf( _n( '%d vote', '%d votes', 'wp-photo-album-plus'), $n ).'<br />';
5117	}
5118	if ( $meanrat == 'yes' ) {
5119	$m = $data[$author]['meanrating'];
5120	- $result .= sprintf( __( 'Mean value: %4.2f.', 'wp-photo-album-plus' ), $m ).'<br />';
5121	}
5122	if ( $totvalue == 'yes' ) {
5123	$t = $data[$author]['totvalue'];
5124	- $result .= sprintf( __( 'Total rating: %d', 'wp-photo-album-plus' ), $t ) . '<br />';
5125	}
5126
5127	$result .= '</div>';
	@@ -5195,19 +5195,21 @@ function wppa_calendar_box() {
5195	// The calendar html
5196	function wppa_get_calendar_html() {
5197	global $wpdb;

5198
5199	// Init
5200	$result = '';
5201	$secinday = 246060;
5202	$calendar_type = wppa( 'calendar' );
5203	$albums = wppa( 'start_album' ) ? wppa_expand_enum( wppa( 'start_album' ) ) : '';
5204	- $alb_clause = $albums ? ' AND album IN ( ' . str_replace( '.', ',' , $albums ) . ' ) ' : '';
5205	$alb_arg = wppa( 'start_album' ) ? 'wppa-album=' . wppa_alb_to_enum_children( wppa( 'start_album' ) ) . '&' : '';
5206	$desc = wppa( 'reverse' ) ? ' DESC' : '';
5207	$from = 0;
5208	$to = 0;
5209	$mocc = wppa( 'mocc' );
5210	$mocc1 = $mocc + 1;

5211
5212	// Get the selected fontsize-lineheight. small = 10-12, medium = 14-17, large = 18-22, xlarge = 22-24
5213	$fontsize = wppa_opt( 'font_calendar_by' );
	@@ -5330,10 +5332,10 @@ global $wpdb;
5330	cursor:pointer;
5331	width:' . $cw . 'px;"
5332	>' .
5333	- $date->format( 'M' ) . '<br />' .
5334	- $date->format( 'd' ) . '<br />' .
5335	- $date->format( 'D' ) . '<br />' .
5336	- $date->format( 'Y' ) . '<br />' .
5337	'(' . $dates[$keys[$day]] . ')' . '
5338	</div>
5339	</a>';
	@@ -5370,10 +5372,10 @@ global $wpdb;
5370	cursor:pointer;
5371	width:' . $cw . 'px;"
5372	>' .
5373	- date( 'M', $date * $secinday ) . '<br />' .
5374	- date( 'd', $date * $secinday ) . '<br />' .
5375	- date( 'D', $date * $secinday ) . '<br />' .
5376	- date( 'Y', $date * $secinday ) . '<br />' .
5377	'(' . $dates[$keys[$day]] . ')' . '
5378	</div>
5379	</a>';
	@@ -5421,6 +5423,9 @@ function wppa_real_calendar_box() {
5421	// The real calendar html
5422	function wppa_get_real_calendar_html( $year = 0, $month = 0 ) {
5423	global $wpdb;



5424
5425	$is_this_month = ( ! $year && ! $month ) \|\| ( $year == wppa_local_date( 'Y', time() ) && $month == wppa_local_date( 'm', time() ) );
5426
	@@ -5683,20 +5688,20 @@ global $wpdb;
5683	if ( wppa( 'calendar' ) == 'realexifdtm' ) {
5684	$like = sprintf( '%d:%02d:%02d', $year, $month, $current_day );
5685	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5686	- WHERE exifdtm LIKE %s", $wpdb->esc_like( $like ) . '%' );
5687	}
5688	else {
5689	$from = wppa_local_strtotime( $year . '-' . $month . '-' . $current_day );
5690	$to = $from + 24 * 60 * 60;
5691	if ( wppa( 'calendar' ) == 'realmodified' ) {
5692	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5693	- WHERE modified >= %d
5694	- AND modified < %d", $from, $to );
5695	}
5696	else {
5697	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5698	- WHERE timestamp >= %d
5699	- AND timestamp < %d", $from, $to );
5700	}
5701	}
5702	if ( $albums ) {
	@@ -6221,23 +6226,6 @@ function wppa_is_exif_date( $date ) {
6221	return true;
6222	}
6223
6224	- // The js code to make a widget responsive
6225	- function wppa_get_responsive_widget_js_html( $mocc ) {
6226	-
6227	- $result =
6228	- '<script>
6229	- if ( ! wppaAutoColumnWidth ) var wppaAutoColumnWidth = [];
6230	- wppaAutoColumnWidth['.$mocc.'] = true;
6231	- if ( ! wppaAutoColumnFrac ) var wppaAutoColumnFrac = [];
6232	- wppaAutoColumnFrac['.$mocc.'] = 1.0;
6233	- if ( ! wppaColWidth ) var wppaColWidth = [];
6234	- wppaColWidth['.$mocc.'] = 0;
6235	- if ( typeof( wppaTopMoc ) == "number" ) wppaTopMoc = Math.max(wppaTopMoc,'.$mocc.');
6236	- </script>';
6237	-
6238	- return $result;
6239	- }
6240	-
6241	// The shortcode is hidden behind an Ajax activating button
6242	// Currently implemented for:
6243	// type="slide"


3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	+ * Version 8.1.05.001
7	*
8	*/
9

203
204	if ( ! $photos ) {
205	$result .= __( 'There are no rated photos to display', 'wp-photo-album-plus' );
206	+ $result .= '<br>';
207	return $result;
208	}
209

241	<a href="' . wppa_get_hires_url( $id ) . '" data-rel="wppa" data-wppa="yes" >
242	<img src="' . wppa_get_photo_url( $id ) . '" alt="' . esc_attr( $photo['name'] ) . '" >
243	</a>
244	+ <br> ';
245	$result .= htmlspecialchars( $photo['name'] );
246	if ( $numb == 'id' ) $result .= ' (' . $id . ')';
247	if ( $numb == 'seqno' ) $result .= ' (' . wppa_get_seqno( $alb, $id ) . ')';

263	onclick="alert(\'' . esc_js( $comment ) . '\')"
264	>' . wppa_get_user_by( 'id', $rating['userid'] )->display_name . '
265	</a>
266	+ <br>';
267	}
268	else {
269	+ $result .= wppa_get_user_by( 'id', $rating['userid'] )->display_name . '<br>';
270	}
271	}
272	+ $result .= ' <br>';
273	if ( $type == 'total' ) $result .= __( 'Total', 'wp-photo-album-plus' );
274	if ( $type == 'average' ) $result .= __( 'Average', 'wp-photo-album-plus' );
275	$result .= '

277	<td class="wppa-contest-table-points" >';
278	foreach( $ratings as $rating ) {
279	$t = $rating['value'];
280	+ $result .= $t . '<br>';
281	}
282	+ $result .= '-----<br><b>';
283	$prev_score = $this_score;
284	if ( $type == 'total' ) {
285	$this_score = $photo['total'];

345	$result .= '
346	</tbody>
347	</table>
348	+ <br><div style="clear:both;" ></div>';
349
350	return wppa_compress_html( $result );
351	}

1415	'sort' => $sort,
1416	'path' => ( ! wppa_in_widget() ),
1417	) ) . '
1418	+ </select><br>
1419	<input
1420	type="radio"
1421	name="wppa-slide"

1423	( $wppa_session['superview'] == 'thumbs' ? 'checked' : '' ) . '
1424	/>' .
1425	__( 'Thumbnails', 'wp-photo-album-plus') . '
1426	+ <br>
1427	<input
1428	type="radio"
1429	name="wppa-slide"

1431	( $wppa_session['superview'] == 'slide' ? 'checked' : '' ) . '
1432	/>' .
1433	__( 'Slideshow', 'wp-photo-album-plus' ) . '
1434	+ <br>
1435	<input type="hidden" name="wppa-occur" value="1" />
1436	<input type="hidden" name="wppa-superview" value="1" />
1437	<input type="submit" value="' . __( 'Submit', 'wp-photo-album-plus' ) . '" />

4026
4027	// Spam?
4028	elseif ( $comment['status'] == 'spam' && stripslashes( $comment['user'] ) == wppa( 'comment_user' ) ) {
4029	+ $commentblock .= '<br><span style="color:red; font-size:9px;" >'.__( 'Marked as spam', 'wp-photo-album-plus' ).'</span>';
4030	}
4031
4032	$commentblock .=

4354	if ( $need_captcha ) {
4355
4356	$result .= '
4357	+ <br><br>' .
4358	$captcha_label . '
4359	+ <br>' .
4360	$captcha_input;
4361	}
4362

5025
5026	// The subtitles
5027	$result .= "\n\t".'<div style="font-size:'.$fontsize.'px; line-height:'.$lineheight.'px; position:absolute; width:'.$maxw.'px; ">';
5028	+ $result .= sprintf( __( 'Photo by: %s', 'wp-photo-album-plus' ), $data[$id]['user'] ).'<br>';
5029	if ( $maxratings == 'yes' ) {
5030	$n = $data[$id]['maxratingcount'];
5031	+ $result .= sprintf( _n( '%d max rating', '%d max ratings', $n, 'wp-photo-album-plus' ), $n ) . '<br>';
5032	}
5033	if ( $ratcount == 'yes' ) {
5034	$n = $data[$id]['ratingcount'];
5035	+ $result .= sprintf( _n( '%d vote', '%d votes', 'wp-photo-album-plus'), $n ) . '<br>';
5036	}
5037	if ( $meanrat == 'yes' ) {
5038	$m = $data[$id]['meanrating'];
5039	+ $result .= sprintf( __( 'Rating: %4.2f.', 'wp-photo-album-plus' ), $m ) . '<br>';
5040	}
5041	if ( $totvalue == 'yes' ) {
5042	$t = $data[$id]['totvalue'];
5043	+ $result .= sprintf( __( 'Total rating: %d', 'wp-photo-album-plus' ), $t ) . '<br>';
5044	}
5045
5046	$result .= '</div>';

5109	'<div style="font-size:'.wppa_opt( 'fontsize_widget_thumb' ).'px; line-height:'.$lineheight.'px; ">';
5110	if ( $maxratings == 'yes' ) {
5111	$n = $data[$author]['maxratingcount'];
5112	+ $result .= sprintf( _n( '%d max rating', '%d max ratings', $n, 'wp-photo-album-plus' ), $n ).'<br>';
5113	}
5114	if ( $ratcount == 'yes' ) {
5115	$n = $data[$author]['ratingcount'];
5116	+ $result .= sprintf( _n( '%d vote', '%d votes', 'wp-photo-album-plus'), $n ).'<br>';
5117	}
5118	if ( $meanrat == 'yes' ) {
5119	$m = $data[$author]['meanrating'];
5120	+ $result .= sprintf( __( 'Mean value: %4.2f.', 'wp-photo-album-plus' ), $m ).'<br>';
5121	}
5122	if ( $totvalue == 'yes' ) {
5123	$t = $data[$author]['totvalue'];
5124	+ $result .= sprintf( __( 'Total rating: %d', 'wp-photo-album-plus' ), $t ) . '<br>';
5125	}
5126
5127	$result .= '</div>';

5195	// The calendar html
5196	function wppa_get_calendar_html() {
5197	global $wpdb;
5198	+ global $photos_used;
5199
5200	// Init
5201	$result = '';
5202	$secinday = 246060;
5203	$calendar_type = wppa( 'calendar' );
5204	$albums = wppa( 'start_album' ) ? wppa_expand_enum( wppa( 'start_album' ) ) : '';
5205	+ $alb_clause = $albums ? ' AND album IN ( ' . str_replace( '.', ',' , $albums ) . ' ) ' : ' AND album > 0 ';
5206	$alb_arg = wppa( 'start_album' ) ? 'wppa-album=' . wppa_alb_to_enum_children( wppa( 'start_album' ) ) . '&' : '';
5207	$desc = wppa( 'reverse' ) ? ' DESC' : '';
5208	$from = 0;
5209	$to = 0;
5210	$mocc = wppa( 'mocc' );
5211	$mocc1 = $mocc + 1;
5212	+ $photos_used = '*';
5213
5214	// Get the selected fontsize-lineheight. small = 10-12, medium = 14-17, large = 18-22, xlarge = 22-24
5215	$fontsize = wppa_opt( 'font_calendar_by' );

5332	cursor:pointer;
5333	width:' . $cw . 'px;"
5334	>' .
5335	+ $date->format( 'M' ) . '<br>' .
5336	+ $date->format( 'd' ) . '<br>' .
5337	+ $date->format( 'D' ) . '<br>' .
5338	+ $date->format( 'Y' ) . '<br>' .
5339	'(' . $dates[$keys[$day]] . ')' . '
5340	</div>
5341	</a>';

5372	cursor:pointer;
5373	width:' . $cw . 'px;"
5374	>' .
5375	+ date( 'M', $date * $secinday ) . '<br>' .
5376	+ date( 'd', $date * $secinday ) . '<br>' .
5377	+ date( 'D', $date * $secinday ) . '<br>' .
5378	+ date( 'Y', $date * $secinday ) . '<br>' .
5379	'(' . $dates[$keys[$day]] . ')' . '
5380	</div>
5381	</a>';

5423	// The real calendar html
5424	function wppa_get_real_calendar_html( $year = 0, $month = 0 ) {
5425	global $wpdb;
5426	+ global $photos_used;
5427	+
5428	+ $photos_used = '*';
5429
5430	$is_this_month = ( ! $year && ! $month ) \|\| ( $year == wppa_local_date( 'Y', time() ) && $month == wppa_local_date( 'm', time() ) );
5431

5688	if ( wppa( 'calendar' ) == 'realexifdtm' ) {
5689	$like = sprintf( '%d:%02d:%02d', $year, $month, $current_day );
5690	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5691	+ WHERE exifdtm LIKE %s", $wpdb->esc_like( $like ) . '%' );
5692	}
5693	else {
5694	$from = wppa_local_strtotime( $year . '-' . $month . '-' . $current_day );
5695	$to = $from + 24 * 60 * 60;
5696	if ( wppa( 'calendar' ) == 'realmodified' ) {
5697	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5698	+ WHERE modified >= %d
5699	+ AND modified < %d", $from, $to );
5700	}
5701	else {
5702	$query = $wpdb->prepare( "SELECT * FROM $wpdb->wppa_photos
5703	+ WHERE timestamp >= %d
5704	+ AND timestamp < %d", $from, $to );
5705	}
5706	}
5707	if ( $albums ) {

6226	return true;
6227	}
6228

















6229	// The shortcode is hidden behind an Ajax activating button
6230	// Currently implemented for:
6231	// type="slide"

wppa-cache.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	/*
4	/* Contains all wppa smart cache functions
5	/*
6	- /* Version 8.1.03.001
7	*/
8
9	// Test for caching
	@@ -562,7 +562,7 @@ global $wpdb;
562	echo '
563	<p>' .
564	__( 'Caching is \'smart\'. This means that cache files are cleared when the display of a wppa widget or shortcode will change due to adding albums, photos comments or ratings.', 'wp-photo-album-plus' ) . '
565	- <br />' .
566	__( 'You will need to clear the cachefiles only when you change the layout outside the WPPA settings, i.e. change theme or custom CSS.', 'wp-photo-album-plus' ) . '
567	</p>
568
	@@ -571,7 +571,7 @@ global $wpdb;
571	class="button-primary"
572	onclick="document.location.href=\'' . admin_url( 'admin.php?page=wppa_cache&delete=1' ) . '\'"
573	value="' . __( 'Clear cache', 'wp-photo-album-plus' ) . '"
574	- /><br />
575
576	<p>' .
577	sprintf(


3	/*
4	/* Contains all wppa smart cache functions
5	/*
6	+ /* Version 8.1.05.001
7	*/
8
9	// Test for caching

562	echo '
563	<p>' .
564	__( 'Caching is \'smart\'. This means that cache files are cleared when the display of a wppa widget or shortcode will change due to adding albums, photos comments or ratings.', 'wp-photo-album-plus' ) . '
565	+ <br>' .
566	__( 'You will need to clear the cachefiles only when you change the layout outside the WPPA settings, i.e. change theme or custom CSS.', 'wp-photo-album-plus' ) . '
567	</p>
568

571	class="button-primary"
572	onclick="document.location.href=\'' . admin_url( 'admin.php?page=wppa_cache&delete=1' ) . '\'"
573	value="' . __( 'Clear cache', 'wp-photo-album-plus' ) . '"
574	+ /><br>
575
576	<p>' .
577	sprintf(

wppa-comment-admin.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all comments
6	- * Version 8.1.00.~~005~~
7	*
8	*/
9
	@@ -68,7 +68,7 @@ class WPPA_Comment_table extends WP_List_Table {
68
69	function column_user( $item ) {
70
71	- return stripslashes( $item['user'] ) . '<br />(' . ( $item['userid'] == -1 ? 'Loggedout' : $item['userid'] ) . ')<br />' . $item['ip'];
72	}
73
74	function column_timestamp( $item ) {
	@@ -87,7 +87,7 @@ class WPPA_Comment_table extends WP_List_Table {
87	' style="width:170px;"' .
88	' title="' . $title . '"' .
89	' />' .
90	- '<br />' .
91	$item['id'] . ' ' .
92	__( 'Photo', 'wp-photo-album-plus' ) . ': ' . $item['photo'];
93


3	* Package: wp-photo-album-plus
4	*
5	* manage all comments
6	+ * Version 8.1.05.001
7	*
8	*/
9

68
69	function column_user( $item ) {
70
71	+ return stripslashes( $item['user'] ) . '<br>(' . ( $item['userid'] == -1 ? 'Loggedout' : $item['userid'] ) . ')<br>' . $item['ip'];
72	}
73
74	function column_timestamp( $item ) {

87	' style="width:170px;"' .
88	' title="' . $title . '"' .
89	' />' .
90	+ '<br>' .
91	$item['id'] . ' ' .
92	__( 'Photo', 'wp-photo-album-plus' ) . ': ' . $item['photo'];
93

wppa-common-functions.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-common-functions.php
3	*
4	* Functions used in admin and in themes
5	- * Version 8.1.04.~~002~~
6	*
7	*/
8
	@@ -1098,7 +1098,7 @@ function wppa_tree_empty( $dir ) {
1098	}
1099
1100	// Produce an aleretbox and kill the content afterwards
1101	- function wppa_alert( $msg, $reload = false, ~~$escape = true~~ ) {
1102	global $wppa;
1103
1104	// Preprocess
	@@ -1106,9 +1106,6 @@ global $wppa;
1106	$msg = json_encode( $msg );
1107	$msg = trim( $msg, '"' );
1108	}
1109	- else {
1110	- $msg = htmlspecialchars( strip_tags( $msg ) );
1111	- }
1112
1113	// No message? quit
1114	if ( ! $msg ) {


2	/* wppa-common-functions.php
3	*
4	* Functions used in admin and in themes
5	+ * Version 8.1.05.001
6	*
7	*/
8

1098	}
1099
1100	// Produce an aleretbox and kill the content afterwards
1101	+ function wppa_alert( $msg, $reload = false ) {
1102	global $wppa;
1103
1104	// Preprocess

1106	$msg = json_encode( $msg );
1107	$msg = trim( $msg, '"' );
1108	}



1109
1110	// No message? quit
1111	if ( ! $msg ) {

wppa-dashboard-widgets.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Contains dashboard widgets code
6	*
7	- * Version 8.0.07.~~004~~
8	*
9	*/
10
	@@ -243,7 +243,7 @@ function wppa_show_email_subscription() {
243
244	echo
245	__( 'Notify me when...', 'wp-photo-album-plus' ) . '
246	- <br />
247	<ul>' . $body . '</ul>
248	<input type="hidden" id="wppa-ntfy-nonce" value="' . wp_create_nonce( 'wppa-ntfy-nonce' ) . '" />
249	<div style="clear:both;" ></div>';
	@@ -336,7 +336,7 @@ global $wpdb;
336	'<b>' . $usr . '</b>',
337	'<b>' . sanitize_text_field( wppa_get_album_name( $photo['album'] ) ) . '</b> (' . strval( intval( $photo['album'] ) ) . ')'
338	) .
339	- '<br />' .
340	wppa_local_date( '', $photo['timestamp'] ) .
341	'</td>' .
342	'</tr>';
	@@ -350,7 +350,7 @@ global $wpdb;
350	__( 'There are no recently uploaded photos', 'wp-photo-album-plus' ) .
351	'</p>';
352	}
353	- echo '<br />';
354
355	// Recent comments
356	echo '<h3>' . __( 'Recent comments on photos', 'wp-photo-album-plus' ) . '</h3>';
	@@ -376,10 +376,10 @@ global $wpdb;
376	'</td>' .
377	'<td>' .
378	'<i>' . sanitize_text_field( $comment['comment'] ) . '</i>' .
379	- '<br />' .
380	sprintf( __( 'by %s', 'wp-photo-album-plus' ),
381	'<b>' . htmlspecialchars( $comment['user'] ) . '</b>' ) .
382	- '<br />' .
383	wppa_local_date( '', $comment['timestamp'] ) .
384	'</td>' .
385	'</tr>';
	@@ -440,9 +440,9 @@ function wppa_show_potd_log() {
440	'</a>' .
441	'</td>' .
442	'<td>' .
443	- __( 'First displayed at', 'wp-photo-album-plus' ) . ': ' . wppa_local_date( '', $time ) . '<br />' .
444	- __( 'Name', 'wp-photo-album-plus' ) . ': ' . wppa_get_photo_name( $photo['id'] ) . '<br />' .
445	- __( 'Description', 'wp-photo-album-plus' ) . ':<br />' .
446	htmlspecialchars( strip_tags( wppa_get_photo_desc( $photo['id'] ) ) ) .
447	'</td>' .
448	'</tr>';
	@@ -454,7 +454,7 @@ function wppa_show_potd_log() {
454	sprintf( __( 'Photo %d has been removed' ), $item['id'] ) .
455	'</td>' .
456	'<td>' .
457	- __( 'First displayed at', 'wp-photo-album-plus' ) . ': ' . wppa_local_date( '', $item['tm'] ) . '<br />' .
458	'</td>' .
459	'</tr>';
460	}


4	*
5	* Contains dashboard widgets code
6	*
7	+ * Version 8.1.05.001
8	*
9	*/
10

243
244	echo
245	__( 'Notify me when...', 'wp-photo-album-plus' ) . '
246	+ <br>
247	<ul>' . $body . '</ul>
248	<input type="hidden" id="wppa-ntfy-nonce" value="' . wp_create_nonce( 'wppa-ntfy-nonce' ) . '" />
249	<div style="clear:both;" ></div>';

336	'<b>' . $usr . '</b>',
337	'<b>' . sanitize_text_field( wppa_get_album_name( $photo['album'] ) ) . '</b> (' . strval( intval( $photo['album'] ) ) . ')'
338	) .
339	+ '<br>' .
340	wppa_local_date( '', $photo['timestamp'] ) .
341	'</td>' .
342	'</tr>';

350	__( 'There are no recently uploaded photos', 'wp-photo-album-plus' ) .
351	'</p>';
352	}
353	+ echo '<br>';
354
355	// Recent comments
356	echo '<h3>' . __( 'Recent comments on photos', 'wp-photo-album-plus' ) . '</h3>';

376	'</td>' .
377	'<td>' .
378	'<i>' . sanitize_text_field( $comment['comment'] ) . '</i>' .
379	+ '<br>' .
380	sprintf( __( 'by %s', 'wp-photo-album-plus' ),
381	'<b>' . htmlspecialchars( $comment['user'] ) . '</b>' ) .
382	+ '<br>' .
383	wppa_local_date( '', $comment['timestamp'] ) .
384	'</td>' .
385	'</tr>';

440	'</a>' .
441	'</td>' .
442	'<td>' .
443	+ __( 'First displayed at', 'wp-photo-album-plus' ) . ': ' . wppa_local_date( '', $time ) . '<br>' .
444	+ __( 'Name', 'wp-photo-album-plus' ) . ': ' . wppa_get_photo_name( $photo['id'] ) . '<br>' .
445	+ __( 'Description', 'wp-photo-album-plus' ) . ':<br>' .
446	htmlspecialchars( strip_tags( wppa_get_photo_desc( $photo['id'] ) ) ) .
447	'</td>' .
448	'</tr>';

454	sprintf( __( 'Photo %d has been removed' ), $item['id'] ) .
455	'</td>' .
456	'<td>' .
457	+ __( 'First displayed at', 'wp-photo-album-plus' ) . ': ' . wppa_local_date( '', $item['tm'] ) . '<br>' .
458	'</td>' .
459	'</tr>';
460	}

wppa-defaults.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains default settings
6	- * Version 8.1.04.~~002~~
7	*
8	*/
9
	@@ -33,7 +33,7 @@ Hide Camera info
33	</div>
34	</a>
35	<div class="wppa-dtl" style="display:none;">
36	- <br />
37	<table style="margin:0; border:none;" >
38	<tr><td class="wppa-label" >Date Time</td><td class="wppa-value" >E#0132</td></tr>
39	<tr><td class="wppa-label" >Camera</td><td class="wppa-value" >E#0110</td></tr>
	@@ -612,7 +612,7 @@ horizrailenabled:false,";
612	'wppa_ovl_slide' => '5000',
613	'wppa_lightbox_global' => 'no',
614	'wppa_lightbox_global_set' => 'no',
615	- 'wppa_lb_hres' => 'no',
616	'wppa_ovl_video_start' => 'yes',
617	'wppa_ovl_audio_start' => 'yes',
618


3	* Package: wp-photo-album-plus
4	*
5	* Contains default settings
6	+ * Version 8.1.05.001
7	*
8	*/
9

33	</div>
34	</a>
35	<div class="wppa-dtl" style="display:none;">
36	+ <br>
37	<table style="margin:0; border:none;" >
38	<tr><td class="wppa-label" >Date Time</td><td class="wppa-value" >E#0132</td></tr>
39	<tr><td class="wppa-label" >Camera</td><td class="wppa-value" >E#0110</td></tr>

612	'wppa_ovl_slide' => '5000',
613	'wppa_lightbox_global' => 'no',
614	'wppa_lightbox_global_set' => 'no',
615	+ 'wppa_lb_hres' => 'yes',
616	'wppa_ovl_video_start' => 'yes',
617	'wppa_ovl_audio_start' => 'yes',
618

wppa-export.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the export functions
6	- * Version 8.1.00.001
7	*
8	*/
9
	@@ -26,10 +26,10 @@ global $wpdb;
26	</div>
27	<?php $iconurl = WPPA_URL.'/img/disk32.png'; ?>
28	<div id="icon-disk" class="icon32" style="background: transparent url(<?php echo($iconurl); ?>) no-repeat">
29	- <br />
30	</div>
31
32	- <h2><?php _e('Export Photos', 'wp-photo-album-plus'); ?></h2><br />
33
34	<form action="<?php echo(wppa_dbg_url(get_admin_url().'admin.php?page=wppa_export_photos')) ?>" method="post">
35	<?php wp_nonce_field('$wppa_nonce', WPPA_NONCE); ?>


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the export functions
6	+ * Version 8.1.05.001
7	*
8	*/
9

26	</div>
27	<?php $iconurl = WPPA_URL.'/img/disk32.png'; ?>
28	<div id="icon-disk" class="icon32" style="background: transparent url(<?php echo($iconurl); ?>) no-repeat">
29	+ <br>
30	</div>
31
32	+ <h2><?php _e('Export Photos', 'wp-photo-album-plus'); ?></h2><br>
33
34	<form action="<?php echo(wppa_dbg_url(get_admin_url().'admin.php?page=wppa_export_photos')) ?>" method="post">
35	<?php wp_nonce_field('$wppa_nonce', WPPA_NONCE); ?>

wppa-filter.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* get the albums via shortcode handler
6	- * Version 8.1.04.~~004~~
7	*
8	*/
9
	@@ -567,7 +567,7 @@ global $other_deps;
567	$err = '
568	<span style="color:red;" >
569	Error in shortcode spec for type="contest":
570	- Missing or invalid attribute album="<album id>"<br />
571	album=' . $atts['album'] . ', parent=' . $atts['parent'] . '</span>';
572	return $err;
573	}


3	* Package: wp-photo-album-plus
4	*
5	* get the albums via shortcode handler
6	+ * Version 8.1.05.001
7	*
8	*/
9

567	$err = '
568	<span style="color:red;" >
569	Error in shortcode spec for type="contest":
570	+ Missing or invalid attribute album="<album id>"<br>
571	album=' . $atts['album'] . ', parent=' . $atts['parent'] . '</span>';
572	return $err;
573	}

wppa-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	- * Version 8.1.04.~~004~~
7	*
8	*/
9
	@@ -1910,7 +1910,7 @@ global $wppa_session;
1910	$alb_clause = " AND album IN ( ". str_replace( '.', ',', wppa_expand_enum( wppa( 'start_album' ) ) ) ." ) ";
1911	}
1912	else {
1913	- $alb_clause = '';
1914	}
1915	switch ( wppa( 'calendar' ) ) {
1916	case 'exifdtm':
	@@ -2753,6 +2753,10 @@ static $user;
2753	}
2754
2755	// Find image url




2756	if ( wppa_switch( 'fotomoto_on' ) && ! wppa_is_stereo( $id ) ) {
2757	$photourl = wppa_get_hires_url( $id );
2758	$photourl = str_replace( '.pdf', '.jpg', $photourl );
	@@ -3020,7 +3024,7 @@ function wppa_get_slide_desc( $id ) {
3020
3021	// Remove extra space created by other filters like wpautop
3022	if ( wppa_switch( 'allow_foreign_shortcodes' ) && wppa_switch( 'clean_pbr' ) ) {
3023	- $desc = str_replace( array( "<p>", "</p>", "<br>", "<br/>", "<br />" ), " ", $desc );
3024	}
3025	}
3026
	@@ -3128,7 +3132,7 @@ global $wppa_done;
3128	else {
3129	$comment = balanceTags( $comment );
3130	}
3131	- $save_comment = str_replace( "\n", '<br />', $comment ); // Resque newline chars
3132	$save_comment = stripslashes( $save_comment );
3133
3134	$policy = wppa_opt( 'moderate_comment' );
	@@ -4166,7 +4170,9 @@ global $cover_count_key;
4166	wppa_out( '</div>' );
4167
4168	// Activate nicescroll
4169	- ~~wppa_js(~~ ~~'jQuery~~(~~document).ready(function(){jQuery(".albumlist").niceScroll(".wppa-nicewrap",{'~~ . ~~wppa_opt( 'nicescroll_opts'~~ ) ~~. '});});' );~~


4170	}
4171	}
4172
	@@ -5758,9 +5764,9 @@ function wppa_get_lbtitle( $type, $id ) {
5758	$result .= wppa_get_photo_name( $id, array( 'addowner' => wppa_switch( 'ovl_add_owner' ), 'showname' => wppa_switch( 'ovl_name' ) ) );
5759	}
5760	}
5761	- if ( $do_name && $do_desc ) $result .= '<br />';
5762	if ( $do_desc ) $result .= wppa_get_photo_desc( $thumb['id'] );
5763	- if ( ( $do_name \|\| $do_desc ) && $do_sm ) $result .= '<br />';
5764
5765	if ( $do_rating ) {
5766	if ( wppa_opt( 'rating_max' ) != '1' && wppa_opt( 'rating_display_type' ) == 'graphic' ) {


3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	+ * Version 8.1.05.001
7	*
8	*/
9

1910	$alb_clause = " AND album IN ( ". str_replace( '.', ',', wppa_expand_enum( wppa( 'start_album' ) ) ) ." ) ";
1911	}
1912	else {
1913	+ $alb_clause = " AND album > 0 ";
1914	}
1915	switch ( wppa( 'calendar' ) ) {
1916	case 'exifdtm':

2753	}
2754
2755	// Find image url
2756	+ /* if ( wppa( 'in_widget' ) \|\| wppa_opt( 'slideonly_widget_linktype' ) == 'lightbox' && ! wppa_is_stereo( $id ) ) {
2757	+ $photourl = wppa_get_hires_url( $id );
2758	+ }
2759	+ else */
2760	if ( wppa_switch( 'fotomoto_on' ) && ! wppa_is_stereo( $id ) ) {
2761	$photourl = wppa_get_hires_url( $id );
2762	$photourl = str_replace( '.pdf', '.jpg', $photourl );

3024
3025	// Remove extra space created by other filters like wpautop
3026	if ( wppa_switch( 'allow_foreign_shortcodes' ) && wppa_switch( 'clean_pbr' ) ) {
3027	+ $desc = str_replace( array( "<p>", "</p>", "<br>", "<br/>", "<br>" ), " ", $desc );
3028	}
3029	}
3030

3132	else {
3133	$comment = balanceTags( $comment );
3134	}
3135	+ $save_comment = str_replace( "\n", '<br>', $comment ); // Resque newline chars
3136	$save_comment = stripslashes( $save_comment );
3137
3138	$policy = wppa_opt( 'moderate_comment' );

4170	wppa_out( '</div>' );
4171
4172	// Activate nicescroll
4173	+ if ( $nice ) {
4174	+ wppa_js( 'jQuery(document).ready(function(){jQuery(".albumlist").niceScroll(".wppa-nicewrap",{' . wppa_opt( 'nicescroll_opts' ) . '});});' );
4175	+ }
4176	}
4177	}
4178

5764	$result .= wppa_get_photo_name( $id, array( 'addowner' => wppa_switch( 'ovl_add_owner' ), 'showname' => wppa_switch( 'ovl_name' ) ) );
5765	}
5766	}
5767	+ if ( $do_name && $do_desc ) $result .= '<br>';
5768	if ( $do_desc ) $result .= wppa_get_photo_desc( $thumb['id'] );
5769	+ if ( ( $do_name \|\| $do_desc ) && $do_sm ) $result .= '<br>';
5770
5771	if ( $do_rating ) {
5772	if ( wppa_opt( 'rating_max' ) != '1' && wppa_opt( 'rating_display_type' ) == 'graphic' ) {

wppa-help.php CHANGED Viewed

	@@ -3,8 +3,8 @@
3	* Pachkage: wp-photo-album-plus
4	*
5	* admin help page
6	- * version 7.2.00
7	- */
8
9	function _wppa_page_help() {
10	global $wppa_revno;
	@@ -17,18 +17,18 @@ global $wppa_revno;
17
18	<h3><?php _e('About and credits', 'wp-photo-album-plus'); ?></h3>
19	<p>
20	- <?php _e('WP Photo Album Plus is extended with many new features and is maintained by J.N. Breetvelt, a.k.a. OpaJaap', 'wp-photo-album-plus'); ?><br />
21	- <?php _e('Thanx to R.J. Kaplan for WP Photo Album 1.5.1.', 'wp-photo-album-plus'); ?><br />
22	- <?php _e('Thanx to E.S. Rosenberg for programming tips on security issues.', 'wp-photo-album-plus'); ?><br />
23	- <?php _e('Thanx to Pavel Šorejs for the Numbar code.', 'wp-photo-album-plus'); ?><br />
24	<?php _e('Thanx to the users who reported bugs and asked for enhancements. Without them WPPA should not have been what it is now!', 'wp-photo-album-plus'); ?>
25	</p>
26	-
27	<h3><?php _e('Licence', 'wp-photo-album-plus'); ?></h3>
28	<p>
29	<?php _e('WP Photo Album is released under the', 'wp-photo-album-plus'); ?> <a href="http://www.gnu.org/licenses/gpl-2.0.html">GPLv2 or later</a> <?php _e('licence.', 'wp-photo-album-plus'); ?>
30	</p>
31	-
32	</div>
33	<?php
34	}


3	* Pachkage: wp-photo-album-plus
4	*
5	* admin help page
6	+ * version 8.1.05.001
7	+ */
8
9	function _wppa_page_help() {
10	global $wppa_revno;

17
18	<h3><?php _e('About and credits', 'wp-photo-album-plus'); ?></h3>
19	<p>
20	+ <?php _e('WP Photo Album Plus is extended with many new features and is maintained by J.N. Breetvelt, a.k.a. OpaJaap', 'wp-photo-album-plus'); ?><br>
21	+ <?php _e('Thanx to R.J. Kaplan for WP Photo Album 1.5.1.', 'wp-photo-album-plus'); ?><br>
22	+ <?php _e('Thanx to E.S. Rosenberg for programming tips on security issues.', 'wp-photo-album-plus'); ?><br>
23	+ <?php _e('Thanx to Pavel Šorejs for the Numbar code.', 'wp-photo-album-plus'); ?><br>
24	<?php _e('Thanx to the users who reported bugs and asked for enhancements. Without them WPPA should not have been what it is now!', 'wp-photo-album-plus'); ?>
25	</p>
26	+
27	<h3><?php _e('Licence', 'wp-photo-album-plus'); ?></h3>
28	<p>
29	<?php _e('WP Photo Album is released under the', 'wp-photo-album-plus'); ?> <a href="http://www.gnu.org/licenses/gpl-2.0.html">GPLv2 or later</a> <?php _e('licence.', 'wp-photo-album-plus'); ?>
30	</p>
31	+
32	</div>
33	<?php
34	}

wppa-import.php CHANGED Viewed

@@ -3,7 +3,7 @@
             * Package: wp-photo-album-plus
+            *
             * Contains all the import pages and functions
-            -
            * Version 8.1.01.004
+            *
             */
@@ -136,7 +136,7 @@ global $wppa_session;
             	if ( wppa_get( 'import-submit' ) ) {
             		if ( wppa( 'ajax' ) ) {
             			if ( ! wp_verify_nonce( wppa_get( 'update-check' ), '$wppa_nonce' ) ) {
-            -
            				echo 'Security check failure';
             				wppa_exit();
+            			}
+            		}
@@ -164,32 +164,27 @@ global $wppa_session;
             	if ( wppa( 'ajax' ) ) {
             		if ( wppa( 'ajax_import_files_done' ) ) {
-            -
            			echo '<span style="color:green" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Done!', 'wp-photo-album-plus' ) . '</span>';
+            		}
             		elseif ( wppa( 'ajax_import_files_error' ) ) {
-            -
            			echo '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . wppa( 'ajax_import_files_error' ) . '</span>';
+            		}
             		else {
-            -
            			echo '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Failed!', 'wp-photo-album-plus' ) . '</span>';
+            		}
             		wppa_exit();
+            	}
             	// Open the Form
-            -
            	echo
-            -
            	'<div class="wrap">' .
-            -
            		'<h2>' .
-            -
            			__( 'Import Photos', 'wp-photo-album-plus') .
-            -
            		'</h2>';
             		// See if our depot dir has been created
             		if ( ! wppa_is_dir( WPPA_DEPOT_PATH ) ) {
             			wppa_error_message( sprintf(
-            -
            			__( 'Your depot directory <b>%s</b> could not be created.<br />Please create it yourself using a ftp program and make sure the filesystem rights are set to 0755',
             			'wp-photo-album-plus' ), WPPA_DEPOT_PATH ) );
+            		}
-            -
            $can_remote = true;
             		// Get this users current source type setting ( local/remote )
             		$source_type = wppa_get_option( 'wppa_import_source_type_'.$user, 'local' );
@@ -253,155 +248,131 @@ $can_remote = true;
+            		}
             	// The form
-            -
            	echo
-            -
            	'<form' .
-            -
            		' id="wppa-import-form"' .
-            -
            		' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"' .
-            -
            		' method="post"' .
-            -
            		' >';
             		// Admin and superuser can change import source, other users only if change source not is restricted
             		if ( wppa_user_is( 'administrator' ) || ! wppa_switch( 'chgsrc_is_restricted' ) ) {
             			// Local / Remote
-            -
            			echo
-            -
            			'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
             				wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
-            -
            				__( 'Select Local or Remote', 'wp-photo-album-plus' ) .
-            -
            				( $disabled = $can_remote ? '' : 'disabled="disabled"' ) .
-            -
            				'<select' .
-            -
            					' name="wppa-local-remote"' .
-            -
            					' onchange="jQuery(\'#rem-rem-0\').show();jQuery(\'#wppa-import-set-source\').trigger(\'click\');"' .
-            -
            					' >' .
-            -
            					'<option value="local" ' . ( $source_type == 'local' ? 'selected="selected"' : '' ) . '>' . __( 'Local', 'wp-photo-album-plus') . '</option>' .
-            -
            					'<option value="remote" ' . $disabled . ( $source_type == 'remote' ? 'selected="selected"' : '' ) . '>' . __( 'Remote' ,'wp-photo-album-plus' ) . '</option>' .
-            -
            				'</select>' .
-            -
            				'<span id="rem-rem-0" style="display:none;" >' .
-            -
            					' ' . __( 'Working, please wait...', 'wp-photo-album-plus') .
-            -
            				'</span>';
-            -
-            -
            				if ( $can_remote ) {
-            -
-            -
            					echo
-            -
            						'<input' .
-            -
            							' id="wppa-import-set-source"' .
-            -
            							' type="submit"' .
-            -
            							' class="button-secundary"' .
-            -
            							' name="wppa-import-set-source"' .
-            -
            //							' value="' . __( 'Set Local/Remote' ,'wp-photo-album-plus') . '"' .
-            -
            							' style="display:none;"' .
-            -
            						'/>';
-            -
-            -
            				}
-            -
            				else {
-            -
            					if ( ! ini_get( 'allow_url_fopen' ) ) {
-            -
            						_e( 'The server does not allow you to import from remote locations. ( The php directive allow_url_fopen is not set to 1 )', 'wp-photo-album-plus' );
-            -
            					}
-            -
            					if ( ! function_exists( 'curl_init' ) ) {
-            -
            						_e( 'The server does not allow you to import from remote locations. ( The curl functions are not set up )', 'wp-photo-album-plus' );
-            -
            					}
-            -
            				}
-            -
            			echo
-            -
            			'</div>';
             			// Source dir / url
-            -
            			echo
-            -
            			'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
             				wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
-            -
            				__( 'Import photos from:' ,'wp-photo-album-plus');
             				// Local: dir
             				if ( $source_type == 'local' ) {
             					wppa_update_option( 'wppa_import_root', ABSPATH . basename( content_url() ) ); // Provider may have changed disk
-            -
            					echo
-            -
            					'<select' .
-            -
            					' name="wppa-source"' .
-            -
            					' onchange="jQuery(\'#rem-rem\').show();jQuery(\'#wppa-import-set-source-dir\').trigger(\'click\');"' .
-            -
            					' >' .
-            -
            						wppa_abs_walktree( wppa_opt( 'import_root' ), $source ) .
-            -
            					'</select>' .
-            -
-            -
            					'<input' .
-            -
            						' id="wppa-import-set-source-dir"' .
-            -
            						' type="submit"' .
-            -
            						' class="button-secundary"' .
-            -
            						' name="wppa-import-set-source-dir"' .
-            -
            //						' value="' . __( 'Set source directory', 'wp-photo-album-plus') . '"' .
-            -
            						' style="display:none;"' .
-            -
            					' />' .
-            -
            					'<span id="rem-rem" style="display:none;" >' .
-            -
            						' ' . __( 'Working, please wait...', 'wp-photo-album-plus') .
-            -
            					'</span>';
-            -
+            				}
             				// Remote: url
             				else {
             					if ( wppa_is_mobile() ) {
-            -
            						echo
-            -
            						'<br />' .
-            -
            						'<input' .
-            -
            							' type="text"' .
-            -
            							' style="width:100%"' .
-            -
            							' name="wppa-source-remote"' .
-            -
            							' value="' . $source . '"' .
-            -
            							' onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"' .
-            -
            						' />' .
-            -
            						'<br />';
+            					}
             					else {
-            -
            						echo
-            -
            						'<input' .
-            -
            							' type="text"' .
-            -
            							' style="width:50%"' .
-            -
            							' name="wppa-source-remote"' .
-            -
            							' value="' . $source . '"' .
-            -
            							' onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"' .
-            -
            						' />';
+            					}
-            -
            					echo
-            -
            					__( 'Max:', 'wp-photo-album-plus' ) .
-            -
            					'<input' .
-            -
            						' type="text"' .
-            -
            						' style="width:50px;"' .
-            -
            						' name="wppa-import-remote-max"' .
-            -
            						' value="' . $remote_max . '"' .
-            -
            						' onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"' .
-            -
            					' />' .
-            -
-            -
            					'<input' .
-            -
            						' id="wppa-import-set-source-url"' .
-            -
            						' type="submit"' .
-            -
            						' onclick="jQuery( \'#rem-rem\' ).css( \'display\',\'inline\' ); return true;"' .
-            -
            						' class="button-secundary"' .
-            -
            						' name="wppa-import-set-source-url"' .
-            -
            //						' value="' . __( 'Find remote photos', 'wp-photo-album-plus' ) . '"' .
-            -
            						' style="display:none;"' .
-            -
            					' />' .
-            -
            					'<span id="rem-rem" style="display:none;" >' .
-            -
            						' ' . __( 'Working, please wait...', 'wp-photo-album-plus') .
-            -
            					'</span>' .
-            -
-            -
            					'<br />' .
-            -
            					__( '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' );
+            				}
-            -
            			echo
-            -
            			'</div>';
+            		}
-            -
            	echo
-            -
            	'</form>';
             	// check if albums exist or will be made before allowing upload
             	if ( ! wppa_has_albums() && ! $albumcount && ! $dircount && ! $csvcount ) {
             		$url = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu' );
-            -
            		echo
-            -
            		'<p>' .
-            -
            			__( 'No albums exist. You must', 'wp-photo-album-plus' ) . ' ' .
-            -
            			'<a href="' . $url . '" >' .
-            -
            				__( 'create one', 'wp-photo-album-plus' ) . ' ' .
-            -
            			'</a> ' .
-            -
            			__( 'before you can import your photos.', 'wp-photo-album-plus' ) .
-            -
            		'</p>';
             		return;
+            	}
@@ -409,89 +380,76 @@ $can_remote = true;
             	if ( $photocount || $albumcount || $zipcount || $dircount || $videocount || $audiocount || $csvcount || $documentcount ) {
             		// Open the form
-            -
            		echo
-            -
            		'<form' .
-            -
            			' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"' .
-            -
            			' method="post"' .
-            -
            			' >' .
-            -
            			wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false );
-            -
-            -
            			echo '
-            -
            				<script>
-            -
            					function wppaGoEdit(albId) {
-            -
            						if ( ! albId ) {
-            -
            							alert("No album specified");
-            -
            						}
-            -
            						else {
-            -
            							alert("Connecting to album #" + albId);
-            -
            							document.location = "' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu&tab=edit&edit-id="+albId+"&wppa-nonce=' . wp_create_nonce( 'wppa-nonce', 'wppa-nonce' ), 'js' ) . '";
-            -
            						}
-            -
            					}
-            -
            				</script>';
             			// Display the zips
             			if ( PHP_VERSION_ID >= 50207 && $zipcount > '0' ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d zipfile in the depot', 'There are %d zipfiles in the depot', $zipcount, 'wp-photo-album-plus' ), $zipcount ) .
-            -
            					'</b></p>' .
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-zip"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-zip\', \'.wppa-zip\' )"' .
-            -
            									' />' .
-            -
            									'<b>&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus' ) .
-            -
            									'</b>' .
-            -
            								'</td>';
             								if ( $is_sub_depot ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-z"' .
-            -
            											' name="del-after-z"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>&nbsp;&nbsp;' .
-            -
            										__( 'Delete after successful extraction.', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
-            -
            							echo
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>' .
-            -
            					'<table' .
-            -
            						' class="form-table wppa-table widefat"' .
-            -
            						' style="margin-top:0;"' .
-            -
            						' >' .
-            -
            						'<tr>';
             							$ct = 0;
             							$idx = '0';
             							foreach ( $files as $file ) {
             								$ext = wppa_get_ext( $file );
             								if ( $ext == 'zip' ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' class="wppa-zip"' .
-            -
            											' checked="checked"' .
-            -
            										' />&nbsp;&nbsp;' .
-            -
            										htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) .
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo( '</tr><tr>' );
             										$ct = 0;
+            									}
             									else {
@@ -500,75 +458,77 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            							echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Dispay the albums ( .amf files )
             			if ( $albumcount ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d albumdefinition in the depot', 'There are %d albumdefinitions in the depot', $albumcount, 'wp-photo-album-plus' ), $albumcount ) .
-            -
            					'</b></p>' .
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-amf"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-amf\', \'.wppa-amf\' )"' .
-            -
            									' />' .
-            -
            									'<b>&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus' ) .
-            -
            									'</b>' .
-            -
            								'</td>';
             								if ( $is_sub_depot ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-a"' .
-            -
            											' name="del-after-a"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>&nbsp;&nbsp;' .
-            -
            											__( 'Remove from depot after successful import, or if the album already exists.', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
-            -
            							echo
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>' .
-            -
            					'<table' .
-            -
            						' class="form-table wppa-table widefat"' .
-            -
            						' style="margin-top:0;"' .
-            -
            						' >' .
-            -
            						'<tr>';
             							$ct = 0;
             							$idx = '0';
             							foreach ( $files as $file ) {
             								$ext = wppa_get_ext( $file );
             								if ( $ext == 'amf' ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' class="wppa-amf"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										sanitize_text_field( basename( $file ) . '&nbsp;' .  wppa_get_meta_name( $file, '( ' ) ) .
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo( '</tr><tr>' );
             										$ct = 0;
+            									}
             									else {
@@ -577,41 +537,39 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            						echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the single photos
             			if ( $photocount ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
-            -
-            -
            					// Display the number of photos
-            -
            					'<p><b>';
             						// Local
             						if ( $source_type == 'local' ) {
             							if ( $is_ngg ) {
-            -
            								echo '<br /><b>' . sprintf( _n( 'There is %d photo in the ngg gallery', 'There are %d photos in the ngg gallery', $photocount, 'wp-photo-album-plus' ), $photocount ) . '</b>';
+            							}
             							else {
-            -
            								echo '<br /><b>' . sprintf( _n( 'There is %d photo in the depot', 'There are %d photos in the depot', $photocount, 'wp-photo-album-plus' ), $photocount ) . '</b>';
+            							}
+            						}
             						// Remote
             						else {
-            -
            							printf( _n( 'There is %d possible photo found remote', 'There are %d possible photos found remote', $photocount, 'wp-photo-album-plus' ), $photocount );
+            						}
-            -
            					echo
-            -
            					'</b></p>';
             					// The album selection
-            -
            					echo
-            -
            					'<p class="hideifupdate" >' .
             						__( 'Default album for import:', 'wp-photo-album-plus') .
             							wppa_album_select_a( array( 	'path' 				=> true,
             															'selected' 			=> wppa_get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' ),
@@ -628,187 +586,185 @@ $can_remote = true;
             															'tagstyle' 			=> '',
             														) ) .
             						wppa_edit_album_link_button( 'wppa-photo-album' ) .
-            -
            						__( 'Photos that have (<em>name</em>)[<em>album</em>] will be imported by that <em>name</em> in that <em>album</em>.', 'wp-photo-album-plus') .
-            -
            					'</p>';
-            -
-            -
            					echo '<p>';
-            -
-            -
            					// Watermark
-            -
            					if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
-            -
            						echo
-            -
            						__( 'Apply watermark file:', 'wp-photo-album-plus') .
-            -
            						'<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
-            -
            							wppa_watermark_file_select( 'user' ) .
-            -
            						'</select>' .
-            -
            						__( 'Position:', 'wp-photo-album-plus') .
-            -
            						'<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
-            -
            							wppa_watermark_pos_select( 'user' ) .
-            -
            						'</select>';
-            -
            					}
-            -
-            -
            					// Delay
-            -
            					$delays = array( '0', '1', '2', '5', '10', '20', '50', '100' );
-            -
            					echo
-            -
            					__( 'Delay', 'wp-photo-album-plus' ) .
-            -
            					'<select id="wppa-delay" >';
-            -
            					foreach ( $delays as $d ) {
-            -
            						echo '<option value="' . ( $d * 1000 ) . '" ' . ( $d == '1' ? 'selected="selected" ' : '' ) . '>' . $d . '</option>';
-            -
            					}
-            -
            					echo
-            -
            					'</select> s. ' .
-            -
            					'<img' .
-            -
            						' id="wppa-spinner"' .
-            -
            						' src="' . wppa_get_imgdir( 'spinner.gif' ) . '"' .
-            -
            						' style="vertical-align:middle;display:none;"' .
-            -
            					' />';
-            -
            					echo '</p>';
             					// Header of photo list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-pho"' .
-            -
            										( $is_sub_depot ? 'checked="checked"' : '' ) .
-            -
            										' onchange="checkAll( \'all-pho\', \'.wppa-pho\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>';
             								// Depot specific switches
             								if ( $is_sub_depot ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-p"' .
-            -
            											' name="del-after-p"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            									'</td>' .
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-f"' .
-            -
            											' name="del-after-f"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Remove from depot after failed import.', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
             								// Nextgen import specific switches
             								if ( $is_ngg ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="cre-album"' .
-            -
            											' name="cre-album"' .
-            -
            											' checked="checked"' .
-            -
            											' value="' . esc_attr( basename( $source ) ) .'"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Import into album', 'wp-photo-album-plus' ) . ' ' . basename( $source ) .
-            -
            										'</b>' .
-            -
            										'<small>' .
-            -
            											__( 'The album will be created if it does not exist', 'wp-photo-album-plus') .
-            -
            										'</small>' .
-            -
            									'</td>' .
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="use-backup"' .
-            -
            											' name="use-backup"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Use backup if available', 'wp-photo-album-plus') .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
             								// Update existing switch
-            -
            								echo
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="wppa-update"' .
-            -
            										' onchange="impUpd( this, \'#submit\' )"' .
-            -
            										' name="wppa-update"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Update existing photos', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>';
             								// Void dups switch
-            -
            								echo '<td>';
             								if ( wppa_switch( 'void_dups' ) ) {
-            -
            									echo
-            -
            									'<input' .
-            -
            										' type="hidden"' .
-            -
            										' id="wppa-nodups"' .
-            -
            										' name="wppa-nodups"' .
-            -
            										' value="1"' .
-            -
            									' />';
+            								}
             								else {
-            -
            									echo
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="wppa-nodups"' .
-            -
            										' name="wppa-nodups"' .
-            -
            										' checked="checked"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Do not create duplicates', 'wp-photo-album-plus' ) .
-            -
            									'</b>';
+            								}
-            -
            								echo '</td>';
             								// Import preview zoomable switch
             								if ( wppa_switch( 'import_preview' ) ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="wppa-zoom"' .
-            -
            											' onclick="wppa_setCookie(\'zoompreview\', this.checked, \'365\')"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Zoom previews', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            										'<script type="text/javascript" >if ( wppa_getCookie(\'zoompreview\') == \'true\' ) { jQuery(\'#wppa-zoom\').prop(\'checked\', true) }</script>' .
-            -
            									'</td>';
+            								}
-            -
            							echo
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// Photo list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
-            -
            						'<tr>';
             							$ct = 0;
             							$idx = '0';
             							if ( is_array( $files ) ) foreach ( $files as $file ) {
@@ -821,37 +777,36 @@ $can_remote = true;
             									$meta = false;
+            								}
             								if ( in_array( strtolower($ext), $wppa_supported_photo_extensions ) ) {
-            -
            									echo '
-            -
            									<td id="td-file-' . $idx . '" >' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' title="' . esc_attr( $file ) . '"' .
-            -
            											' class="wppa-pho"' .
-            -
            											( $is_sub_depot ? 'checked="checked"' : '' ) .
-            -
            										' />' .
-            -
            										'<span' .
-            -
            											' id="name-file-' . $idx . '"' .
-            -
            											' >' .
-            -
            											'&nbsp;&nbsp;';
             											if ( wppa( 'is_wppa_tree' ) ) {
             												$t = explode( 'uploads/wppa/', $file );
-            -
            												echo htmlspecialchars( wppa_sanitize_file_name( basename( str_replace( '/', '', $t[1] ) ) ) );
+            											}
             											else {
-            -
            												echo htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) );
+            											}
             											if ( $meta ) {
-            -
            												echo
-            -
            												'&nbsp;' .
             												stripslashes( wppa_get_meta_name( $meta, '( ' ) ) .
-            -
            												stripslashes( wppa_get_meta_album( $meta, '[' ) );
+            											}
-            -
            										echo
-            -
            										'</span>';
             										if ( wppa_switch( 'import_preview' ) ) {
             											if ( wppa( 'is_remote' ) ) {
@@ -868,20 +823,19 @@ $can_remote = true;
             													$img_url = str_replace( 'http://', 'https://', $img_url );
+            												}
+            											}
-            -
            											echo
-            -
            											'<img src="' . esc_url( $img_url ) . '"' .
-            -
            												' alt="' . esc_attr( __( 'n.a.', 'wp-photo-album-plus' ) ) . '"' .
-            -
            												' style="max-height:48px;"' .
-            -
            												' onmouseover="if (jQuery(\'#wppa-zoom\').prop(\'checked\')) jQuery(this).css(\'max-height\', \'144px\')"' .
-            -
            												' onmouseout="if (jQuery(\'#wppa-zoom\').prop(\'checked\')) jQuery(this).css(\'max-height\', \'48px\')"' .
-            -
            											' />';
+            										}
-            -
            									echo
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo( '</tr><tr>' );
             										$ct = 0;
+            									}
             									else {
@@ -890,26 +844,28 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            						echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the videos
             			if ( $videocount && wppa_switch( 'enable_video' ) ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
             					// Display available files
-            -
            					echo
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d video in the depot', 'There are %d videos in the depot', $videocount, 'wp-photo-album-plus' ), $videocount ) .
-            -
            					'</b></p>';
             					// Album to import to
-            -
            					echo
-            -
            					'<p class="hideifupdate" >' .
             						__( 'Album to import to:', 'wp-photo-album-plus') .
             							wppa_album_select_a( array( 	'path' 				=> true,
             															'selected' 			=> wppa_get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' ),
@@ -926,77 +882,77 @@ $can_remote = true;
             															'tagstyle' 			=> '',
             														) ) .
             							wppa_edit_album_link_button( 'wppa-video-album' ) .
-            -
            					'</p>';
             					// Header of video list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-video"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-video\', \'.wppa-video\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>';
             								if ( $is_sub_depot ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-v"' .
-            -
            											' name="del-after-v"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
-            -
            											' <small>' .
-            -
            												__( 'Files larger than 64MB will always be removed after successful import.', 'wp-photo-album-plus' ) .
-            -
            											'</small>' .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
-            -
            							echo
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// Video list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
-            -
            						'<tr>';
             							$ct = 0;
             							$idx = '0';
             							if ( is_array( $files ) ) foreach ( $files as $file ) {
             								$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
             								if ( in_array( strtolower($ext), $wppa_supported_video_extensions ) ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' title="' . esc_attr( htmlspecialchars( $file ) ) . '"' .
-            -
            											' class="wppa-video"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<span' .
-            -
            											' id="name-file-' . $idx . '"' .
-            -
            											' >' .
-            -
            											'&nbsp;&nbsp;' .
             											htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) .
-            -
            											' (' . sprintf( '%3.1f', wppa_filesize( $file ) / 1024 ) . ' kb)' .
-            -
            										'</span>' .
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo( '</tr><tr>' );
             										$ct = 0;
+            									}
             									else {
@@ -1005,26 +961,28 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            						echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the audios
             			if ( $audiocount && wppa_switch( 'enable_audio' ) ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
             					// Display available files
-            -
            					echo
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d audio in the depot', 'There are %d audios in the depot', $audiocount, 'wp-photo-album-plus' ), $audiocount ) .
-            -
            					'</b></p>';
             					// Album to import to
-            -
            					echo
-            -
            					'<p class="hideifupdate" >' .
             						__( 'Album to import to:', 'wp-photo-album-plus') .
             							wppa_album_select_a( array( 	'path' 				=> true,
             															'selected' 			=> wppa_get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' ),
@@ -1040,77 +998,77 @@ $can_remote = true;
             															'multiple' 			=> false,
             															'tagstyle' 			=> '',
             														) ) .
-            -
            							wppa_edit_album_link_button( 'wppa-audio-album' ) .
-            -
            					'</p>';
             					// Header of audio list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-audio"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-audio\', \'.wppa-audio\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>';
             								// The remove box
             								if ( $is_sub_depot ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="del-after-u"' .
-            -
            											' name="del-after-u"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<b>' .
-            -
            											'&nbsp;&nbsp;' .
-            -
            											__( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
-            -
            										'</b>' .
-            -
            									'</td>';
+            								}
-            -
            							echo
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// Audio list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
-            -
            						'<tr>';
             							$ct = 0;
             							$idx = '0';
             							if ( is_array( $files ) ) foreach ( $files as $file ) {
             								$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
             								if ( in_array( strtolower($ext), $wppa_supported_audio_extensions ) ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' title="' . esc_attr( htmlspecialchars( $file ) ) . '"' .
-            -
            											' class="wppa-audio"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'<span' .
-            -
            											' id="name-file-' . $idx . '"' .
-            -
            											' >' .
-            -
            											'&nbsp;&nbsp;' .
             											htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) .
-            -
            											' (' . sprintf( '%3.1f', wppa_filesize( $file ) / 1024 ) . ' kb)' .
-            -
            										'</span>' .
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo '</tr><tr>';
             										$ct = 0;
+            									}
             									else {
@@ -1119,103 +1077,103 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            						echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the csv files
             			if ( $is_depot && $csvcount ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
             					// Display number of files
-            -
            					echo
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d .csv file in the depot', 'There are %d .csv files in the depot', $csvcount, 'wp-photo-album-plus' ), $csvcount ) .
-            -
            					'</b></p>';
             					// Header of .csv file list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-csv"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-csv\', \'.wppa-csv\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="del-after-c"' .
-            -
            										' name="del-after-c"' .
-            -
            										' checked="checked"' .
-            -
            										' disabled="disabled"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            									'&nbsp;&nbsp;' .
-            -
            									__( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
-            -
            									'</b>' .
-            -
            								'</td>' .
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// CSV file list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >';
             						$ct = 0;
             						$idx = '0';
             						if ( is_array( $files ) ) foreach( $files as $csv ) {
             							if ( wppa_is_file( $csv ) && strtolower( wppa_get_ext( $csv ) ) == 'csv' ) {
-            -
            								echo
-            -
            								'<tr>' .
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' class="wppa-csv"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										'<b>' .
             											wppa_sanitize_file_name( basename( $csv ) ) .
-            -
            											' (' . sprintf( '%3.1f', wppa_filesize( $csv ) / 1024 ) . ' kb)' .
-            -
            										'</b>' .
-            -
            									'</td>' .
-            -
            								'</tr>';
+            							}
             							$idx++;
+            						}
-            -
            					echo
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the document files
             			if ( $is_depot && $documentcount ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
             					// Display number of files
-            -
            					echo
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d document file in the depot', 'There are %d document files in the depot', $documentcount, 'wp-photo-album-plus' ), $documentcount ) .
-            -
            					'</b></p>';
             					// Album to import to
-            -
            					echo
-            -
            					'<p class="hideifupdate" >' .
             						__( 'Album to import to:', 'wp-photo-album-plus') .
             							wppa_album_select_a( array( 	'path' 				=> true,
             															'selected' 			=> wppa_get_option( 'wppa-document-album-import-'.wppa_get_user(), '0' ),
@@ -1231,71 +1189,71 @@ $can_remote = true;
             															'multiple' 			=> false,
             															'tagstyle' 			=> '',
             														) ) .
-            -
            							wppa_edit_album_link_button( 'wppa-document-album' ) .
-            -
            					'</p>';
             					// Header of .pdf file list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-pdf"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-pdf\', \'.wppa-pdf\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="del-after-d"' .
-            -
            										' name="del-after-d"' .
-            -
            										' checked="checked"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            									'&nbsp;&nbsp;' .
-            -
            									__( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
-            -
            									'</b>' .
-            -
            								'</td>' .
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// pdf file list
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            						<tr>';
             							$ct = 0;
             							$idx = '0';
             							if ( is_array( $files ) ) foreach( $files as $pdf ) {
             								if ( wppa_is_file( $pdf ) && strtolower( wppa_get_ext( $pdf ) ) == 'pdf' ) {
-            -
            									echo
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx . '"' .
-            -
            											' title="' . esc_attr( $pdf ) . '"' .
-            -
            											' class="wppa-pdf"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										'<span' .
-            -
            											' id="name-file-' . $idx . '"' .
-            -
            											' >' .
-            -
            											'&nbsp;&nbsp;' .
             											wppa_sanitize_file_name( basename( $pdf ) ) .
-            -
            											' (' . sprintf( '%3.1f', wppa_filesize( $pdf ) / 1024 ) . ' kb)' .
-            -
            										'</span>' .
-            -
            									'</td>';
             									if ( $ct == 3 ) {
-            -
            										echo '</tr><tr>';
             										$ct = 0;
+            									}
             									else {
@@ -1304,343 +1262,355 @@ $can_remote = true;
+            								}
             								$idx++;
+            							}
-            -
            						echo
-            -
            						'</tr>' .
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
             			// Display the directories to be imported as albums. Do this in the depot only!!
             			if ( $is_depot && $dircount ) {
-            -
            				echo
-            -
            				'<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
             					// Display number of dirs
-            -
            					echo
-            -
            					'<p><b>' .
-            -
            						sprintf( _n( 'There is %d albumdirectory in the depot', 'There are %d albumdirectories in the depot', $dircount, 'wp-photo-album-plus' ), $dircount ) .
-            -
            					'</b></p>';
             					// Header of dirlist
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
-            -
            						'<thead>' .
-            -
            							'<tr>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="all-dir"' .
-            -
            										' checked="checked"' .
-            -
            										' onchange="checkAll( \'all-dir\', \'.wppa-dir\' )"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Check/uncheck all', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            								'</td>' .
-            -
            								'<td>' .
-            -
            									'<input' .
-            -
            										' type="checkbox"' .
-            -
            										' id="del-dir"' .
-            -
            										' name="del-dir"' .
-            -
            										' onchange="wppa_setCookie(\'removeemptydirs\', this.checked, \'365\')"' .
-            -
            									' />' .
-            -
            									'<b>' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										__( 'Remove empty dirs', 'wp-photo-album-plus') .
-            -
            									'</b>' .
-            -
            									'<script type="text/javascript" >if ( wppa_getCookie(\'removeemptydirs\') == \'true\' ) { jQuery(\'#del-dir\').prop(\'checked\', true) }</script>' .
-            -
            								'</td>' .
-            -
            							'</tr>' .
-            -
            						'</thead>' .
-            -
            					'</table>';
             					// Dirlist
-            -
            					echo
-            -
            					'<table class="form-table wppa-table widefat" style="margin-top:0;" >';
             						$ct = 0;
             						$idx = '0';
             						foreach( $files as $dir ) {
             							if ( basename( $dir ) != '.' &&
             								 basename( $dir ) != '..' &&
             								 wppa_is_dir( $dir ) ) {
-            -
            								echo
-            -
            								'<tr>' .
-            -
            									'<td>' .
-            -
            										'<input' .
-            -
            											' type="checkbox"' .
-            -
            											' id="file-' . $idx . '"' .
-            -
            											' name="file-' . $idx .'"' .
-            -
            											' class= "wppa-dir"' .
-            -
            											' checked="checked"' .
-            -
            										' />' .
-            -
            										'&nbsp;&nbsp;' .
-            -
            										'<b>' .
-            -
            											htmlspecialchars( wppa_sanitize_file_name( basename( $dir ) ) ) .
-            -
            										'</b>';
             										$subdirs 		= wppa_glob( $dir.'/*', WPPA_ONLYDIRS );
             										$subfiles 		= wppa_glob( $dir.'/*', WPPA_ONLYFILES );
             										$subdircount 	= count( $subdirs );
             										$subfilecount 	= count( $subfiles );
-            -
            										/*
-            -
            										if ( $subfiles ) {
-            -
            											foreach ( $subfiles as $subfile ) {
-            -
            												if ( wppa_is_dir( $subfile ) && basename( $subfile ) != '.' && basename( $subfile ) != '..' ) {
-            -
            													$subdircount++;
-            -
            												}
-            -
            											}
-            -
            										}
-            -
            										*/
-            -
            										//$sfcount = $subdircount ? wppa_get_photocount( $subfiles ) : '0';
-            -
            										echo ' ' .
-            -
            										sprintf( _n( 'Contains %d file', 'Contains %d files', $subfilecount, 'wp-photo-album-plus' ), $subfilecount );
             										if ( $subdircount ) {
-            -
            											echo ' ' .
-            -
            											sprintf( _n( 'and %d subdirectory', 'and %d subdirectories', $subdircount, 'wp-photo-album-plus' ), $subdircount );
+            										}
-            -
            									'</td>' .
-            -
            								'</tr>';
+            							}
             							$idx++;
+            						}
-            -
            					echo
-            -
            					'</table>' .
-            -
            				'</div>';
+            			}
-            -
            			// The submit button
-            -
            			?>
-            -
            			<p>
-            -
            				<script type="text/javascript" >
-            -
            					function wppaVfyAlbum() {
-            -
            						var csvs = jQuery( '.wppa-csv' );
-            -
            						if ( ! jQuery( '#wppa-update' ).prop( 'checked' ) ) {
-            -
            							if ( 	! parseInt( jQuery( '#wppa-photo-album' ).val() ) &&
-            -
            									! parseInt( jQuery( '#wppa-video-album' ).val() ) &&
-            -
            									! parseInt( jQuery( '#wppa-audio-album' ).val() ) &&
-            -
            									! parseInt( jQuery( '#wppa-document-album' ).val() ) &&
-            -
            									csvs.length == 0
-            -
            								) {
-            -
            								alert( 'Please select an album first' );
-            -
            								return false;
-            -
            							}
+            						}
-            -
            						return true;
+            					}
-            -
            					function wppaCheckInputVars() {
-            -
            						var checks = jQuery( ':checked' );
-            -
            						var nChecks = checks.length;
-            -
            						var nMax = <?php echo ini_get( 'max_input_vars' ) ?>;
-            -
            						if ( nMax == 0 ) nMax = 100;
-            -
            						if ( nChecks > nMax ) {
-            -
            							alert ( 'There are '+nChecks+' boxes checked or selected, that is more than the maximum allowed number of '+nMax );
-            -
            							return false;
+            						}
-            -
            						var dirs = jQuery( '.wppa-dir' );
-            -
            						var nDirsChecked = 0;
-            -
            						if ( dirs.length > 0 ) {
-            -
            							var i = 0;
-            -
            							while ( i < dirs.length ) {
-            -
            								if ( jQuery( dirs[i] ).prop( 'checked' ) ) {
-            -
            									nDirsChecked++;
-            -
            								}
-            -
            								i++;
+            							}
-            -
            						}
-            -
            						var zips = jQuery( '.wppa-zip' );
-            -
            						var nZipsChecked = 0;
-            -
            						if ( zips.length > 0 ) {
-            -
            							var i = 0;
-            -
            							while ( i < zips.length ) {
-            -
            								if ( jQuery( zips[i] ).prop( 'checked' ) ) {
-            -
            									nZipsChecked++;
-            -
            								}
-            -
            								i++;
+            							}
-            -
            						}
-            -
            						// If no dirs to import checked, there must be an album selected
-            -
            						if ( 0 == nDirsChecked && 0 == nZipsChecked && ! wppaVfyAlbum() ) return false;
-            -
            						return true;
-            -
            					}
-            -
            				</script>
-            -
            				<?php if ( $albumcount || $dircount || $zipcount || $csvcount ) { ?>
-            -
            				<input type="submit" onclick="return wppaCheckInputVars()" class="button-primary" id="submit" name="wppa-import-submit" value="<?php _e( 'Import', 'wp-photo-album-plus' ); ?>" />
-            -
            				<?php } ?>
-            -
            				<script type="text/javascript" >
-            -
            					var wppaImportRuns = false;
-            -
            					var wppaTimer;
-            -
            					function wppaDoAjaxImport() {
-            -
            						jQuery( '#wppa-spinner' ).css( 'display', 'none' );
-            -
-            -
            						var data = '';
-            -
            						data += 'wppa-update-check='+jQuery( '#wppa-update-check' ).val();
-            -
            						data += '&wppa-photo-album='+jQuery( '#wppa-photo-album' ).val();
-            -
            						data += '&wppa-video-album='+jQuery( '#wppa-video-album' ).val();
-            -
            						data += '&wppa-audio-album='+jQuery( '#wppa-audio-album' ).val();
-            -
            						data += '&wppa-document-album='+jQuery( '#wppa-document-album' ).val();
-            -
            						data += '&wppa-watermark-file='+jQuery( '#wppa-watermark-file' ).val();
-            -
            						data += '&wppa-watermark-pos='+jQuery( '#wppa-watermark-pos' ).val();
-            -
            						if ( jQuery( '#cre-album' ).prop( 'checked' ) ) data += '&cre-album='+jQuery( '#cre-album' ).val();
-            -
            						if ( jQuery( '#use-backup' ).prop( 'checked' ) ) data += '&use-backup=1';
-            -
            						if ( jQuery( '#wppa-update' ).prop( 'checked' ) ) data += '&wppa-update=1';
-            -
            						if ( jQuery( '#wppa-nodups' ).prop( 'checked' ) ) data += '&wppa-nodups=1';
-            -
            						if ( jQuery( '#del-after-p' ).prop( 'checked' ) ) data += '&del-after-p=1';
-            -
            						if ( jQuery( '#del-after-f' ).prop( 'checked' ) ) data += '&del-after-f=1';
-            -
            						if ( jQuery( '#del-after-v' ).prop( 'checked' ) ) data += '&del-after-v=1';
-            -
            						if ( jQuery( '#del-after-u' ).prop( 'checked' ) ) data += '&del-after-u=1';
-            -
            						if ( jQuery( '#del-after-d' ).prop( 'checked' ) ) data += '&del-after-d=1';
-            -
            						data += '&wppa-import-submit=ajax';
-            -
-            -
            						var files = jQuery( ':checked' );
-            -
            						var found = false;
-            -
            						var i=0;
-            -
            						var elm;
-            -
            						var fulldata;
-            -
            						for ( i=0; i<files.length; i++ ) {
-            -
            							found = false;	// assume done
-            -
            							elm = files[i];
-            -
            							// Is it a file checkbox?
-            -
            							var temp = elm.id.split( '-' );
-            -
            							if ( temp[0] != 'file' ) continue;	// no
-            -
            							fulldata = data+'&import-ajax-file='+elm.title;
-            -
            							found = true;
-            -
            							break;
-            -
            						}
-            -
            						//	alert( data );
-            -
            						if ( ! found ) {
-            -
            							wppaStopAjaxImport();
-            -
            							return;	// nothing left
-            -
            						}
-            -
            						// found one, do it
-            -
            						var oldhtml=jQuery( '#name-'+elm.id ).html();
-            -
            						var xmlhttp = wppaGetXmlHttp();
-            -
            						xmlhttp.onreadystatechange = function() {
-            -
            							if ( xmlhttp.readyState == 4 ) {
-            -
            								if ( xmlhttp.status!=404 ) {
-            -
            									var resp = xmlhttp.responseText;
-            -
-            -
            									//
-            -
            									if ( resp.length == 0 ) {
-            -
            										jQuery( '#name-'+elm.id ).html('<span style="color:red" >Timeout</span>' );
-            -
            										wppaStopAjaxImport();
-            -
            										return;
-            -
            									}
-            -
            									//
-            -
            									if ( resp.indexOf( 'Server' ) != -1 && resp.indexOf( 'Error' ) != -1 ) {
-            -
            										resp = '<span style="color:red" >Server error</span>';
-            -
            									}
-            -
            									jQuery( '#name-'+elm.id ).html( '&nbsp;&nbsp;<b>'+resp+'</b>' );
-            -
            									elm.checked = '';
-            -
            									if ( jQuery( '#del-after-p' ).prop( 'checked' ) ||
-            -
            										 jQuery( '#del-after-f' ).prop( 'checked' ) ) {
-            -
            										elm.disabled = 'disabled';
-            -
            										elm.title = '';
-            -
            									}
-            -
            									if ( wppaImportRuns ) {
-            -
            										wppaTimer = setTimeout( 'wppaDoAjaxImport()', jQuery( '#wppa-delay' ).val() );	// was 100
-            -
            										jQuery( '#wppa-spinner' ).css( 'display', 'inline' );
-            -
            									}
-            -
            								}
-            -
            								else {
-            -
            									jQuery( '#name-'+elm.id ).html( '&nbsp;&nbsp;<b>Not found</b>' );
-            -
            								}
+            							}
+            						}
-            -
            						var url = wppaAjaxUrl+'?action=wppa&wppa-action=import';
-            -
            						xmlhttp.open( 'POST',url,true );
-            -
            						xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
-            -
            						xmlhttp.send( fulldata );
-            -
            						jQuery( '#name-'+elm.id ).html( '&nbsp;&nbsp;<b style="color:blue" >' + '<?php _e( 'Working...', 'wp-photo-album-plus' ) ?>' + '</b>' );
-            -
            						if ( wppaImportRuns ) {
-            -
            							jQuery( '#wppa-start-ajax' ).css( 'display', 'none' );
-            -
            							jQuery( '#wppa-stop-ajax' ).css( 'display', 'inline' );
+            						}
+            					}
-            -
            					function wppaStopAjaxImport() {
-            -
            						wppaImportRuns = false;
-            -
            						clearTimeout( wppaTimer );
-            -
            						jQuery( '#wppa-start-ajax' ).css( 'display', 'inline' );
-            -
            						jQuery( '#wppa-stop-ajax' ).css( 'display', 'none' );
-            -
            						jQuery( '#wppa-spinner' ).css( 'display', 'none' );
-            -
            					}
-            -
            				</script>
-            -
            				<?php if ( ( $photocount || $videocount || $audiocount || $documentcount ) && ! $albumcount && ! $dircount && ! $zipcount && ! $csvcount ) { ?>
-            -
            				<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' ) ) ?>" />
-            -
            				<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' ) ) ?>" />
-            -
            				<?php } ?>
-            -
            			</p>
-            -
            			</form>
-            -
            		<?php }
-            -
            		else {
-            -
            			if ( $source_type == 'local' ) {
-            -
            				wppa_ok_message( __( 'There are no importable files found in directory:', 'wp-photo-album-plus').' '.$source );
+            			}
-            -
            			else {
-            -
            				wppa_ok_message( __( 'There are no photos found or left to process at url:', 'wp-photo-album-plus').' '.$source_url );
+            			}
-            -
            		}
-            -
            		echo '<br /><b>';
-            -
-            -
            		_e( 'You can import the following file types:', 'wp-photo-album-plus' );
-            -
            		echo '</b><br />';
-            -
            		if ( wppa_get_option( 'wppa_import_source_type_'.$user, 'local' ) == 'remote' ) {
-            -
            			echo '<br />';
-            -
            			_e( 'Photo file types:', 'wp-photo-album-plus' );
-            -
            			echo ' .jpg .jpeg .png';
+            		}
             		else {
-            -
            			if ( PHP_VERSION_ID >= 50207 ) {
-            -
            				echo '<br />';
-            -
            				_e( 'Compressed file types: .zip', 'wp-photo-album-plus' );
-            -
            			}
-            -
            			echo '<br />';
-            -
            			_e( 'Photo file types:', 'wp-photo-album-plus' );
-            -
            			foreach ( $wppa_supported_photo_extensions as $ext ) {
-            -
            				echo ' .'.$ext;
-            -
            			}
-            -
            			if ( wppa_switch( 'enable_video' ) ) {
-            -
            				echo '<br />';
-            -
            				_e( 'Video file types:', 'wp-photo-album-plus' );
-            -
            				foreach ( $wppa_supported_video_extensions as $ext ) {
-            -
            					echo ' .'.$ext;
-            -
            				}
-            -
            			}
-            -
            			if ( wppa_switch( 'enable_audio' ) ) {
-            -
            				echo '<br />';
-            -
            				_e( 'Audio file types:', 'wp-photo-album-plus' );
-            -
            				foreach ( $wppa_supported_audio_extensions as $ext ) {
-            -
            					echo ' .'.$ext;
-            -
            				}
+            			}
-            -
            			if ( in_array( 'pdf', wppa_get_supported_extensions() ) ) {
-            -
            				echo '<br />';
-            -
            				_e( 'Document file type: .pdf', 'wp-photo-album-plus' );
+            			}
-            -
            			echo '<br />';
-            -
            			_e( 'WPPA+ file types: .amf .pmf', 'wp-photo-album-plus' );
-            -
            			echo '<br />';
-            -
            			_e( 'Custom data files of type .csv', 'wp-photo-album-plus' );
-            -
            			echo '<br />';
-            -
            			_e( 'Directories with optional subdirs containig photos', 'wp-photo-album-plus' );
-            -
            			echo '<br /><br />';
-            -
            			_e( 'Your depot directory is:', 'wp-photo-album-plus' );
-            -
            			echo '<b> .../' . WPPA_DEPOT . '/</b>';
+            		}
             	if ( wppa( 'continue' ) ) {
             		wppa_warning_message( __( 'Trying to continue...', 'wp-photo-album-plus') );
-            -
            		echo '<script type="text/javascript" >document.location=\''.get_admin_url().'admin.php?page=wppa_import_photos&continue=1&nonce='.wp_create_nonce( 'dirimport' ).'\';</script>';
+            	}
-            -
            	echo '<br /><br />';
-            -
            	wppa_album_admin_footer();
-            -
            	echo
-            -
            	'</div><!-- .wrap -->';
+            }
@@ -1744,6 +1714,7 @@ global $wppa_session;
             						foreach ( array_keys( $matches[0] ) as $idx ) {
             							if ( $matches[0][$idx] != $val ) {
             								$val = $matches[0][$idx];
             								// Post process found item
             								$match 		= substr( $matches[0][$idx], 5 );
             								$matchpos 	= strpos( $contents, $match );
@@ -2305,7 +2276,7 @@ global $wppa_session;
             				// Make sure the feature is on
             				if ( ! wppa_switch( 'custom_fields' ) ) {
             					wppa_update_option( 'wppa_custom_fields', 'yes' );
-            -
            					echo '<b>' . __( 'Custom datafields enabled', 'wp-photo-album-plus').'</b><br />';
+            				}
             				// Get the captions we already have
@@ -2382,11 +2353,11 @@ global $wppa_session;
+            							}
             							if ( $is_db_table ) {
-            -
            								echo '<b>' . __( 'Processing db table', 'wp-photo-album-plus' ) . ' ' . $is_db_table . '</b><br />';
             								wppa_log( 'dbg', __( 'Processing db table', 'wp-photo-album-plus' ) . ' ' . $is_db_table );
+            							}
             							else {
-            -
            								echo '<b>' . __( 'Processing', 'wp-photo-album-plus' ) . ' ' . basename( $file ) . '</b><br />';
             								wppa_log( 'dbg', __( 'Processing', 'wp-photo-album-plus' ) . ' ' . basename( $file ) );
+            							}
@@ -2414,7 +2385,7 @@ global $wppa_session;
             								return;
+            							}
             							fputs( $write_handle, $header );
-            -
            							echo __( 'Read header:', 'wp-photo-album-plus') . ' ' . $header . '<br />';
             							// Is it a db table?
             							if ( $is_db_table ) {
@@ -2760,7 +2731,7 @@ global $wppa_session;
             											$photos_skipped_csv++;
             											$this_skipped++;
+            										}
-            -
            										echo '.';
+            									}
@@ -2841,9 +2812,9 @@ global $wppa_session;
             function wppa_wrong_value( $value, $field, $extra = '' ) {
             	$message = htmlspecialchars( sprintf( __( 'Value %s is not valid for %s.', 'wp-photo-album-plus' ), $value, $field ) );
             	if ( $extra ) {
-            -
            		$message .= '<br />' . $extra;
+            	}
-            -
            	$message .= '<br />' . __( 'This value is ignored.', 'wp-photo-album-plus' );
             	wppa_error_message( $message );
+            }
@@ -3307,11 +3278,21 @@ function wppa_edit_album_link_button( $tagid ) {
             		return '';
+            	}
             	$result = '
             	<input
             		type="button"
-            -
            		value="' . __( 'Edit album', 'wp-photo-album-plus' ) . '"
-            -
            		onclick="wppaGoEdit(jQuery(\'#'. $tagid .'\').val())"
             	/> ';
             	return $result;


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the import pages and functions
6	+ * Version 8.1.05.001
7	*
8	*/
9

136	if ( wppa_get( 'import-submit' ) ) {
137	if ( wppa( 'ajax' ) ) {
138	if ( ! wp_verify_nonce( wppa_get( 'update-check' ), '$wppa_nonce' ) ) {
139	+ wppa_echo( __( 'Security check failure', 'wp-photo-album-plus' ) );
140	wppa_exit();
141	}
142	}

164	if ( wppa( 'ajax' ) ) {
165
166	if ( wppa( 'ajax_import_files_done' ) ) {
167	+ wppa_echo( '<span style="color:green" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Done!', 'wp-photo-album-plus' ) . '</span>' );
168	}
169	elseif ( wppa( 'ajax_import_files_error' ) ) {
170	+ wppa_echo( '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . wppa( 'ajax_import_files_error' ) . '</span>' );
171	}
172	else {
173	+ wppa_echo( '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Failed!', 'wp-photo-album-plus' ) . '</span>' );
174	}
175	wppa_exit();
176	}
177
178	// Open the Form
179	+ wppa_echo( '<div class="wrap"><h2>' . __( 'Import Photos', 'wp-photo-album-plus' ) . '</h2>' );




180
181	// See if our depot dir has been created
182	if ( ! wppa_is_dir( WPPA_DEPOT_PATH ) ) {
183	wppa_error_message( sprintf(
184	+ __( 'Your depot directory <b>%s</b> could not be created.<br>Please create it yourself using a ftp program and make sure the filesystem rights are set to 0755',
185	'wp-photo-album-plus' ), WPPA_DEPOT_PATH ) );
186	}
187

188	// Get this users current source type setting ( local/remote )
189	$source_type = wppa_get_option( 'wppa_import_source_type_'.$user, 'local' );
190

248	}
249
250	// The form
251	+ wppa_echo( '
252	+ <form
253	+ id="wppa-import-form"
254	+ action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"
255	+ method="post"
256	+ >' );
257
258	// Admin and superuser can change import source, other users only if change source not is restricted
259	if ( wppa_user_is( 'administrator' ) \|\| ! wppa_switch( 'chgsrc_is_restricted' ) ) {
260
261	// Local / Remote
262	+ wppa_echo( '
263	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
264	wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
265	+ __( 'Select Local or Remote', 'wp-photo-album-plus' ) . '
266	+ <select
267	+ name="wppa-local-remote"
268	+ onchange="jQuery(\'#rem-rem-0\').show();jQuery(\'#wppa-import-set-source\').trigger(\'click\');"
269	+ >
270	+ <option value="local" ' . ( $source_type == 'local' ? 'selected="selected"' : '' ) . '>' . __( 'Local', 'wp-photo-album-plus' ) . '</option>
271	+ <option value="remote" ' . ( $source_type == 'remote' ? 'selected="selected"' : '' ) . '>' . __( 'Remote' ,'wp-photo-album-plus' ) . '</option>
272	+ </select>
273	+ <span id="rem-rem-0" style="display:none;" >' .
274	+ __( 'Working, please wait...', 'wp-photo-album-plus' ) . '
275	+ </span>
276	+ <input
277	+ id="wppa-import-set-source"
278	+ type="submit"
279	+ class="button-secundary"
280	+ name="wppa-import-set-source"
281	+ style="display:none;"
282	+ />
283	+ </div>' );

















284
285	// Source dir / url
286	+ wppa_echo( '
287	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
288	wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
289	+ __( 'Import photos from:' ,'wp-photo-album-plus' ) );
290
291	// Local: dir
292	if ( $source_type == 'local' ) {
293	wppa_update_option( 'wppa_import_root', ABSPATH . basename( content_url() ) ); // Provider may have changed disk
294	+ wppa_echo( '
295	+ <select
296	+ name="wppa-source"
297	+ onchange="jQuery(\'#rem-rem\').show();jQuery(\'#wppa-import-set-source-dir\').trigger(\'click\');"
298	+ >' .
299	+ wppa_abs_walktree( wppa_opt( 'import_root' ), $source ) . '
300	+ </select>
301	+ <input
302	+ id="wppa-import-set-source-dir"
303	+ type="submit"
304	+ class="button-secundary"
305	+ name="wppa-import-set-source-dir"
306	+ style="display:none;"
307	+ />
308	+ <span id="rem-rem" style="display:none;" >' .
309	+ __( 'Working, please wait...', 'wp-photo-album-plus' ) . '
310	+ </span>' );



311	}
312
313	// Remote: url
314	else {
315	if ( wppa_is_mobile() ) {
316	+ wppa_echo( '
317	+ <br>
318	+ <input
319	+ type="text"
320	+ style="width:100%"
321	+ name="wppa-source-remote"
322	+ value="' . $source . '"
323	+ onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"
324	+ />
325	+ <br>' );
326	}
327	else {
328	+ wppa_echo( '
329	+ <input
330	+ type="text"
331	+ style="width:50%"
332	+ name="wppa-source-remote"
333	+ value="' . $source . '"
334	+ onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"
335	+ />' );
336	}
337	+
338	+ wppa_echo(
339	+ __( 'Max:', 'wp-photo-album-plus' ) . '
340	+ <input
341	+ type="text"
342	+ style="width:50px;"
343	+ name="wppa-import-remote-max"
344	+ value="' . $remote_max . '"
345	+ onchange="jQuery(\'#wppa-import-set-source-url\').trigger(\'click\');"
346	+ />
347	+ <input
348	+ id="wppa-import-set-source-url"
349	+ type="submit"
350	+ onclick="jQuery( \'#rem-rem\' ).css( \'display\',\'inline\' ); return true;"
351	+ class="button-secundary"
352	+ name="wppa-import-set-source-url"
353	+ style="display:none;"
354	+ />
355	+ <span id="rem-rem" style="display:none;" >' .
356	+ __( 'Working, please wait...', 'wp-photo-album-plus' ) . '
357	+ </span>
358	+ <br>' .
359	+ __( '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' ) );


360	}
361	+ wppa_echo( '</div>' );

362	}
363	+ wppa_echo( '</form>' );

364
365	// check if albums exist or will be made before allowing upload
366	if ( ! wppa_has_albums() && ! $albumcount && ! $dircount && ! $csvcount ) {
367	$url = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu' );
368	+ wppa_echo( '
369	+ <p>' .
370	+ __( 'No albums exist. You must', 'wp-photo-album-plus' ) . '
371	+ <a href="' . $url . '" >' .
372	+ __( 'create one', 'wp-photo-album-plus' ) . '
373	+ </a> ' .
374	+ __( 'before you can import your photos.', 'wp-photo-album-plus' ) . '
375	+ </p>' );
376	return;
377	}
378

380	if ( $photocount \|\| $albumcount \|\| $zipcount \|\| $dircount \|\| $videocount \|\| $audiocount \|\| $csvcount \|\| $documentcount ) {
381
382	// Open the form
383	+ wppa_echo( '
384	+ <form
385	+ action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"
386	+ method="post"
387	+ >' .
388	+ wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) );













389
390	// Display the zips
391	if ( PHP_VERSION_ID >= 50207 && $zipcount > '0' ) {
392	+ wppa_echo( '
393	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
394	+ <p><b>' .
395	+ sprintf( _n( 'There is %d zipfile in the depot', 'There are %d zipfiles in the depot', $zipcount, 'wp-photo-album-plus' ), $zipcount ) . '
396	+ </b></p>
397	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
398	+ <thead>
399	+ <tr>
400	+ <td>
401	+ <input
402	+ type="checkbox"
403	+ id="all-zip"
404	+ checked="checked"
405	+ onchange="checkAll( \'all-zip\', \'.wppa-zip\' )"
406	+ />
407	+ <b>  ' .
408	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
409	+ </b>
410	+ </td>' );
411	if ( $is_sub_depot ) {
412	+ wppa_echo( '
413	+ <td>
414	+ <input
415	+ type="checkbox"
416	+ id="del-after-z"
417	+ name="del-after-z"
418	+ checked="checked"
419	+ />
420	+ <b>  ' .
421	+ __( 'Delete after successful extraction.', 'wp-photo-album-plus' ) . '
422	+ </b>
423	+ </td>' );
424	}
425	+ wppa_echo( '
426	+ </tr>
427	+ </thead>
428	+ </table>
429	+ <table
430	+ class="form-table wppa-table widefat"
431	+ style="margin-top:0;"
432	+ >
433	+ <tr>' );
434	$ct = 0;
435	$idx = '0';
436	foreach ( $files as $file ) {
437
438	$ext = wppa_get_ext( $file );
439	if ( $ext == 'zip' ) {
440	+ wppa_echo( '
441	+ <td>
442	+ <input
443	+ type="checkbox"
444	+ id="file-' . $idx . '"
445	+ name="file-' . $idx . '"
446	+ class="wppa-zip"
447	+ checked="checked"
448	+ />  ' .
449	+ htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) . '
450	+ </td>' );
451	if ( $ct == 3 ) {
452	+ wppa_echo( '</tr><tr>' );
453	$ct = 0;
454	}
455	else {

458	}
459	$idx++;
460	}
461	+ wppa_echo( '
462	+ </tr>
463	+ </table>
464	+ </div>' );
465	}
466
467	// Dispay the albums ( .amf files )
468	if ( $albumcount ) {
469	+ wppa_echo( '
470	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
471	+ <p>
472	+ <b>' .
473	+ sprintf( _n( 'There is %d albumdefinition in the depot', 'There are %d albumdefinitions in the depot', $albumcount, 'wp-photo-album-plus' ), $albumcount ) . '
474	+ </b>
475	+ </p>
476	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
477	+ <thead>
478	+ <tr>
479	+ <td>
480	+ <input
481	+ type="checkbox"
482	+ id="all-amf"
483	+ checked="checked"
484	+ onchange="checkAll( \'all-amf\', \'.wppa-amf\' )"
485	+ />
486	+ <b>  ' .
487	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
488	+ </b>
489	+ </td>' );
490	if ( $is_sub_depot ) {
491	+ wppa_echo( '
492	+ <td>
493	+ <input
494	+ type="checkbox"
495	+ id="del-after-a"
496	+ name="del-after-a"
497	+ checked="checked"
498	+ />
499	+ <b>  ' .
500	+ __( 'Remove from depot after successful import, or if the album already exists.', 'wp-photo-album-plus' ) . '
501	+ </b>
502	+ </td>' );
503	}
504	+ wppa_echo( '
505	+ </tr>
506	+ </thead>
507	+ </table>
508	+ <table
509	+ class="form-table wppa-table widefat"
510	+ style="margin-top:0;"
511	+ >
512	+ <tr>' );
513	$ct = 0;
514	$idx = '0';
515	foreach ( $files as $file ) {
516	$ext = wppa_get_ext( $file );
517	if ( $ext == 'amf' ) {
518	+ wppa_echo( '
519	+ <td>
520	+ <input
521	+ type="checkbox"
522	+ id="file-' . $idx . '"
523	+ name="file-' . $idx . '"
524	+ class="wppa-amf"
525	+ checked="checked"
526	+ />
527	+   ' .
528	+ sanitize_text_field( basename( $file ) . ' ' . wppa_get_meta_name( $file, '( ' ) ) . '
529	+ </td>' );
530	if ( $ct == 3 ) {
531	+ wppa_echo( '</tr><tr>' );
532	$ct = 0;
533	}
534	else {

537	}
538	$idx++;
539	}
540	+ wppa_echo( '
541	+ </tr>
542	+ </table>
543	+ </div>' );
544	}
545
546	// Display the single photos
547	if ( $photocount ) {
548	+ wppa_echo( '
549	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
550	+ <p><b>' );


551
552	// Local
553	if ( $source_type == 'local' ) {
554	if ( $is_ngg ) {
555	+ wppa_echo( '<br><b>' . sprintf( _n( 'There is %d photo in the ngg gallery', 'There are %d photos in the ngg gallery', $photocount, 'wp-photo-album-plus' ), $photocount ) . '</b>' );
556	}
557	else {
558	+ wppa_echo( '<br><b>' . sprintf( _n( 'There is %d photo in the depot', 'There are %d photos in the depot', $photocount, 'wp-photo-album-plus' ), $photocount ) . '</b>' );
559	}
560	}
561
562	// Remote
563	else {
564	+ wppa_echo( sprintf( _n( 'There is %d possible photo found remote', 'There are %d possible photos found remote', $photocount, 'wp-photo-album-plus' ), $photocount ) );
565	}
566
567	+ wppa_echo( '
568	+ </b></p>' );
569
570	// The album selection
571	+ wppa_echo( '
572	+ <p class="hideifupdate" >' .
573	__( 'Default album for import:', 'wp-photo-album-plus') .
574	wppa_album_select_a( array( 'path' => true,
575	'selected' => wppa_get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' ),

586	'tagstyle' => '',
587	) ) .
588	wppa_edit_album_link_button( 'wppa-photo-album' ) .
589	+ __( 'Photos that have (<em>name</em>)[<em>album</em>] will be imported by that <em>name</em> in that <em>album</em>.', 'wp-photo-album-plus') . '
590	+ </p>
591	+ <p>' );
592	+
593	+ // Watermark
594	+ if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) \|\| current_user_can( 'wppa_settings' ) ) ) {
595	+ wppa_echo(
596	+ __( 'Apply watermark file:', 'wp-photo-album-plus') .
597	+ '<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
598	+ wppa_watermark_file_select( 'user' ) .
599	+ '</select>' .
600	+ __( 'Position:', 'wp-photo-album-plus') .
601	+ '<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
602	+ wppa_watermark_pos_select( 'user' ) .
603	+ '</select>' );
604	+ }

















605
606	+ // Delay
607	+ $delays = array( '0', '1', '2', '5', '10', '20', '50', '100' );
608	+ wppa_echo(
609	+ __( 'Delay', 'wp-photo-album-plus' ) .
610	+ '<select id="wppa-delay" >' );
611	+ foreach ( $delays as $d ) {
612	+ wppa_echo( '<option value="' . ( $d * 1000 ) . '" ' . ( $d == '1' ? 'selected="selected" ' : '' ) . '>' . $d . '</option>' );
613	+ }
614	+ wppa_echo( '
615	+ </select> s.
616	+ <img
617	+ id="wppa-spinner"
618	+ src="' . wppa_get_imgdir( 'spinner.gif' ) . '"
619	+ style="vertical-align:middle;display:none;"
620	+ />
621	+ </p>' );
622
623	// Header of photo list
624	+ wppa_echo( '
625	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
626	+ <thead>
627	+ <tr>
628	+ <td>
629	+ <input
630	+ type="checkbox"
631	+ id="all-pho"' .
632	+ ( $is_sub_depot ? ' checked="checked"' : ' ' ) . '
633	+ onchange="checkAll( \'all-pho\', \'.wppa-pho\' )"
634	+ />
635	+ <b>
636	+   ' .
637	+ __( 'Check/uncheck all', 'wp-photo-album-plus') . '
638	+ </b>
639	+ </td>' );
640
641	// Depot specific switches
642	if ( $is_sub_depot ) {
643	+ wppa_echo( '
644	+ <td>
645	+ <input
646	+ type="checkbox"
647	+ id="del-after-p"
648	+ name="del-after-p"
649	+ checked="checked"
650	+ />
651	+ <b>
652	+   ' .
653	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) . '
654	+ </b>
655	+ </td>
656	+ <td>
657	+ <input
658	+ type="checkbox"
659	+ id="del-after-f"
660	+ name="del-after-f"
661	+ />
662	+ <b>
663	+   ' .
664	+ __( 'Remove from depot after failed import.', 'wp-photo-album-plus' ) . '
665	+ </b>
666	+ </td>' );
667	}
668
669	// Nextgen import specific switches
670	if ( $is_ngg ) {
671	+ wppa_echo( '
672	+ <td>
673	+ <input
674	+ type="checkbox"
675	+ id="cre-album"
676	+ name="cre-album"
677	+ checked="checked"
678	+ value="' . esc_attr( basename( $source ) ) .'"
679	+ />
680	+ <b>
681	+   ' .
682	+ __( 'Import into album', 'wp-photo-album-plus' ) . ' ' . basename( $source ) . '
683	+ </b>
684	+ <small>' .
685	+ __( 'The album will be created if it does not exist', 'wp-photo-album-plus' ) . '
686	+ </small>
687	+ </td>
688	+ <td>
689	+ <input
690	+ type="checkbox"
691	+ id="use-backup"
692	+ name="use-backup"
693	+ checked="checked"
694	+ />
695	+ <b>
696	+   ' .
697	+ __( 'Use backup if available', 'wp-photo-album-plus' ) . '
698	+ </b>
699	+ </td>' );
700	}
701
702	// Update existing switch
703	+ wppa_echo( '
704	+ <td>
705	+ <input
706	+ type="checkbox"
707	+ id="wppa-update"
708	+ onchange="impUpd( this, \'#submit\' )"
709	+ name="wppa-update"
710	+ />
711	+ <b>
712	+   ' .
713	+ __( 'Update existing photos', 'wp-photo-album-plus' ) . '
714	+ </b>
715	+ </td>' );
716
717	// Void dups switch
718	+ wppa_echo( '<td>' );
719	if ( wppa_switch( 'void_dups' ) ) {
720	+ wppa_echo( '
721	+ <input
722	+ type="hidden"
723	+ id="wppa-nodups"
724	+ name="wppa-nodups"
725	+ value="1"
726	+ />' );
727	}
728	else {
729	+ wppa_echo( '
730	+ <input
731	+ type="checkbox"
732	+ id="wppa-nodups"
733	+ name="wppa-nodups"
734	+ checked="checked"
735	+ />
736	+ <b>
737	+   ' .
738	+ __( 'Do not create duplicates', 'wp-photo-album-plus' ) . '
739	+ </b>' );
740	}
741	+ wppa_echo( '</td>' );
742
743	// Import preview zoomable switch
744	if ( wppa_switch( 'import_preview' ) ) {
745	+ wppa_echo( '
746	+ <td>
747	+ <input
748	+ type="checkbox"
749	+ id="wppa-zoom"
750	+ onclick="wppa_setCookie(\'zoompreview\', this.checked, \'365\')"' .
751	+ ( wppa_get_cookie( 'zoompreview' ) == 'true' ? ' checked="checked"' : '' ) . '
752	+ />
753	+ <b>
754	+   ' .
755	+ __( 'Zoom previews', 'wp-photo-album-plus' ) . '
756	+ </b>
757	+ </td>' );
758	}
759	+ wppa_echo( '
760	+ </tr>
761	+ </thead>
762	+ </table>' );
763
764	// Photo list
765	+ wppa_echo( '
766	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >
767	+ <tr>' );
768	$ct = 0;
769	$idx = '0';
770	if ( is_array( $files ) ) foreach ( $files as $file ) {

777	$meta = false;
778	}
779	if ( in_array( strtolower($ext), $wppa_supported_photo_extensions ) ) {
780	+ wppa_echo( '
781	+ <td id="td-file-' . $idx . '" >
782	+ <input
783	+ type="checkbox"
784	+ id="file-' . $idx . '"
785	+ name="file-' . $idx . '"
786	+ title="' . esc_attr( $file ) . '"
787	+ class="wppa-pho" ' .
788	+ ( $is_sub_depot ? 'checked="checked"' : '' ) . '
789	+ />
790	+ <span
791	+ id="name-file-' . $idx . '"
792	+ >
793	+   ' );
794
795	if ( wppa( 'is_wppa_tree' ) ) {
796	$t = explode( 'uploads/wppa/', $file );
797	+ wppa_echo( wppa_sanitize_file_name( basename( str_replace( '/', '', $t[1] ) ) ) );
798	}
799	else {
800	+ wppa_echo( wppa_sanitize_file_name( basename( $file ) ) );
801	}
802
803	if ( $meta ) {
804	+ wppa_echo( '
805	+  ' .
806	stripslashes( wppa_get_meta_name( $meta, '( ' ) ) .
807	+ stripslashes( wppa_get_meta_album( $meta, '[' ) ) );
808	}
809	+ wppa_echo( '</span>' );

810
811	if ( wppa_switch( 'import_preview' ) ) {
812	if ( wppa( 'is_remote' ) ) {

823	$img_url = str_replace( 'http://', 'https://', $img_url );
824	}
825	}
826	+ wppa_echo( '
827	+ <img src="' . esc_url( $img_url ) . '"
828	+ alt="' . esc_attr( __( 'n.a.', 'wp-photo-album-plus' ) ) . '"
829	+ style="max-height:48px;"
830	+ onmouseover="if (jQuery(\'#wppa-zoom\').prop(\'checked\')) jQuery(this).css(\'max-height\', \'144px\')"
831	+ onmouseout="if (jQuery(\'#wppa-zoom\').prop(\'checked\')) jQuery(this).css(\'max-height\', \'48px\')"
832	+ />' );
833	}
834
835	+ wppa_echo( '</td>' );

836
837	if ( $ct == 3 ) {
838	+ wppa_echo( '</tr><tr>' );
839	$ct = 0;
840	}
841	else {

844	}
845	$idx++;
846	}
847	+ wppa_echo( '
848	+ </tr>
849	+ </table>
850	+ </div>' );
851	}
852
853	// Display the videos
854	if ( $videocount && wppa_switch( 'enable_video' ) ) {
855	+ wppa_echo( '
856	+ <div
857	+ style="border:1px solid gray; padding:4px; margin: 3px 0;"
858	+ >' );
859
860	// Display available files
861	+ wppa_echo( '
862	+ <p><b>' .
863	+ sprintf( _n( 'There is %d video in the depot', 'There are %d videos in the depot', $videocount, 'wp-photo-album-plus' ), $videocount ) . '
864	+ </b></p>' );
865
866	// Album to import to
867	+ wppa_echo( '
868	+ <p class="hideifupdate" >' .
869	__( 'Album to import to:', 'wp-photo-album-plus') .
870	wppa_album_select_a( array( 'path' => true,
871	'selected' => wppa_get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' ),

882	'tagstyle' => '',
883	) ) .
884	wppa_edit_album_link_button( 'wppa-video-album' ) .
885	+ '</p>' );
886
887	// Header of video list
888	+ wppa_echo( '
889	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
890	+ <thead>
891	+ <tr>
892	+ <td>
893	+ <input
894	+ type="checkbox"
895	+ id="all-video"
896	+ checked="checked"
897	+ onchange="checkAll( \'all-video\', \'.wppa-video\' )"
898	+ />
899	+ <b>
900	+   ' .
901	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
902	+ </b>
903	+ </td>' );
904	if ( $is_sub_depot ) {
905	+ wppa_echo( '
906	+ <td>
907	+ <input
908	+ type="checkbox"
909	+ id="del-after-v"
910	+ name="del-after-v"
911	+ checked="checked"
912	+ />
913	+ <b>
914	+   ' .
915	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) . '
916	+ <small> ' .
917	+ __( 'Files larger than 64MB will always be removed after successful import.', 'wp-photo-album-plus' ) . '
918	+ </small>
919	+ </b>
920	+ </td>' );
921	}
922	+ wppa_echo( '
923	+ </tr>
924	+ </thead>
925	+ </table>' );
926
927	// Video list
928	+ wppa_echo( '
929	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >
930	+ <tr>' );
931	$ct = 0;
932	$idx = '0';
933	if ( is_array( $files ) ) foreach ( $files as $file ) {
934	$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
935	if ( in_array( strtolower($ext), $wppa_supported_video_extensions ) ) {
936	+ wppa_echo( '
937	+ <td>
938	+ <input
939	+ type="checkbox"
940	+ id="file-' . $idx . '"
941	+ name="file-' . $idx . '"
942	+ title="' . esc_attr( htmlspecialchars( $file ) ) . '"
943	+ class="wppa-video"
944	+ checked="checked"
945	+ />
946	+ <span
947	+ id="name-file-' . $idx . '"
948	+ >
949	+   ' .
950	htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) .
951	+ ' (' . sprintf( '%3.1f', wppa_filesize( $file ) / 1024 ) . ' kb)' . '
952	+ </span>
953	+ </td>' );
954	if ( $ct == 3 ) {
955	+ wppa_echo( '</tr><tr>' );
956	$ct = 0;
957	}
958	else {

961	}
962	$idx++;
963	}
964	+ wppa_echo( '
965	+ </tr>
966	+ </table>
967	+ </div>' );
968	}
969
970	// Display the audios
971	if ( $audiocount && wppa_switch( 'enable_audio' ) ) {
972	+ wppa_echo( '
973	+ <div
974	+ style="border:1px solid gray;padding:4px;margin: 3px 0;"
975	+ >' );
976
977	// Display available files
978	+ wppa_echo( '
979	+ <p><b>' .
980	+ sprintf( _n( 'There is %d audio in the depot', 'There are %d audios in the depot', $audiocount, 'wp-photo-album-plus' ), $audiocount ) . '
981	+ </b></p>' );
982
983	// Album to import to
984	+ wppa_echo( '
985	+ <p class="hideifupdate" >' .
986	__( 'Album to import to:', 'wp-photo-album-plus') .
987	wppa_album_select_a( array( 'path' => true,
988	'selected' => wppa_get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' ),

998	'multiple' => false,
999	'tagstyle' => '',
1000	) ) .
1001	+ wppa_edit_album_link_button( 'wppa-audio-album' ) . '
1002	+ </p>' );
1003
1004	// Header of audio list
1005	+ wppa_echo( '
1006	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
1007	+ <thead>
1008	+ <tr>
1009	+ <td>
1010	+ <input
1011	+ type="checkbox"
1012	+ id="all-audio"
1013	+ checked="checked"
1014	+ onchange="checkAll( \'all-audio\', \'.wppa-audio\' )"
1015	+ />
1016	+ <b>
1017	+   ' .
1018	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
1019	+ </b>
1020	+ </td>' );
1021
1022	// The remove box
1023	if ( $is_sub_depot ) {
1024	+ wppa_echo( '
1025	+ <td>
1026	+ <input
1027	+ type="checkbox"
1028	+ id="del-after-u"
1029	+ name="del-after-u"
1030	+ checked="checked"
1031	+ />
1032	+ <b>
1033	+   ' .
1034	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) . '
1035	+ </b>
1036	+ </td>' );
1037	}
1038	+ wppa_echo( '
1039	+ </tr>
1040	+ </thead>
1041	+ </table>' );
1042
1043	// Audio list
1044	+ wppa_echo( '
1045	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >
1046	+ <tr>' );
1047	$ct = 0;
1048	$idx = '0';
1049	if ( is_array( $files ) ) foreach ( $files as $file ) {
1050	$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
1051	if ( in_array( strtolower($ext), $wppa_supported_audio_extensions ) ) {
1052	+ wppa_echo( '
1053	+ <td>
1054	+ <input
1055	+ type="checkbox"
1056	+ id="file-' . $idx . '"
1057	+ name="file-' . $idx . '"
1058	+ title="' . esc_attr( htmlspecialchars( $file ) ) . '"
1059	+ class="wppa-audio"
1060	+ checked="checked"
1061	+ />
1062	+ <span
1063	+ id="name-file-' . $idx . '"
1064	+ >
1065	+   ' .
1066	htmlspecialchars( wppa_sanitize_file_name( basename( $file ) ) ) .
1067	+ ' (' . sprintf( '%3.1f', wppa_filesize( $file ) / 1024 ) . ' kb)' . '
1068	+ </span>
1069	+ </td>' );
1070	if ( $ct == 3 ) {
1071	+ wppa_echo( '</tr><tr>' );
1072	$ct = 0;
1073	}
1074	else {

1077	}
1078	$idx++;
1079	}
1080	+ wppa_echo( '
1081	+ </tr>
1082	+ </table>
1083	+ </div>' );
1084	}
1085
1086	// Display the csv files
1087	if ( $is_depot && $csvcount ) {
1088	+ wppa_echo( '
1089	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' );
1090
1091	// Display number of files
1092	+ wppa_echo( '
1093	+ <p><b>' .
1094	+ sprintf( _n( 'There is %d .csv file in the depot', 'There are %d .csv files in the depot', $csvcount, 'wp-photo-album-plus' ), $csvcount ) . '
1095	+ </b></p>' );
1096
1097	// Header of .csv file list
1098	+ wppa_echo( '
1099	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
1100	+ <thead>
1101	+ <tr>
1102	+ <td>
1103	+ <input
1104	+ type="checkbox"
1105	+ id="all-csv"
1106	+ checked="checked"
1107	+ onchange="checkAll( \'all-csv\', \'.wppa-csv\' )"
1108	+ />
1109	+ <b>
1110	+   ' .
1111	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
1112	+ </b>
1113	+ </td>
1114	+ <td>
1115	+ <input
1116	+ type="checkbox"
1117	+ id="del-after-c"
1118	+ name="del-after-c"
1119	+ checked="checked"
1120	+ disabled="disabled"
1121	+ />
1122	+ <b>
1123	+   ' .
1124	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) . '
1125	+ </b>
1126	+ </td>
1127	+ </tr>
1128	+ </thead>
1129	+ </table>' );
1130
1131	// CSV file list
1132	+ wppa_echo( '
1133	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >' );
1134	$ct = 0;
1135	$idx = '0';
1136	if ( is_array( $files ) ) foreach( $files as $csv ) {
1137	if ( wppa_is_file( $csv ) && strtolower( wppa_get_ext( $csv ) ) == 'csv' ) {
1138	+ wppa_echo( '
1139	+ <tr>
1140	+ <td>
1141	+ <input
1142	+ type="checkbox"
1143	+ id="file-' . $idx . '"
1144	+ name="file-' . $idx . '"
1145	+ class="wppa-csv"
1146	+ checked="checked"
1147	+ />
1148	+ <b>
1149	+   ' .
1150	wppa_sanitize_file_name( basename( $csv ) ) .
1151	+ ' (' . sprintf( '%3.1f', wppa_filesize( $csv ) / 1024 ) . ' kb)' . '
1152	+ </b>
1153	+ </td>
1154	+ </tr>' );
1155	}
1156	$idx++;
1157	}
1158	+ wppa_echo( '
1159	+ </table>
1160	+ </div>' );
1161	}
1162
1163	// Display the document files
1164	if ( $is_depot && $documentcount ) {
1165	+ wppa_echo( '
1166	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' );
1167
1168	// Display number of files
1169	+ wppa_echo( '
1170	+ <p><b>' .
1171	+ sprintf( _n( 'There is %d document file in the depot', 'There are %d document files in the depot', $documentcount, 'wp-photo-album-plus' ), $documentcount ) . '
1172	+ </b></p>' );
1173
1174	// Album to import to
1175	+ wppa_echo( '
1176	+ <p class="hideifupdate" >' .
1177	__( 'Album to import to:', 'wp-photo-album-plus') .
1178	wppa_album_select_a( array( 'path' => true,
1179	'selected' => wppa_get_option( 'wppa-document-album-import-'.wppa_get_user(), '0' ),

1189	'multiple' => false,
1190	'tagstyle' => '',
1191	) ) .
1192	+ wppa_edit_album_link_button( 'wppa-document-album' ) . '
1193	+ </p>' );
1194
1195	// Header of .pdf file list
1196	+ wppa_echo( '
1197	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
1198	+ <thead>
1199	+ <tr>
1200	+ <td>
1201	+ <input
1202	+ type="checkbox"
1203	+ id="all-pdf"
1204	+ checked="checked"
1205	+ onchange="checkAll( \'all-pdf\', \'.wppa-pdf\' )"
1206	+ />
1207	+ <b>
1208	+   ' .
1209	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
1210	+ </b>
1211	+ </td>
1212	+ <td>
1213	+ <input
1214	+ type="checkbox"
1215	+ id="del-after-d"
1216	+ name="del-after-d"
1217	+ checked="checked"
1218	+ />
1219	+ <b>
1220	+   ' .
1221	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) . '
1222	+ </b>
1223	+ </td>
1224	+ </tr>
1225	+ </thead>
1226	+ </table>' );
1227
1228	// pdf file list
1229	+ wppa_echo( '
1230	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >
1231	+ <tr>' );
1232	$ct = 0;
1233	$idx = '0';
1234	if ( is_array( $files ) ) foreach( $files as $pdf ) {
1235	if ( wppa_is_file( $pdf ) && strtolower( wppa_get_ext( $pdf ) ) == 'pdf' ) {
1236	+ wppa_echo( '
1237	+ <td>
1238	+ <input
1239	+ type="checkbox"
1240	+ id="file-' . $idx . '"
1241	+ name="file-' . $idx . '"
1242	+ title="' . esc_attr( $pdf ) . '"
1243	+ class="wppa-pdf"
1244	+ checked="checked"
1245	+ />
1246	+
1247	+ <span
1248	+ id="name-file-' . $idx . '"
1249	+ >
1250	+   ' .
1251	wppa_sanitize_file_name( basename( $pdf ) ) .
1252	+ ' (' . sprintf( '%3.1f', wppa_filesize( $pdf ) / 1024 ) . ' kb)' . '
1253	+ </span>
1254	+ </td>' );
1255	if ( $ct == 3 ) {
1256	+ wppa_echo( '</tr><tr>' );
1257	$ct = 0;
1258	}
1259	else {

1262	}
1263	$idx++;
1264	}
1265	+ wppa_echo( '
1266	+ </tr>
1267	+ </table>
1268	+ </div>' );
1269	}
1270
1271	// Display the directories to be imported as albums. Do this in the depot only!!
1272	if ( $is_depot && $dircount ) {
1273	+ wppa_echo( '
1274	+ <div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' );
1275
1276	// Display number of dirs
1277	+ wppa_echo( '
1278	+ <p><b>' .
1279	+ sprintf( _n( 'There is %d albumdirectory in the depot', 'There are %d albumdirectories in the depot', $dircount, 'wp-photo-album-plus' ), $dircount ) . '
1280	+ </b></p>' );
1281
1282	// Header of dirlist
1283	+ wppa_echo( '
1284	+ <table class="form-table wppa-table widefat" style="margin-bottom:0;" >
1285	+ <thead>
1286	+ <tr>
1287	+ <td>
1288	+ <input
1289	+ type="checkbox"
1290	+ id="all-dir"
1291	+ checked="checked"
1292	+ onchange="checkAll( \'all-dir\', \'.wppa-dir\' )"
1293	+ />
1294	+ <b>
1295	+   ' .
1296	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) . '
1297	+ </b>
1298	+ </td>
1299	+ <td>
1300	+ <input
1301	+ type="checkbox"
1302	+ id="del-dir"
1303	+ name="del-dir"
1304	+ onchange="wppa_setCookie(\'removeemptydirs\', this.checked, \'365\')"' .
1305	+ ( wppa_get_cookie( 'removeemptydirs' ) == 'true' ? ' checked="checked"' : '' ) . '
1306	+ />
1307	+ <b>
1308	+   ' .
1309	+ __( 'Remove empty dirs', 'wp-photo-album-plus' ) .
1310	+ '</b>
1311	+ </td>
1312	+ </tr>
1313	+ </thead>
1314	+ </table>' );
1315
1316	// Dirlist
1317	+ wppa_echo( '
1318	+ <table class="form-table wppa-table widefat" style="margin-top:0;" >' );
1319	$ct = 0;
1320	$idx = '0';
1321	foreach( $files as $dir ) {
1322	if ( basename( $dir ) != '.' &&
1323	basename( $dir ) != '..' &&
1324	wppa_is_dir( $dir ) ) {
1325	+ wppa_echo( '
1326	+ <tr>
1327	+ <td>
1328	+ <input
1329	+ type="checkbox"
1330	+ id="file-' . $idx . '"
1331	+ name="file-' . $idx .'"
1332	+ class= "wppa-dir"
1333	+ checked="checked"
1334	+ />
1335	+
1336	+ <b>' .
1337	+ htmlspecialchars( wppa_sanitize_file_name( basename( $dir ) ) ) . '
1338	+ </b>' );
1339	$subdirs = wppa_glob( $dir.'/*', WPPA_ONLYDIRS );
1340	$subfiles = wppa_glob( $dir.'/*', WPPA_ONLYFILES );
1341	$subdircount = count( $subdirs );
1342	$subfilecount = count( $subfiles );
1343	+
1344	+ wppa_echo( ' ' .
1345	+ sprintf( _n( 'Contains %d file', 'Contains %d files', $subfilecount, 'wp-photo-album-plus' ), $subfilecount ) );









1346	if ( $subdircount ) {
1347	+ wppa_echo( ' ' .
1348	+ sprintf( _n( 'and %d subdirectory', 'and %d subdirectories', $subdircount, 'wp-photo-album-plus' ), $subdircount ) );
1349	}
1350	+ wppa_echo( '
1351	+ </td>
1352	+ </tr>' );
1353	}
1354	$idx++;
1355	}
1356	+ wppa_echo( '
1357	+ </table>
1358	+ </div>' );
1359	}
1360
1361	+ $the_js = '
1362	+ function wppaVfyAlbum() {
1363	+ var csvs = jQuery( ".wppa-csv" );
1364	+ if ( ! jQuery( "#wppa-update" ).prop( "checked" ) ) {
1365	+ if ( ! parseInt( jQuery( "#wppa-photo-album" ).val() ) &&
1366	+ ! parseInt( jQuery( "#wppa-video-album" ).val() ) &&
1367	+ ! parseInt( jQuery( "#wppa-audio-album" ).val() ) &&
1368	+ ! parseInt( jQuery( "#wppa-document-album" ).val() ) &&
1369	+ csvs.length == 0
1370	+ ) {
1371	+ alert( "Please select an album first" );
1372	+ return false;
1373	+ }
1374	+ }
1375	+ return true;
1376	+ }
1377	+ function wppaCheckInputVars() {
1378	+ var checks = jQuery( ":checked" );
1379	+ var nChecks = checks.length;
1380	+ var nMax = ' . ini_get( "max_input_vars" ) . ';
1381	+ if ( nMax == 0 ) nMax = 100;
1382	+ if ( nChecks > nMax ) {
1383	+ alert ( "There are "+nChecks+" boxes checked or selected, that is more than the maximum allowed number of "+nMax );
1384	+ return false;
1385	+ }
1386	+ var dirs = jQuery( ".wppa-dir" );
1387	+ var nDirsChecked = 0;
1388	+ if ( dirs.length > 0 ) {
1389	+ var i = 0;
1390	+ while ( i < dirs.length ) {
1391	+ if ( jQuery( dirs[i] ).prop( "checked" ) ) {
1392	+ nDirsChecked++;
1393	}
1394	+ i++;
1395	}
1396	+ }
1397	+ var zips = jQuery( ".wppa-zip" );
1398	+ var nZipsChecked = 0;
1399	+ if ( zips.length > 0 ) {
1400	+ var i = 0;
1401	+ while ( i < zips.length ) {
1402	+ if ( jQuery( zips[i] ).prop( "checked" ) ) {
1403	+ nZipsChecked++;
1404	}
1405	+ i++;
1406	+ }
1407	+ }
1408	+ // If no dirs to import checked, there must be an album selected
1409	+ if ( 0 == nDirsChecked && 0 == nZipsChecked && ! wppaVfyAlbum() ) return false;
1410	+ return true;
1411	+ }
1412	+
1413	+ var wppaImportRuns = false;
1414	+ var wppaTimer;
1415	+ function wppaDoAjaxImport() {
1416	+ jQuery( "#wppa-spinner" ).css( "display", "none" );
1417	+
1418	+ var data = "";
1419	+ data += "wppa-update-check="+jQuery( "#wppa-update-check" ).val();
1420	+ data += "&wppa-photo-album="+jQuery( "#wppa-photo-album" ).val();
1421	+ data += "&wppa-video-album="+jQuery( "#wppa-video-album" ).val();
1422	+ data += "&wppa-audio-album="+jQuery( "#wppa-audio-album" ).val();
1423	+ data += "&wppa-document-album="+jQuery( "#wppa-document-album" ).val();
1424	+ data += "&wppa-watermark-file="+jQuery( "#wppa-watermark-file" ).val();
1425	+ data += "&wppa-watermark-pos="+jQuery( "#wppa-watermark-pos" ).val();
1426	+ if ( jQuery( "#cre-album" ).prop( "checked" ) ) data += "&cre-album="+jQuery( "#cre-album" ).val();
1427	+ if ( jQuery( "#use-backup" ).prop( "checked" ) ) data += "&use-backup=1";
1428	+ if ( jQuery( "#wppa-update" ).prop( "checked" ) ) data += "&wppa-update=1";
1429	+ if ( jQuery( "#wppa-nodups" ).prop( "checked" ) ) data += "&wppa-nodups=1";
1430	+ if ( jQuery( "#del-after-p" ).prop( "checked" ) ) data += "&del-after-p=1";
1431	+ if ( jQuery( "#del-after-f" ).prop( "checked" ) ) data += "&del-after-f=1";
1432	+ if ( jQuery( "#del-after-v" ).prop( "checked" ) ) data += "&del-after-v=1";
1433	+ if ( jQuery( "#del-after-u" ).prop( "checked" ) ) data += "&del-after-u=1";
1434	+ if ( jQuery( "#del-after-d" ).prop( "checked" ) ) data += "&del-after-d=1";
1435	+ data += "&wppa-import-submit=ajax";
1436	+
1437	+ var files = jQuery( ":checked" );
1438	+ var found = false;
1439	+ var i=0;
1440	+ var elm;
1441	+ var fulldata;
1442	+ for ( i=0; i<files.length; i++ ) {
1443	+ found = false; // assume done
1444	+ elm = files[i];
1445	+ // Is it a file checkbox?
1446	+ var temp = elm.id.split( "-" );
1447	+ if ( temp[0] != "file" ) continue; // no
1448	+ fulldata = data+"&import-ajax-file="+elm.title;
1449	+ found = true;
1450	+ break;
1451	+ }
1452	+ // alert( data );
1453	+ if ( ! found ) {
1454	+ wppaStopAjaxImport();
1455	+ return; // nothing left
1456	+ }
1457	+ // found one, do it
1458	+ var oldhtml=jQuery( "#name-"+elm.id ).html();
1459	+ var xmlhttp = wppaGetXmlHttp();
1460	+ xmlhttp.onreadystatechange = function() {
1461	+ if ( xmlhttp.readyState == 4 ) {
1462	+ if ( xmlhttp.status!=404 ) {
1463	+ var resp = xmlhttp.responseText;
1464	+
1465	+ //
1466	+ if ( resp.length == 0 ) {
1467	+ jQuery( "#name-"+elm.id ).html("<span style=\'color:red\'>Timeout</span>" );
1468	+ wppaStopAjaxImport();
1469	+ return;
1470	}
1471	+ //
1472	+ if ( resp.indexOf( "Server" ) != -1 && resp.indexOf( "Error" ) != -1 ) {
1473	+ resp = "<span style=\'color:red\'>Server error</span>";







1474	}
1475	+ jQuery( "#name-"+elm.id ).html( "  <b>"+resp+"</b>" );
1476	+ elm.checked = "";
1477	+ if ( jQuery( "#del-after-p" ).prop( "checked" ) \|\|
1478	+ jQuery( "#del-after-f" ).prop( "checked" ) ) {
1479	+ elm.disabled = "disabled";
1480	+ elm.title = "";
1481	+ }
1482	+ if ( wppaImportRuns ) {
1483	+ wppaTimer = setTimeout( "wppaDoAjaxImport()", jQuery( "#wppa-delay" ).val() ); // was 100
1484	+ jQuery( "#wppa-spinner" ).css( "display", "inline" );













































































1485	}
1486	}
1487	+ else {
1488	+ jQuery( "#name-"+elm.id ).html( "  <b>Not found</b>" );






1489	}
1490	}
1491	+ }
1492	+ var url = wppaAjaxUrl+"?action=wppa&wppa-action=import";
1493	+ xmlhttp.open( "POST",url,true );
1494	+ xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
1495	+ xmlhttp.send( fulldata );
1496	+ jQuery( "#name-"+elm.id ).html( "  <b style=\'color:blue\' >" + "' . __( "Working...", "wp-photo-album-plus" ) . '" + "</b>" );
1497	+ if ( wppaImportRuns ) {
1498	+ jQuery( "#wppa-start-ajax" ).css( "display", "none" );
1499	+ jQuery( "#wppa-stop-ajax" ).css( "display", "inline" );
1500	+ }
1501	+ }
1502	+ function wppaStopAjaxImport() {
1503	+ wppaImportRuns = false;
1504	+ clearTimeout( wppaTimer );
1505	+ jQuery( "#wppa-start-ajax" ).css( "display", "inline" );
1506	+ jQuery( "#wppa-stop-ajax" ).css( "display", "none" );
1507	+ jQuery( "#wppa-spinner" ).css( "display", "none" );
1508	+ }';
1509
1510	+ wppa_add_inline_script( 'wppa-admin', $the_js );
1511	+
1512	+ // The submit button
1513	+ wppa_echo( '<p>' );
1514	+ if ( $albumcount \|\| $dircount \|\| $zipcount \|\| $csvcount ) {
1515	+ wppa_echo( '
1516	+ <input
1517	+ type="submit"
1518	+ onclick="return wppaCheckInputVars()"
1519	+ class="button-primary"
1520	+ id="submit"
1521	+ name="wppa-import-submit"
1522	+ value="' . __( 'Import', 'wp-photo-album-plus' ) . '"
1523	+ />' );
1524	}
1525	+ if ( ( $photocount \|\| $videocount \|\| $audiocount \|\| $documentcount ) && ! $albumcount && ! $dircount && ! $zipcount && ! $csvcount ) {
1526	+ wppa_echo( '
1527	+ <input
1528	+ id="wppa-start-ajax"
1529	+ type="button"
1530	+ onclick="if (wppaVfyAlbum()) {wppaImportRuns=true;wppaDoAjaxImport()}"
1531	+ class="button-primary"
1532	+ value="' . esc_attr( __( 'Start Import', 'wp-photo-album-plus' ) ) . '"
1533	+ />
1534	+ <input
1535	+ id="wppa-stop-ajax"
1536	+ style="display:none;"
1537	+ type="button"
1538	+ onclick="wppaStopAjaxImport()"
1539	+ class="button-primary"
1540	+ value="' . esc_attr( __( 'Stop Import', 'wp-photo-album-plus' ) ) . '"
1541	+ />' );
1542	}
1543	+ wppa_echo( '
1544	+ </p>
1545	+ </form>' );
1546	+ }
1547	+ else {
1548	+ if ( $source_type == 'local' ) {
1549	+ wppa_ok_message( __( 'There are no importable files found in directory:', 'wp-photo-album-plus').' '.$source );


1550	}
1551	else {
1552	+ wppa_ok_message( __( 'There are no photos found or left to process at url:', 'wp-photo-album-plus').' '.$source_url );
1553	+ }
1554	+ }
1555	+ wppa_echo( '
1556	+ <br><b>' .
1557	+ __( 'You can import the following file types:', 'wp-photo-album-plus' ) . '
1558	+ </b><br>' );
1559	+ if ( wppa_get_option( 'wppa_import_source_type_' . $user, 'local' ) == 'remote' ) {
1560	+ wppa_echo( '
1561	+ <br>' .
1562	+ __( 'Photo file types:', 'wp-photo-album-plus' ) . '
1563	+ .jpg .jpeg .png' );
1564	+ }
1565	+ else {
1566	+ if ( PHP_VERSION_ID >= 50207 ) {
1567	+ wppa_echo( '<br>' .
1568	+ __( 'Compressed file types: .zip', 'wp-photo-album-plus' ) );
1569	+ }
1570
1571	+ wppa_echo( '<br>' .
1572	+ __( 'Photo file types:', 'wp-photo-album-plus' ) );
1573	+ foreach ( $wppa_supported_photo_extensions as $ext ) {
1574	+ wppa_echo( ' .' . $ext );
1575	+ }
1576
1577	+ if ( wppa_switch( 'enable_video' ) ) {
1578	+ wppa_echo( '<br>' .
1579	+ __( 'Video file types:', 'wp-photo-album-plus' ) );
1580	+ foreach ( $wppa_supported_video_extensions as $ext ) {
1581	+ wppa_echo( ' .' . $ext );








1582	}
1583	+ }
1584	+ if ( wppa_switch( 'enable_audio' ) ) {
1585	+ wppa_echo( '<br>' .
1586	+ __( 'Audio file types:', 'wp-photo-album-plus' ) );
1587	+ foreach ( $wppa_supported_audio_extensions as $ext ) {
1588	+ wppa_echo( ' .' . $ext );
1589	}









1590	}
1591	+ if ( in_array( 'pdf', wppa_get_supported_extensions() ) ) {
1592	+ wppa_echo( '<br>' .
1593	+ __( 'Document file type: .pdf', 'wp-photo-album-plus' ) );
1594	+ }
1595	+ wppa_echo( '
1596	+ <br>' . __( 'WPPA+ file types: .amf .pmf', 'wp-photo-album-plus' ) . '
1597	+ <br>' . __( 'Custom data files of type .csv', 'wp-photo-album-plus' ) . '
1598	+ <br>' . __( 'Directories with optional subdirs containig photos', 'wp-photo-album-plus' ) . '
1599	+ <br><br>' . __( 'Your depot directory is:', 'wp-photo-album-plus' ) . '
1600	+ <b> .../' . WPPA_DEPOT . '/</b>' );
1601	+ }
1602
1603	if ( wppa( 'continue' ) ) {
1604	wppa_warning_message( __( 'Trying to continue...', 'wp-photo-album-plus') );
1605	+ $the_js = 'document.location=\'' . get_admin_url() . 'admin.php?page=wppa_import_photos&continue=1&nonce=' . wp_create_nonce( 'dirimport' ) . '\';';
1606	+ wppa_add_inline_script( 'wppa-admin', $the_js );
1607	}
1608
1609	+ wppa_echo( '<br><br>' );
1610
1611	+ wppa_echo( wppa_album_admin_footer() );
1612
1613	+ wppa_echo( '</div><!-- .wrap -->' );

1614
1615	}
1616

1714	foreach ( array_keys( $matches[0] ) as $idx ) {
1715	if ( $matches[0][$idx] != $val ) {
1716	$val = $matches[0][$idx];
1717	+
1718	// Post process found item
1719	$match = substr( $matches[0][$idx], 5 );
1720	$matchpos = strpos( $contents, $match );

2276	// Make sure the feature is on
2277	if ( ! wppa_switch( 'custom_fields' ) ) {
2278	wppa_update_option( 'wppa_custom_fields', 'yes' );
2279	+ wppa_echo( '<b>' . __( 'Custom datafields enabled', 'wp-photo-album-plus').'</b><br>' );
2280	}
2281
2282	// Get the captions we already have

2353	}
2354
2355	if ( $is_db_table ) {
2356	+ wppa_echo( '<b>' . __( 'Processing db table', 'wp-photo-album-plus' ) . ' ' . $is_db_table . '</b><br>' );
2357	wppa_log( 'dbg', __( 'Processing db table', 'wp-photo-album-plus' ) . ' ' . $is_db_table );
2358	}
2359	else {
2360	+ wppa_echo( '<b>' . __( 'Processing', 'wp-photo-album-plus' ) . ' ' . basename( $file ) . '</b><br>' );
2361	wppa_log( 'dbg', __( 'Processing', 'wp-photo-album-plus' ) . ' ' . basename( $file ) );
2362	}
2363

2385	return;
2386	}
2387	fputs( $write_handle, $header );
2388	+ wppa_echo( __( 'Read header:', 'wp-photo-album-plus') . ' ' . $header . '<br>' );
2389
2390	// Is it a db table?
2391	if ( $is_db_table ) {

2731	$photos_skipped_csv++;
2732	$this_skipped++;
2733	}
2734	+ wppa_echo( '.' );
2735	}
2736
2737

2812	function wppa_wrong_value( $value, $field, $extra = '' ) {
2813	$message = htmlspecialchars( sprintf( __( 'Value %s is not valid for %s.', 'wp-photo-album-plus' ), $value, $field ) );
2814	if ( $extra ) {
2815	+ $message .= '<br>' . $extra;
2816	}
2817	+ $message .= '<br>' . __( 'This value is ignored.', 'wp-photo-album-plus' );
2818	wppa_error_message( $message );
2819	}
2820

3278	return '';
3279	}
3280
3281	+ $url = get_admin_url() . 'admin.php?page=wppa_admin_menu&tab=edit&wppa-nonce=' . wp_create_nonce( 'wppa-nonce', 'wppa-nonce' ) . '&edit-id=';
3282	$result = '
3283	<input
3284	type="button"
3285	+ value="' . esc_attr( __( 'Edit album', 'wp-photo-album-plus' ) ) . '"
3286	+ onclick="
3287	+ var albId = parseInt(jQuery(\'#'. $tagid .'\').val());
3288	+ if ( ! albId ) {
3289	+ alert(\'' . esc_js( __( 'No album specified', 'wp-photo-album-plus' ) ) . '\');
3290	+ }
3291	+ else {
3292	+ alert(\'' . esc_js( __( 'Connecting to album #', 'wp-photo-album-plus' ) ) . '\' + albId);
3293	+ document.location=\'' . $url . '\'+albId;
3294	+ }
3295	+ "
3296	/> ';
3297
3298	return $result;

wppa-init.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* This file loads required php files and contains all functions used in init actions.
6	*
7	- * Version 8.1.00.~~008~~
8	*/
9
10	/* LOAD SIDEBAR WIDGETS */
	@@ -239,11 +239,11 @@ function wppa_verify_multisite_config() {
239	if ( WPPA_MULTISITE_INDIVIDUAL ) return;
240
241	$errtxt = __('</strong><h3>WP Photo ALbum Plus Error message</h3>This is a multi site installation. One of the following 3 lines must be entered in wp-config.php:', 'wp-photo-album-plus');
242	- $errtxt .= __('<br ~~/><~~br ~~/><~~b>define( \'WPPA_MULTISITE_INDIVIDUAL\', true );</b> <small>// Multisite WP 3.5 or later with every site its own albums and photos</small>', 'wp-photo-album-plus');
243	- $errtxt .= __('<br ~~/><~~b>define( \'WPPA_MULTISITE_BLOGSDIR\', true );</b> <small>// Multisite prior to WP 3.5 with every site its own albums and photos</small>', 'wp-photo-album-plus');
244	- $errtxt .= __('<br ~~/><~~b>define( \'WPPA_MULTISITE_GLOBAL\', true );</b> <small>// Multisite with one common set of albums and photos</small>', 'wp-photo-album-plus');
245	- $errtxt .= __('<br ~~/><~~br />For more information see: <a href="https://wordpress.org/plugins/wp-photo-album-plus/faq/">the faq</a>', 'wp-photo-album-plus');
246	- $errtxt .= __('<br ~~/><~~br ~~/><~~em>If you upload photos, they will be placed in the wrong location and will not be visible for visitors!</em><strong>', 'wp-photo-album-plus');
247
248	wppa_error_message( $errtxt );
249	}
	@@ -352,12 +352,12 @@ function wppa_check_config_conflicts() {
352	global $wpdb;
353
354	$any = false;
355	- $text = __( 'WPPA detected the following configuration conflict(s)', 'wp-photo-album-plus' ) . '<br />';
356
357	// Direct comment/ratings
358	if ( wppa_switch( 'direct_comment' ) ) {
359	if ( ! wppa_switch( 'use_encrypted_links' ) \|\| ! wppa_switch( 'refuse_unencrypted' ) ) {
360	- $text .= '<br />' . __( 'Table IX-A14: Direct comment is activated. This requires Table IV-A6.1: Enable encrypted links and Table IV-A6.2: Refuse unencrypted to be activated.', 'wp-photo-album-plus' );
361	$any = true;
362	}
363	}
	@@ -373,7 +373,7 @@ function wppa_check_upload_logout() {
373
374	if ( wppa_switch( 'upload_logout' ) && ! wppa_switch( 'upload_moderate' ) && wppa_user_is( 'administrator' ) ) {
375	$text = __( 'Warning: Non logged in users can upload photos while uploads do not need to be moderated. This can lead to unwanted content on this website!', 'wp-photo-album-plus' ) .
376	- '<br />' . wppa_see_also( 'users', '1', '32' ) . ' ' . __( 'and', 'wp-photo-album-plus' ) . ' ' . wppa_see_also( 'admin', '2', '11' );
377	wppa_warning_message( $text );
378	}
379	}


4	*
5	* This file loads required php files and contains all functions used in init actions.
6	*
7	+ * Version 8.1.05.001
8	*/
9
10	/* LOAD SIDEBAR WIDGETS */

239	if ( WPPA_MULTISITE_INDIVIDUAL ) return;
240
241	$errtxt = __('</strong><h3>WP Photo ALbum Plus Error message</h3>This is a multi site installation. One of the following 3 lines must be entered in wp-config.php:', 'wp-photo-album-plus');
242	+ $errtxt .= __('<br><br><b>define( \'WPPA_MULTISITE_INDIVIDUAL\', true );</b> <small>// Multisite WP 3.5 or later with every site its own albums and photos</small>', 'wp-photo-album-plus');
243	+ $errtxt .= __('<br><b>define( \'WPPA_MULTISITE_BLOGSDIR\', true );</b> <small>// Multisite prior to WP 3.5 with every site its own albums and photos</small>', 'wp-photo-album-plus');
244	+ $errtxt .= __('<br><b>define( \'WPPA_MULTISITE_GLOBAL\', true );</b> <small>// Multisite with one common set of albums and photos</small>', 'wp-photo-album-plus');
245	+ $errtxt .= __('<br><br>For more information see: <a href="https://wordpress.org/plugins/wp-photo-album-plus/faq/">the faq</a>', 'wp-photo-album-plus');
246	+ $errtxt .= __('<br><br><em>If you upload photos, they will be placed in the wrong location and will not be visible for visitors!</em><strong>', 'wp-photo-album-plus');
247
248	wppa_error_message( $errtxt );
249	}

352	global $wpdb;
353
354	$any = false;
355	+ $text = __( 'WPPA detected the following configuration conflict(s)', 'wp-photo-album-plus' ) . '<br>';
356
357	// Direct comment/ratings
358	if ( wppa_switch( 'direct_comment' ) ) {
359	if ( ! wppa_switch( 'use_encrypted_links' ) \|\| ! wppa_switch( 'refuse_unencrypted' ) ) {
360	+ $text .= '<br>' . __( 'Table IX-A14: Direct comment is activated. This requires Table IV-A6.1: Enable encrypted links and Table IV-A6.2: Refuse unencrypted to be activated.', 'wp-photo-album-plus' );
361	$any = true;
362	}
363	}

373
374	if ( wppa_switch( 'upload_logout' ) && ! wppa_switch( 'upload_moderate' ) && wppa_user_is( 'administrator' ) ) {
375	$text = __( 'Warning: Non logged in users can upload photos while uploads do not need to be moderated. This can lead to unwanted content on this website!', 'wp-photo-album-plus' ) .
376	+ '<br>' . wppa_see_also( 'users', '1', '32' ) . ' ' . __( 'and', 'wp-photo-album-plus' ) . ' ' . wppa_see_also( 'admin', '2', '11' );
377	wppa_warning_message( $text );
378	}
379	}

wppa-input.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains functions for sanitizing and formatting user input
6	- * Version 8.1.04.~~002~~
7	*
8	*/
9
	@@ -463,5 +463,6 @@ function wppa_get_cookie( $name, $default = '' ) {
463	$result = $default;
464	}
465

466	return $result;
467	}


3	* Package: wp-photo-album-plus
4	*
5	* Contains functions for sanitizing and formatting user input
6	+ * Version 8.1.05.001
7	*
8	*/
9

463	$result = $default;
464	}
465
466	+ wppa_log('obs', 'Cookie '.$name.' value '.$result);
467	return $result;
468	}

wppa-items.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains functions to retrieve album and photo items
6	- * Version 8.1.03.~~002~~
7	*
8	*/
9
	@@ -261,7 +261,7 @@ function wppa_get_photo_name( $id, $xargs = array() ) {
261	if ( $args['showname'] ) {
262	if ( wppa_switch( 'owner_on_new_line' ) && wppa_opt( 'art_monkey_display' ) != 'button' ) {
263	if ( ! $args['escjs'] ) {
264	- $result .= '<br />';
265	}
266	else {
267	$result .= ' [br /]';


3	* Package: wp-photo-album-plus
4	*
5	* Contains functions to retrieve album and photo items
6	+ * Version 8.1.05.001
7	*
8	*/
9

261	if ( $args['showname'] ) {
262	if ( wppa_switch( 'owner_on_new_line' ) && wppa_opt( 'art_monkey_display' ) != 'button' ) {
263	if ( ! $args['escjs'] ) {
264	+ $result .= '<br>';
265	}
266	else {
267	$result .= ' [br /]';

wppa-mailing.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Contains mailing functions
6	*
7	- * Version 8.1.03.~~002~~
8	*
9	*/
10
	@@ -216,15 +216,15 @@ global $wpdb;
216
217	if ( $desc ) {
218	$content .=
219	- '<br ~~/><~~br />' . __( 'Description', 'wp-photo-album-plus' ) . ':<br ~~/><~~br />' .
220	'<blockquote style="color:#000077; background-color: #dddddd; border:1px solid black; padding: 6px; border-radius: 4px;" >' .
221	- '<em>' . $desc . '</em><br />' .
222	'</blockquote>';
223	}
224
225	if ( $link ) {
226	$content .=
227	- '<br />' .
228	sprintf( __( 'You can see the content %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&cover=1&occur=1' . '" >', '</a>' );
229	}
230
	@@ -309,7 +309,7 @@ global $wpdb;
309
310	// Preview
311	if ( $link ) {
312	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
313	}
314
315	// Process all subscribed users
	@@ -427,7 +427,7 @@ global $wpdb;
427
428	// Preview
429	if ( $link ) {
430	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
431	}
432
433	// Process all subscribed users
	@@ -491,7 +491,7 @@ global $wpdb;
491
492	// Preview
493	if ( $link ) {
494	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
495	}
496
497	if ( $user ) {
	@@ -557,7 +557,7 @@ global $wpdb;
557
558	// Preview
559	if ( $link ) {
560	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
561	}
562
563	wppa_send_mail( array( 'to' => $user->user_email,
	@@ -584,7 +584,7 @@ global $wpdb;
584
585	// Preview
586	if ( $link ) {
587	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
588	}
589
590	wppa_send_mail( array( 'to' => $author->user_email,
	@@ -650,7 +650,7 @@ global $wpdb;
650
651	// Preview
652	if ( $link ) {
653	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
654	}
655
656	// Process users
	@@ -706,16 +706,16 @@ global $wpdb;
706	$pho,
707	wppa_get_album_name( $alb ) );
708
709	- $cont .= '<br />' . __( 'This photo needs moderation', 'wp-photo-album-plus' );
710
711	// Preview
712	if ( $link ) {
713	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
714	}
715
716	// Moderate links
717	$cont .=
718	- '<br ~~/><~~a href="' . get_admin_url() . 'admin.php?page=wppa_moderate_photos&photo=' . $pho . '" >' .
719	__( 'Moderate photo admin' , 'wp-photo-album-plus') .
720	'</a>';
721
	@@ -789,12 +789,12 @@ global $wpdb;
789
790	// Preview
791	if ( $link ) {
792	- $cont .= '<br />' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
793	}
794
795	// Moderate links
796	$cont .=
797	- '<br ~~/><~~a href="' . get_admin_url() . 'admin.php?page=wppa_manage_comments&comment=' . $com . '" >' .
798	__( 'Moderate photo admin' , 'wp-photo-album-plus') .
799	'</a>';
800


4	*
5	* Contains mailing functions
6	*
7	+ * Version 8.1.05.001
8	*
9	*/
10

216
217	if ( $desc ) {
218	$content .=
219	+ '<br><br>' . __( 'Description', 'wp-photo-album-plus' ) . ':<br><br>' .
220	'<blockquote style="color:#000077; background-color: #dddddd; border:1px solid black; padding: 6px; border-radius: 4px;" >' .
221	+ '<em>' . $desc . '</em><br>' .
222	'</blockquote>';
223	}
224
225	if ( $link ) {
226	$content .=
227	+ '<br>' .
228	sprintf( __( 'You can see the content %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&cover=1&occur=1' . '" >', '</a>' );
229	}
230

309
310	// Preview
311	if ( $link ) {
312	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
313	}
314
315	// Process all subscribed users

427
428	// Preview
429	if ( $link ) {
430	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
431	}
432
433	// Process all subscribed users

491
492	// Preview
493	if ( $link ) {
494	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
495	}
496
497	if ( $user ) {

557
558	// Preview
559	if ( $link ) {
560	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
561	}
562
563	wppa_send_mail( array( 'to' => $user->user_email,

584
585	// Preview
586	if ( $link ) {
587	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
588	}
589
590	wppa_send_mail( array( 'to' => $author->user_email,

650
651	// Preview
652	if ( $link ) {
653	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
654	}
655
656	// Process users

706	$pho,
707	wppa_get_album_name( $alb ) );
708
709	+ $cont .= '<br>' . __( 'This photo needs moderation', 'wp-photo-album-plus' );
710
711	// Preview
712	if ( $link ) {
713	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
714	}
715
716	// Moderate links
717	$cont .=
718	+ '<br><a href="' . get_admin_url() . 'admin.php?page=wppa_moderate_photos&photo=' . $pho . '" >' .
719	__( 'Moderate photo admin' , 'wp-photo-album-plus') .
720	'</a>';
721

789
790	// Preview
791	if ( $link ) {
792	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' . '" >', '</a>' );
793	}
794
795	// Moderate links
796	$cont .=
797	+ '<br><a href="' . get_admin_url() . 'admin.php?page=wppa_manage_comments&comment=' . $com . '" >' .
798	__( 'Moderate photo admin' , 'wp-photo-album-plus') .
799	'</a>';
800

wppa-maintenance.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains (not yet, but in the future maybe) all the maintenance routines
6	- * Version 8.1.02.~~003~~
7	*
8	*/
9
	@@ -1338,14 +1338,14 @@ global $wppa_log_file;
1338	$rec = wppa_get_option( 'wppa_recursive_log', '' );
1339	if ( $rec ) {
1340	$result .= __( 'Recursive log detected', 'wp-photo-album-plus' ) . ': ' .
1341	- $rec . '<br ~~/><~~br />';
1342	}
1343
1344	$pre = wppa_get_option( 'wppa_last_error', '' );
1345	if ( $pre ) {
1346	$result .= __( 'Last pre-initialisation error', '' ) . ': ' .
1347	str_replace( array( '{', '}' ), array( '<', '>' ), $pre ) .
1348	- '<br ~~/><~~br />';
1349	}
1350
1351	if ( ! wppa_is_file( $wppa_log_file ) ) {
	@@ -1354,7 +1354,7 @@ global $wppa_log_file;
1354	else {
1355	$data = wppa_get_contents_array( $wppa_log_file );
1356	$data = implode( '', array_reverse( $data ) );
1357	- $data = str_replace( array( '{b}', '{/b}', '{i}', '{/i}', "\n", '{span', '{/span}', '" }', '{}' ), array( '<b>', '</b>', '<i>', '</i>', '<br />', '<span', '</span>', '" >', '<>' ), $data );
1358	$result .= $data;
1359	}
1360
	@@ -1467,19 +1467,19 @@ global $wppa_log_file;
1467	if ( is_array( $data ) ) foreach ( array_keys( $data ) as $key ) {
1468	if ( $key != 'uris' ) {
1469	if ( is_array( $data[$key] ) ) {
1470	- $result .= '['.$key.'] => Array(<br />';
1471	foreach( array_keys($data[$key]) as $k ) {
1472	- $result .= ' ' . $k . ' = ' . $data[$key][$k] . '<br />';
1473	}
1474	$result .=
1475	- ')<br />';
1476	}
1477	elseif ( is_object( $data[$key] ) ) {
1478	$temp = var_export( $data[$key], true );
1479	$result .= '['.$key.'] => ' . $temp;
1480	}
1481	else {
1482	- $result .= '['.$key.'] => '.$data[$key].'<br />';
1483	}
1484	}
1485	}
	@@ -1489,7 +1489,7 @@ global $wppa_log_file;
1489	<td style="border-bottom:1px solid gray;" >';
1490	if ( is_array( $data['uris'] ) ) {
1491	foreach ( $data['uris'] as $uri ) {
1492	- $result .= $uri.'<br />';
1493	}
1494	}
1495	$result .= '


3	* Package: wp-photo-album-plus
4	*
5	* Contains (not yet, but in the future maybe) all the maintenance routines
6	+ * Version 8.1.05.001
7	*
8	*/
9

1338	$rec = wppa_get_option( 'wppa_recursive_log', '' );
1339	if ( $rec ) {
1340	$result .= __( 'Recursive log detected', 'wp-photo-album-plus' ) . ': ' .
1341	+ $rec . '<br><br>';
1342	}
1343
1344	$pre = wppa_get_option( 'wppa_last_error', '' );
1345	if ( $pre ) {
1346	$result .= __( 'Last pre-initialisation error', '' ) . ': ' .
1347	str_replace( array( '{', '}' ), array( '<', '>' ), $pre ) .
1348	+ '<br><br>';
1349	}
1350
1351	if ( ! wppa_is_file( $wppa_log_file ) ) {

1354	else {
1355	$data = wppa_get_contents_array( $wppa_log_file );
1356	$data = implode( '', array_reverse( $data ) );
1357	+ $data = str_replace( array( '{b}', '{/b}', '{i}', '{/i}', "\n", '{span', '{/span}', '" }', '{}' ), array( '<b>', '</b>', '<i>', '</i>', '<br>', '<span', '</span>', '" >', '<>' ), $data );
1358	$result .= $data;
1359	}
1360

1467	if ( is_array( $data ) ) foreach ( array_keys( $data ) as $key ) {
1468	if ( $key != 'uris' ) {
1469	if ( is_array( $data[$key] ) ) {
1470	+ $result .= '['.$key.'] => Array(<br>';
1471	foreach( array_keys($data[$key]) as $k ) {
1472	+ $result .= ' ' . $k . ' = ' . $data[$key][$k] . '<br>';
1473	}
1474	$result .=
1475	+ ')<br>';
1476	}
1477	elseif ( is_object( $data[$key] ) ) {
1478	$temp = var_export( $data[$key], true );
1479	$result .= '['.$key.'] => ' . $temp;
1480	}
1481	else {
1482	+ $result .= '['.$key.'] => '.$data[$key].'<br>';
1483	}
1484	}
1485	}

1489	<td style="border-bottom:1px solid gray;" >';
1490	if ( is_array( $data['uris'] ) ) {
1491	foreach ( $data['uris'] as $uri ) {
1492	+ $result .= $uri.'<br>';
1493	}
1494	}
1495	$result .= '

wppa-multitag-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the multitag widget
6	- * Version 8.0.08.~~006~~
7	*
8	*/
9
	@@ -123,7 +123,7 @@ class MultitagPhotos extends WP_Widget {
123	echo
124	'<p style="word-break:break-all;" >' .
125	__( 'Currently selected tags', 'wp-photo-album-plus' ) . ':' .
126	- '<br />' .
127	'<b>' .
128	$s .
129	'</b>' .


3	* Package: wp-photo-album-plus
4	*
5	* display the multitag widget
6	+ * Version 8.1.05.001
7	*
8	*/
9

123	echo
124	'<p style="word-break:break-all;" >' .
125	__( 'Currently selected tags', 'wp-photo-album-plus' ) . ':' .
126	+ '<br>' .
127	'<b>' .
128	$s .
129	'</b>' .

wppa-notify-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* notify events to users
6	- * Version 8.0.08.001
7	*/
8
9	class wppaNotifyWidget extends WP_Widget {
	@@ -33,7 +33,7 @@ class wppaNotifyWidget extends WP_Widget {
33
34	// Make the widget content
35	$widget_content = '<!-- WPPA+ notify Widget start -->';
36	- $widget_content .= __( 'Notify me when...', 'wp-photo-album-plus' ) . '<br />';
37
38	// Get the body of the widget
39	$body = '';


3	* Package: wp-photo-album-plus
4	*
5	* notify events to users
6	+ * Version 8.1.05.001
7	*/
8
9	class wppaNotifyWidget extends WP_Widget {

33
34	// Make the widget content
35	$widget_content = '<!-- WPPA+ notify Widget start -->';
36	+ $widget_content .= __( 'Notify me when...', 'wp-photo-album-plus' ) . '<br>';
37
38	// Get the body of the widget
39	$body = '';

wppa-photo-admin-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* edit and delete photos
6	- * Version 8.1.04.~~003~~
7	*
8	*/
9
	@@ -645,7 +645,7 @@ function wppaToggleExif( id, count ) {
645	'controls' => true
646	) );
647	wppa_echo( '
648	- <br />' .
649	( $audio ? $audio :
650	'<span style="color:red">' .
651	esc_html__( 'Audio disabled', 'wp-photo-album-plus' ) .
	@@ -838,7 +838,7 @@ function wppaToggleExif( id, count ) {
838	// }
839
840	// Status
841	- wppa_echo( '<br />' .
842	__( 'Status:' , 'wp-photo-album-plus') . ' ', 'post' );
843	if ( ( current_user_can( 'wppa_admin' ) \|\| current_user_can( 'wppa_moderate' ) ) ) {
844	if ( wppa_switch( 'ext_status_restricted' ) && ! wppa_user_is( 'administrator' ) ) {
	@@ -934,7 +934,7 @@ function wppaToggleExif( id, count ) {
934	'</span>', 'post' );
935
936	// New Line
937	- wppa_echo( '<br />', 'post' );
938
939	// --- Available files ---
940	wppa_echo(
	@@ -1042,7 +1042,7 @@ function wppaToggleExif( id, count ) {
1042	}
1043
1044	// New line
1045	- wppa_echo( '<br />', 'post' );
1046
1047	// Video
1048	if ( $b_is_video ) {
	@@ -1815,7 +1815,7 @@ function wppaToggleExif( id, count ) {
1815	' onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'name\', this.value)"' .
1816	' value="' . esc_attr( stripslashes( $name ) ) . '"' .
1817	' />
1818	- <br />
1819	<span style="float:right">' .
1820	__( 'Name slug', 'wp-photo-album-plus' ) . ': ' . $sname . '
1821	</span>
	@@ -1877,7 +1877,7 @@ function wppaToggleExif( id, count ) {
1877	( $allowed ? '' : ' readonly="readonly"' ) .
1878	' />' .
1879	( $allowed ?
1880	- '<br />' .
1881	'<span class="description">' .
1882	__( 'Separate tags with commas.', 'wp-photo-album-plus') .
1883	'</span>' : '' ) .
	@@ -2026,7 +2026,7 @@ function wppaToggleExif( id, count ) {
2026	' />' );
2027	if ( current_user_can( 'wppa_settings' ) ) {
2028	wppa_echo(
2029	- '<br />' .
2030	'<span class="description">' .
2031	__( 'If you want this link to be used, check \'PS Overrule\' checkbox in table VI.' , 'wp-photo-album-plus') .
2032	'</span>', 'post' );
	@@ -2635,7 +2635,7 @@ function wppaTryMove( id, video ) {
2635	<input type="submit" onclick="return wppaBulkDoitOnClick()" class="button-primary" value="<?php _e( 'Doit!' , 'wp-photo-album-plus') ?>" />
2636	<?php
2637	if ( wppa_is_mobile() ) {
2638	- wppa_echo( '<br />', 'post' );
2639	}
2640	?>
2641	<?php $nextafterselhtml =
	@@ -2646,7 +2646,7 @@ function wppaTryMove( id, video ) {
2646	'</select>';
2647	wppa_echo( sprintf( __( 'Go to %s after Doit!.', 'wp-photo-album-plus'), $nextafterselhtml ) );
2648	if ( wppa_is_mobile() ) {
2649	- wppa_echo( '<br />', 'post' );
2650	}
2651	?>
2652
	@@ -2723,7 +2723,7 @@ function wppaTryMove( id, video ) {
2723	>' .
2724	$photo['id'] . '
2725	</a>
2726	- <br />
2727	<a
2728	id="wppa-delete-' . $photo['id'] . '"
2729	onclick="wppaConfirmAndDelete(' . $photo['id'] . ')"
	@@ -2782,14 +2782,14 @@ function wppaTryMove( id, video ) {
2782	<!-- Size -->
2783	<?php
2784	if ( wppa_is_video( $photo['id'] ) ) {
2785	- wppa_echo( '<br />'.strval(intval(wppa_get_videox( $photo['id'] ))).' x '.strval(intval(wppa_get_videoy( $photo['id'] ))).' px.', 'post' );
2786	}
2787	else {
2788	$sp = wppa_get_source_path( $photo['id'] );
2789	if ( is_file( $sp ) ) {
2790	$ima = getimagesize( $sp );
2791	if ( is_array( $ima ) ) {
2792	- wppa_echo( '<br />'.$ima['0'].' x '.$ima['1'].' px.', 'post' );
2793	}
2794	}
2795	}
	@@ -2812,7 +2812,7 @@ function wppaTryMove( id, video ) {
2812	}
2813
2814	wppa_echo(
2815	- '<br />' . __( 'Target album for move to:', 'wp-photo-album-plus' ) . '<br />' .
2816	'<select' .
2817	' id="target-' . $id . '"' .
2818	' onchange="wppaTryMove(' . $id . ', ' . ( wppa_is_video( $id ) ? 'true' : 'false' ) . ')"' .


3	* Package: wp-photo-album-plus
4	*
5	* edit and delete photos
6	+ * Version 8.1.05.001
7	*
8	*/
9

645	'controls' => true
646	) );
647	wppa_echo( '
648	+ <br>' .
649	( $audio ? $audio :
650	'<span style="color:red">' .
651	esc_html__( 'Audio disabled', 'wp-photo-album-plus' ) .

838	// }
839
840	// Status
841	+ wppa_echo( '<br>' .
842	__( 'Status:' , 'wp-photo-album-plus') . ' ', 'post' );
843	if ( ( current_user_can( 'wppa_admin' ) \|\| current_user_can( 'wppa_moderate' ) ) ) {
844	if ( wppa_switch( 'ext_status_restricted' ) && ! wppa_user_is( 'administrator' ) ) {

934	'</span>', 'post' );
935
936	// New Line
937	+ wppa_echo( '<br>', 'post' );
938
939	// --- Available files ---
940	wppa_echo(

1042	}
1043
1044	// New line
1045	+ wppa_echo( '<br>', 'post' );
1046
1047	// Video
1048	if ( $b_is_video ) {

1815	' onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'name\', this.value)"' .
1816	' value="' . esc_attr( stripslashes( $name ) ) . '"' .
1817	' />
1818	+ <br>
1819	<span style="float:right">' .
1820	__( 'Name slug', 'wp-photo-album-plus' ) . ': ' . $sname . '
1821	</span>

1877	( $allowed ? '' : ' readonly="readonly"' ) .
1878	' />' .
1879	( $allowed ?
1880	+ '<br>' .
1881	'<span class="description">' .
1882	__( 'Separate tags with commas.', 'wp-photo-album-plus') .
1883	'</span>' : '' ) .

2026	' />' );
2027	if ( current_user_can( 'wppa_settings' ) ) {
2028	wppa_echo(
2029	+ '<br>' .
2030	'<span class="description">' .
2031	__( 'If you want this link to be used, check \'PS Overrule\' checkbox in table VI.' , 'wp-photo-album-plus') .
2032	'</span>', 'post' );

2635	<input type="submit" onclick="return wppaBulkDoitOnClick()" class="button-primary" value="<?php _e( 'Doit!' , 'wp-photo-album-plus') ?>" />
2636	<?php
2637	if ( wppa_is_mobile() ) {
2638	+ wppa_echo( '<br>', 'post' );
2639	}
2640	?>
2641	<?php $nextafterselhtml =

2646	'</select>';
2647	wppa_echo( sprintf( __( 'Go to %s after Doit!.', 'wp-photo-album-plus'), $nextafterselhtml ) );
2648	if ( wppa_is_mobile() ) {
2649	+ wppa_echo( '<br>', 'post' );
2650	}
2651	?>
2652

2723	>' .
2724	$photo['id'] . '
2725	</a>
2726	+ <br>
2727	<a
2728	id="wppa-delete-' . $photo['id'] . '"
2729	onclick="wppaConfirmAndDelete(' . $photo['id'] . ')"

2782	<!-- Size -->
2783	<?php
2784	if ( wppa_is_video( $photo['id'] ) ) {
2785	+ wppa_echo( '<br>'.strval(intval(wppa_get_videox( $photo['id'] ))).' x '.strval(intval(wppa_get_videoy( $photo['id'] ))).' px.', 'post' );
2786	}
2787	else {
2788	$sp = wppa_get_source_path( $photo['id'] );
2789	if ( is_file( $sp ) ) {
2790	$ima = getimagesize( $sp );
2791	if ( is_array( $ima ) ) {
2792	+ wppa_echo( '<br>'.$ima['0'].' x '.$ima['1'].' px.', 'post' );
2793	}
2794	}
2795	}

2812	}
2813
2814	wppa_echo(
2815	+ '<br>' . __( 'Target album for move to:', 'wp-photo-album-plus' ) . '<br>' .
2816	'<select' .
2817	' id="target-' . $id . '"' .
2818	' onchange="wppaTryMove(' . $id . ', ' . ( wppa_is_video( $id ) ? 'true' : 'false' ) . ')"' .

wppa-potd-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the photo of the day widget
6	- * Version 8.0.08.~~006~~
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -192,7 +192,7 @@ class PhotoOfTheDay extends WP_Widget {
192	'<div class="wppa-widget-text wppa-potd-text" >' .
193	'<span class="potd-pname" >' . wppa_get_photo_name( $id ) . '</span>' .
194	'<span class="pots-pdesc" >' . wppa_get_photo_desc( $id ) . '</span>' .
195	- '<br />' .
196	'<span class="potd-adesc" >' . wppa_get_album_desc( $alb ) . '</span>' .
197	'<span class="potd-aname" >' . wppa_get_album_name( $alb ) . '</span>' .
198	'</div>';


3	* Package: wp-photo-album-plus
4	*
5	* display the photo of the day widget
6	+ * Version 8.1.05.001
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

192	'<div class="wppa-widget-text wppa-potd-text" >' .
193	'<span class="potd-pname" >' . wppa_get_photo_name( $id ) . '</span>' .
194	'<span class="pots-pdesc" >' . wppa_get_photo_desc( $id ) . '</span>' .
195	+ '<br>' .
196	'<span class="potd-adesc" >' . wppa_get_album_desc( $alb ) . '</span>' .
197	'<span class="potd-aname" >' . wppa_get_album_name( $alb ) . '</span>' .
198	'</div>';

wppa-scripts.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* This file contains all functions for activating javascript
6	*
7	- * Version 8.1.04.~~004~~
8	*/
9
10	// Place all wppa related js declarations in the header, both admin and frontend


4	*
5	* This file contains all functions for activating javascript
6	*
7	+ * Version 8.1.05.001
8	*/
9
10	// Place all wppa related js declarations in the header, both admin and frontend

wppa-setting-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.1.02.~~005~~
7	*
8	*/
9
	@@ -140,7 +140,7 @@ function wppa_edit( $xslug, $value, $width = '90%', $minwidth = '', $text = '',
140	return $html;
141	}
142
143	- function wppa_textarea($xslug, $buttonlabel = '' ) {
144
145	$slug = substr( $xslug, 5 );
146
	@@ -148,7 +148,12 @@ function wppa_textarea($xslug, $buttonlabel = '' ) {
148	$title = wppa_switch( 'enable_shortcode_wppa_set' ) ? ' title="'.esc_attr( $tit ).'"' : '';
149
150	$html = '<textarea id="'.esc_attr($slug).'"'.$title.' style="float:left; width:300px;" onchange="wppaAjaxUpdateOptionValue(\''.$slug.'\', this)" >';
151	- ~~$html~~ ~~.= esc_textarea~~( ~~stripslashes( wppa_opt(~~ $~~slug~~ )~~));~~





152	$html .= '</textarea>';
153
154	$html .= '<img id="img_'.$slug.'" src="'.wppa_get_imgdir().'star.ico" title="'.__('Setting unmodified', 'wp-photo-album-plus').'" style="padding:0 4px; float:left; height:16px; width:16px;" />';
	@@ -769,7 +774,7 @@ global $wppa_setting_error;
769
770	if ( ! $no_default ) {
771	if ( $slugs && wppa_dflt($slugs[0]) ) {
772	- $helptext .= '<br />' . __( 'The default for this setting is:', 'wp-photo-album-plus' );
773	if ( count($slugs) == 1) {
774	if ( $slugs[0] != '' ) {
775	$helptext .= ' '.htmlspecialchars(wppa_dflt($slugs[0]));


3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	+ * Version 8.1.05.001
7	*
8	*/
9

140	return $html;
141	}
142
143	+ function wppa_textarea($xslug, $buttonlabel = '', $repair_php = false ) {
144
145	$slug = substr( $xslug, 5 );
146

148	$title = wppa_switch( 'enable_shortcode_wppa_set' ) ? ' title="'.esc_attr( $tit ).'"' : '';
149
150	$html = '<textarea id="'.esc_attr($slug).'"'.$title.' style="float:left; width:300px;" onchange="wppaAjaxUpdateOptionValue(\''.$slug.'\', this)" >';
151	+ if ( $repair_php ) {
152	+ $html .= str_replace( ['<?php', '<?PHP', '<?php'], '', esc_textarea( stripslashes( wppa_opt( $slug ) ) ) );
153	+ }
154	+ else {
155	+ $html .= esc_textarea( stripslashes( wppa_opt( $slug )));
156	+ }
157	$html .= '</textarea>';
158
159	$html .= '<img id="img_'.$slug.'" src="'.wppa_get_imgdir().'star.ico" title="'.__('Setting unmodified', 'wp-photo-album-plus').'" style="padding:0 4px; float:left; height:16px; width:16px;" />';

774
775	if ( ! $no_default ) {
776	if ( $slugs && wppa_dflt($slugs[0]) ) {
777	+ $helptext .= '<br>' . __( 'The default for this setting is:', 'wp-photo-album-plus' );
778	if ( count($slugs) == 1) {
779	if ( $slugs[0] != '' ) {
780	$helptext .= ' '.htmlspecialchars(wppa_dflt($slugs[0]));

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.1.04.~~002~~
7	*
8	*/
9
	@@ -269,7 +269,7 @@ global $wppa_subtab_names;
269	}
270	else {
271	wppa_ok_message( 'Not yet Done! wppa_delete_all_from_cloudinary' .
272	- '<br />Please restart' );
273	}
274	break;
275
	@@ -280,7 +280,7 @@ global $wppa_subtab_names;
280	}
281	else {
282	wppa_ok_message( 'Not yet Done! wppa_delete_derived_from_cloudinary' .
283	- '<br />Please restart' );
284	}
285	break;
286
	@@ -319,7 +319,7 @@ global $wppa_subtab_names;
319	__( 'Filesystem method:', 'wp-photo-album-plus' ) . ' ' . get_filesystem_method();
320	}
321	echo '
322	- <br />';
323
324	if ( is_multisite() ) {
325	if ( WPPA_MULTISITE_GLOBAL ) {
	@@ -383,9 +383,9 @@ global $wppa_subtab_names;
383	if ( wppa_opt( 'photo_admin_max_albums' ) ) { // Not OFF
384	$abs = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_albums" );
385	if ( wppa_opt( 'photo_admin_max_albums' ) < $abs ) {
386	- wppa_warning_message( __( 'This system contains more albums than the maximum configured.', 'wp-photo-album-plus' ) . wppa_see_also( 'admin', '6', '6' ) . '<br />' .
387	__( 'No problem, but some widgets may not work and some album selectionboxes will revert to a simple input field asking for an album id.', 'wp-photo-album-plus' ) . ' ' .
388	- __( 'If you do not have pageload performance problems, you may increase the number number configured.', 'wp-photo-album-plus' ) . '<br />' .
389	__( 'If there are many empty albums, you can simply remove them by running the appropriate maintenance routine.', 'wp-photo-album-plus' ) . wppa_see_also( 'maintenance', '2', '9' ) );
390	}
391	}
	@@ -393,24 +393,24 @@ global $wppa_subtab_names;
393	// Check for availability of hires urls in case panorama is on
394	if ( wppa_switch( 'enable_panorama' ) ) {
395	if ( ! wppa_switch( 'keep_source' ) ) {
396	- wppa_warning_message( __( 'You enabled the display of complex panoramic photos', 'wp-photo-album-plus' ) . wppa_see_also( 'photos', '1', '3' ) . '<br />' .
397	__( 'It is strongly recommended that you save sourcefiles during upload in order to preserve resolution.', 'wp-photo-album-plus' ) . wppa_see_also( 'files', '1', '1', '', '', true ) );
398	}
399	}
400
401	// Check on configuration when Grid covertype has been selected.
402	if ( wppa_opt( 'cover_type' ) == 'grid' ) {
403	- $stdmsg = __( 'You selected covertype "Grid with images only".', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '3', '4' ) . '<br />' .
404	- __( 'To assure proper layout, please correct the following configuration issues.', 'wp-photo-album-plus' ) . '<br />';
405	$message = $stdmsg;
406	$doit = false;
407	if ( wppa_opt( 'max_cover_width' ) > wppa_opt( 'smallsize' ) ) {
408	- $msg = __( 'Max Cover width may not be larger than Coverphoto size', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '1', '1.7', '', '', true ) . '<br />';
409	$message .= $msg;
410	$doit = true;
411	}
412	if ( wppa_opt( 'thumb_aspect' ) == '0:0:none' && ! ( wppa_switch( 'cover_use_thumb' ) ) ) {
413	- $msg = __( 'Thumbnail Aspect may not be set to "--- same as fullsize ---"','wp-photo-album-plus') . wppa_see_also( 'thumbs', '1', '3', '', '', true ) . '<br />' .
414	__( 'Alternatively you can activate Use thumb on cover', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '3', '8' );
415	$message .= $msg;
416	$doit = true;
	@@ -426,25 +426,25 @@ global $wppa_subtab_names;
426
427	$result = wppa_search_magick();
428	$mes = __('Image Magick is detected on your server', 'wp-photo-album-plus') . '. ';
429	- $mes .= __('To be able to use the most advanced features of WPPA, the Imagic shellcommand <b>convert</b> must be available', 'wp-photo-album-plus') . '.<br />';
430
431	// Shell command found
432	if ( ! empty( $result ) ) {
433	- $mes .= __('This command is found on the following file system locations', 'wp-photo-album-plus') . ':<br />';
434	foreach ( $result as $item ) {
435	- $mes .= $item[0] . '<br />';
436	}
437	update_option( 'wppa_image_magick', $result[0][0] );
438	$wppa_opt['wppa_image_magick'] = $result[0][0];
439	- $mes .= sprintf( __('The location <b>%s</b> has been activated.', 'wp-photo-album-plus'), $result[0][0] ) . wppa_see_also( 'miscadv', '3', '13' ) . '<br />';
440	- $mes .= __('You may change it into a different path that contains the Imagick <b>convert</b> command at any time', 'wp-photo-album-plus') . '.<br />';
441	$mes .= __('To disable ImageMagick, enter <b>none</b>', 'wp-photo-album-plus');
442	}
443
444	// Shell command not found
445	else {
446	$mes .= __('The Imagick shellcommand <b>convert</b> could not be detected.', 'wp-photo-album-plus') . '<br >';
447	- $mes .= __('Ask your hosting provider for the absolute path to this command if it is available', 'wp-photo-album-plus') . '<br />';
448	}
449
450	wppa_ok_message($mes);
	@@ -1025,8 +1025,8 @@ global $wppa_subtab_names;
1025	$name = __('Separator', 'wp-photo-album-plus');
1026	$desc = __('Breadcrumb separator symbol.', 'wp-photo-album-plus');
1027	$help = __('Select the desired breadcrumb separator element.', 'wp-photo-album-plus');
1028	- $help .= '<br />'.__('A text string may contain valid html.', 'wp-photo-album-plus');
1029	- $help .= '<br />'.__('An image will be scaled automatically if you set the navigation font size.', 'wp-photo-album-plus');
1030	$slug = 'wppa_bc_separator';
1031	$opts = array('&raquo', '&rsaquo', '&gt', '&bull', __('Text (html):', 'wp-photo-album-plus'), __('Image (url):', 'wp-photo-album-plus'));
1032	$vals = array('raquo', 'rsaquo', 'gt', 'bull', 'txt', 'url');
	@@ -1036,7 +1036,7 @@ global $wppa_subtab_names;
1036	$name = __('Html', 'wp-photo-album-plus');
1037	$desc = __('Breadcrumb separator text.', 'wp-photo-album-plus');
1038	$help = __('Enter the HTML code that produces the separator symbol you want.', 'wp-photo-album-plus');
1039	- $help .= '<br />'.__('It may be as simple as \'-\' (without the quotes) or as complex as a tag like <div>..</div>.', 'wp-photo-album-plus');
1040	$slug = 'wppa_bc_txt';
1041	$html = wppa_input($slug, '90%', '300px');
1042	wppa_setting_new($slug, '15', $name, $desc, $html, $help);
	@@ -1533,7 +1533,7 @@ global $wppa_subtab_names;
1533	$name = __('Max Cover width', 'wp-photo-album-plus');
1534	$desc = __('Maximum width for a album cover display.', 'wp-photo-album-plus');
1535	$help = __('Display covers in 2 or more columns if the display area is wider than the given width.', 'wp-photo-album-plus');
1536	- $help .= '<br />'.__('This also applies for \'thumbnails as covers\', and will NOT apply to single items.', 'wp-photo-album-plus');
1537	$slug = 'wppa_max_cover_width';
1538	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1539	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -1548,8 +1548,8 @@ global $wppa_subtab_names;
1548	$name = __('Min Text frame height', 'wp-photo-album-plus');
1549	$desc = __('The minimal cover text frame height incl header.', 'wp-photo-album-plus');
1550	$help = __('The height starting with the album title up to and including the view- and the slideshow- links.', 'wp-photo-album-plus');
1551	- $help .= '<br />'.__('This setting enables you to give the album covers the same height while the title does not need to fit on one line.', 'wp-photo-album-plus');
1552	- $help .= '<br />'.__('This is the recommended setting to line-up your covers!', 'wp-photo-album-plus');
1553	$slug = 'wppa_head_and_text_frame_height';
1554	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1555	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -1557,9 +1557,9 @@ global $wppa_subtab_names;
1557	$name = __('Min Description height', 'wp-photo-album-plus');
1558	$desc = __('The minimal height of the album description text frame.', 'wp-photo-album-plus');
1559	$help = __('The minimal height of the description field in an album cover display.', 'wp-photo-album-plus');
1560	- $help .= '<br />'.__('This setting enables you to give the album covers the same height provided that the cover images are equally sized and the titles fit on one line.', 'wp-photo-album-plus');
1561	- $help .= '<br />'.__('To force the coverphotos have equal heights, tick the box in <b>Albums -> I -> Size is height</b>', 'wp-photo-album-plus');
1562	- $help .= '<br />'.__('You may need this setting if changing the previous setting is not sufficient to line-up the covers.', 'wp-photo-album-plus');
1563	$slug = 'wppa_text_frame_height';
1564	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1565	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
	@@ -1577,7 +1577,7 @@ global $wppa_subtab_names;
1577	$name = __('Coverphoto size', 'wp-photo-album-plus');
1578	$desc = __('The size of the coverphoto.', 'wp-photo-album-plus');
1579	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1580	- $help .= '<br />'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1581	$slug = 'wppa_smallsize';
1582	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1583	wppa_setting_new($slug, '6', $name, $desc, $html, $help, ! wppa_switch( 'coverphoto_responsive' ));
	@@ -1585,7 +1585,7 @@ global $wppa_subtab_names;
1585	$name = __('Coverphoto size', 'wp-photo-album-plus');
1586	$desc = __('The size of the coverphoto.', 'wp-photo-album-plus');
1587	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1588	- $help .= '<br />'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1589	$slug = 'wppa_smallsize_percentage';
1590	$html = wppa_input($slug, '40px', '', __('percent', 'wp-photo-album-plus'));
1591	wppa_setting_new($slug, '7', $name, $desc, $html, $help, wppa_switch( 'coverphoto_responsive' ));
	@@ -1593,7 +1593,7 @@ global $wppa_subtab_names;
1593	$name = __('Coverphoto size multi', 'wp-photo-album-plus');
1594	$desc = __('The size of coverphotos if more than one.', 'wp-photo-album-plus');
1595	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1596	- $help .= '<br />'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1597	$slug = 'wppa_smallsize_multi';
1598	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1599	wppa_setting_new($slug, '8', $name, $desc, $html, $help, ! wppa_switch( 'coverphoto_responsive' ));
	@@ -1601,7 +1601,7 @@ global $wppa_subtab_names;
1601	$name = __('Coverphoto size multi', 'wp-photo-album-plus');
1602	$desc = __('The size of coverphotos if more than one.', 'wp-photo-album-plus');
1603	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1604	- $help .= '<br />'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1605	$slug = 'wppa_smallsize_multi_percentage';
1606	$html = wppa_input($slug, '40px', '', __('percent', 'wp-photo-album-plus'));
1607	wppa_setting_new($slug, '9', $name, $desc, $html, $help, wppa_switch( 'coverphoto_responsive' ));
	@@ -1609,8 +1609,8 @@ global $wppa_subtab_names;
1609	$name = __('Size is height', 'wp-photo-album-plus');
1610	$desc = __('The size of the coverphoto is the height of it.', 'wp-photo-album-plus');
1611	$help = __('If set: the previous setting is the height, if unset: the largest of width and height.', 'wp-photo-album-plus');
1612	- $help .= '<br />'.__('This setting applies for coverphoto position top or bottom only (<b>Albums -> III -> Placement</b>).', 'wp-photo-album-plus');
1613	- $help .= '<br />'.__('This makes it easyer to make the covers of equal height.', 'wp-photo-album-plus');
1614	$slug = 'wppa_coversize_is_height';
1615	$html = wppa_checkbox($slug);
1616	wppa_setting_new($slug, '10', $name, $desc, $html, $help);
	@@ -1654,8 +1654,8 @@ global $wppa_subtab_names;
1654	$name = __('Slideshow/Browse', 'wp-photo-album-plus');
1655	$desc = __('Display the Slideshow / Browse photos link on album covers', 'wp-photo-album-plus');
1656	$help = __('This setting causes the Slideshow link to be displayed on the album cover.', 'wp-photo-album-plus');
1657	- $help .= '<br />'.__('If slideshows are disabled in item 2 in this table, you will see a browse link to fullsize images.', 'wp-photo-album-plus');
1658	- $help .= '<br />'.__('If you do not want the browse link either, uncheck this item.', 'wp-photo-album-plus');
1659	$slug = 'wppa_show_slideshowbrowselink';
1660	$html = wppa_checkbox($slug);
1661	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -1728,8 +1728,8 @@ global $wppa_subtab_names;
1728	$name = __('Placement', 'wp-photo-album-plus');
1729	$desc = __('Cover image position.', 'wp-photo-album-plus');
1730	$help = __('Enter the position that you want to be used for the default album cover selected in <b>Albums -> III -> Cover type</b>', 'wp-photo-album-plus');
1731	- $help .= '<br />'.__('For covertype Image Factory: left will be treated as top and right will be treted as bottom.', 'wp-photo-album-plus');
1732	- $help .= '<br />'.__('For covertype Long Descriptions: top will be treated as left and bottom will be treted as right.', 'wp-photo-album-plus');
1733	$slug = 'wppa_coverphoto_pos';
1734	$opts = array(__('Left', 'wp-photo-album-plus'), __('Right', 'wp-photo-album-plus'), __('Top', 'wp-photo-album-plus'), __('Bottom', 'wp-photo-album-plus'));
1735	$vals = array('left', 'right', 'top', 'bottom');
	@@ -1753,7 +1753,7 @@ global $wppa_subtab_names;
1753	$name = __('Cover type', 'wp-photo-album-plus');
1754	$desc = __('Select the default cover type.', 'wp-photo-album-plus');
1755	$help = __('Types with the addition mcr are suitable for Multi Column in a Responsive theme', 'wp-photo-album-plus');
1756	- $help .= '<br />'.__("Type 'Grid with images only' is always responsive and requires a fixed aspect ratio selected for thumbnails in <b>Thumbnails -> I -> Thumbnail Aspect</b>", 'wp-photo-album-plus');
1757	$slug = 'wppa_cover_type';
1758	$opts = array( __('Standard', 'wp-photo-album-plus'),
1759	__('Long Descriptions', 'wp-photo-album-plus'),
	@@ -1904,7 +1904,7 @@ global $wppa_subtab_names;
1904	$name = __('Size', 'wp-photo-album-plus');
1905	$desc = __('Specify the size (width) of the image.', 'wp-photo-album-plus');
1906	$help = __('Use the same syntax as in the [wppa size=".."] shortcode', 'wp-photo-album-plus');
1907	- $help .= '<br />'.__('Examples: 350 for a fixed width of 350 pixels, or: 0.75 for a responsive display of 75% width, or: auto,350 for responsive with a maximum of 350 pixels.', 'wp-photo-album-plus');
1908	$slug = 'wppa_photo_shortcode_size';
1909	$html = wppa_input($slug, '300px');
1910	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -1929,7 +1929,7 @@ global $wppa_subtab_names;
1929	$name = __('Fe type', 'wp-photo-album-plus');
1930	$desc = __('Frontend editor shortcode generator output type', 'wp-photo-album-plus');
1931	$help = __( 'If you want to use the shortcode generator in frontend tinymce editors, select if you want the shortcode or the html to be entered in the post', 'wp-photo-album-plus');
1932	- $help .= '<br />'.__('Select \'html\' if the inserted shortcode not is converted to the photo', 'wp-photo-album-plus');
1933	$slug = 'wppa_photo_shortcode_fe_type';
1934	$opts = array( __('--- none ---', 'wp-photo-album-plus'),
1935	__('shortcode', 'wp-photo-album-plus'),
	@@ -1970,14 +1970,14 @@ global $wppa_subtab_names;
1970	$name = __('Select photo once', 'wp-photo-album-plus');
1971	$desc = __('The same random photo on every pageload', 'wp-photo-album-plus');
1972	$help = __('If ticked: the random photo is determined once at page/post creation time', 'wp-photo-album-plus');
1973	- $help .= '<br />'.__('If unticked: every pageload a different photo', 'wp-photo-album-plus');
1974	$slug = 'wppa_photo_shortcode_random_fixed';
1975	$html = wppa_checkbox($slug);
1976	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
1977
1978	$name = __('Render photo once', 'wp-photo-album-plus');
1979	$desc = __('Replace shortcode by html', 'wp-photo-album-plus');
1980	- $help = __('Do not replace \'random\' by a number, but by the corresponding html', 'wp-photo-album-plus') . '<br />';
1981	$help .= __('WARNING: changes in [photo] shortcode afterwards do no longer have any effect!', 'wp-photo-album-plus');
1982	$slug = 'wppa_photo_shortcode_random_fixed_html';
1983	$html = wppa_checkbox($slug);
	@@ -2264,7 +2264,7 @@ global $wppa_subtab_names;
2264	$html .= '
2265	<div style="display:inline-block;width:75%;text-align:center;vertical-align:middle;" >' .
2266	__( 'Album', 'wp-photo-album-plus' ) . ': ' . htmlspecialchars( wppa_get_album_name( $photo['album'] ) ) . '
2267	- <br />' .
2268	__('Uploader', 'wp-photo-album-plus') . ': ' . htmlspecialchars( $photo['owner'] ) . '
2269	</div>';
2270	}
	@@ -2448,7 +2448,7 @@ global $wppa_subtab_names;
2448	$name = __('Thumbnail Size', 'wp-photo-album-plus');
2449	$desc = __('The size of the thumbnail images.', 'wp-photo-album-plus');
2450	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2451	- $help .= '<br />'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2452	$slug = 'wppa_thumbsize';
2453	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2454	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -2456,7 +2456,7 @@ global $wppa_subtab_names;
2456	$name = __('Thumbnail Size Alt', 'wp-photo-album-plus');
2457	$desc = __('The alternative size of the thumbnail images.', 'wp-photo-album-plus');
2458	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2459	- $help .= '<br />'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2460	$slug = 'wppa_thumbsize_alt';
2461	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2462	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -2512,8 +2512,8 @@ global $wppa_subtab_names;
2512	$name = __('Thumbframe width', 'wp-photo-album-plus');
2513	$desc = __('The width of the thumbnail frame.', 'wp-photo-album-plus');
2514	$help = __('Set the width of the thumbnail frame.', 'wp-photo-album-plus');
2515	- $help .= '<br />'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2516	- $help .= '<br />'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2517	$slug = 'wppa_tf_width';
2518	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2519	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
	@@ -2521,8 +2521,8 @@ global $wppa_subtab_names;
2521	$name = __('Thumbframe width Alt', 'wp-photo-album-plus');
2522	$desc = __('The width of the alternative thumbnail frame.', 'wp-photo-album-plus');
2523	$help = __('Set the width of the thumbnail frame.', 'wp-photo-album-plus');
2524	- $help .= '<br />'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2525	- $help .= '<br />'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2526	$slug = 'wppa_tf_width_alt';
2527	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2528	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
	@@ -2530,8 +2530,8 @@ global $wppa_subtab_names;
2530	$name = __('Thumbframe height', 'wp-photo-album-plus');
2531	$desc = __('The height of the thumbnail frame.', 'wp-photo-album-plus');
2532	$help = __('Set the height of the thumbnail frame.', 'wp-photo-album-plus');
2533	- $help .= '<br />'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2534	- $help .= '<br />'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2535	$slug = 'wppa_tf_height';
2536	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2537	wppa_setting_new($slug, '7', $name, $desc, $html, $help);
	@@ -2539,8 +2539,8 @@ global $wppa_subtab_names;
2539	$name = __('Thumbframe height Alt', 'wp-photo-album-plus');
2540	$desc = __('The height of the alternative thumbnail frame.', 'wp-photo-album-plus');
2541	$help = __('Set the height of the thumbnail frame.', 'wp-photo-album-plus');
2542	- $help .= '<br />'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2543	- $help .= '<br />'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2544	$slug = 'wppa_tf_height_alt';
2545	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2546	wppa_setting_new($slug, '8', $name, $desc, $html, $help);
	@@ -2548,8 +2548,8 @@ global $wppa_subtab_names;
2548	$name = __('Thumbnail spacing', 'wp-photo-album-plus');
2549	$desc = __('The spacing between adjacent thumbnail frames.', 'wp-photo-album-plus');
2550	$help = __('Set the minimal spacing between the adjacent thumbnail frames', 'wp-photo-album-plus');
2551	- $help .= '<br />'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2552	- $help .= '<br />'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2553	$slug = 'wppa_tn_margin';
2554	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2555	wppa_setting_new($slug, '9', $name, $desc, $html, $help);
	@@ -2557,7 +2557,7 @@ global $wppa_subtab_names;
2557	$name = __('Auto spacing', 'wp-photo-album-plus');
2558	$desc = __('Space the thumbnail frames automatic.', 'wp-photo-album-plus');
2559	$help = __('If you check this box, the thumbnail images will be evenly distributed over the available width.', 'wp-photo-album-plus');
2560	- $help .= '<br />'.__('In this case, the thumbnail spacing value (setting I-9) will be regarded as a minimum value.', 'wp-photo-album-plus');
2561	$slug = 'wppa_thumb_auto';
2562	$html = wppa_checkbox($slug);
2563	wppa_setting_new($slug, '10', $name, $desc, $html, $help);
	@@ -2572,9 +2572,9 @@ global $wppa_subtab_names;
2572	$name = __('Popup size', 'wp-photo-album-plus');
2573	$desc = __('The size of the thumbnail popup images.', 'wp-photo-album-plus');
2574	$help = __('Enter the size of the popup images. This size should be larger than the thumbnail size.', 'wp-photo-album-plus');
2575	- $help .= '<br />'.__('This size should also be at least the cover image size.', 'wp-photo-album-plus');
2576	- $help .= '<br />'.__('Changing the popup size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2577	- $help .= '<br />'.__('Although this setting has only visual effect if "Thumb popup" (<b>Thumbnails -> III -> Thumb popup</b>) is checked,', 'wp-photo-album-plus');
2578	$help .= ' '.__('the value must be right as it is the physical size of the thumbnail and coverphoto images.', 'wp-photo-album-plus');
2579	$slug = 'wppa_popupsize';
2580	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
	@@ -2583,7 +2583,7 @@ global $wppa_subtab_names;
2583	$name = __('Use thumbs if fit', 'wp-photo-album-plus');
2584	$desc = __('Use the thumbnail image files if they are large enough.', 'wp-photo-album-plus');
2585	$help = __('This setting speeds up page loading for small photos.', 'wp-photo-album-plus');
2586	- $help .= '<br />'.__('Do NOT use this when your thumbnails have a forced aspect ratio (when <b>Thumbnails -> I -> Thumbnail Aspect</b> is set to anything different from --- same as fullsize ---)', 'wp-photo-album-plus');
2587	$slug = 'wppa_use_thumbs_if_fit';
2588	$html = wppa_checkbox($slug);
2589	wppa_setting_new($slug, '13', $name, $desc, $html, $help);
	@@ -2804,7 +2804,7 @@ global $wppa_subtab_names;
2804	$name = __('Vertical alignment', 'wp-photo-album-plus');
2805	$desc = __('Vertical alignment of thumbnails.', 'wp-photo-album-plus');
2806	$help = __('Specify the vertical alignment of thumbnail images. Use this setting when albums contain both portrait and landscape photos.', 'wp-photo-album-plus');
2807	- $help .= '<br />'.__('It is NOT recommended to use the value --- default ---; it will affect the horizontal alignment also and is meant to be used with custom css.', 'wp-photo-album-plus');
2808	$slug = 'wppa_valign';
2809	$opts = array( __('--- default ---', 'wp-photo-album-plus'), __('top', 'wp-photo-album-plus'), __('center', 'wp-photo-album-plus'), __('bottom', 'wp-photo-album-plus'));
2810	$vals = array('default', 'top', 'center', 'bottom');
	@@ -2881,8 +2881,8 @@ global $wppa_subtab_names;
2881	$name = __('Maximum Width', 'wp-photo-album-plus');
2882	$desc = __('The maximum width photos will be displayed in slideshows.', 'wp-photo-album-plus');
2883	$help = __('Enter the largest size in pixels as how you want your photos to be displayed.', 'wp-photo-album-plus');
2884	- $help .= '<br />'.__('This is usually the same as the Column Width, but it may differ.', 'wp-photo-album-plus');
2885	- $help .= '<br />'.wppa_see_also( 'layout', '1', '5' );
2886	$slug = 'wppa_fullsize';
2887	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2888	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -2890,8 +2890,8 @@ global $wppa_subtab_names;
2890	$name = __('Maximum Height', 'wp-photo-album-plus');
2891	$desc = __('The maximum height photos will be displayed in slideshows.', 'wp-photo-album-plus');
2892	$help = __('Enter the largest size in pixels as how you want your photos to be displayed.', 'wp-photo-album-plus');
2893	- $help .= '<br />'.__('This setting defines the height of the space reserved for photos in slideshows.', 'wp-photo-album-plus');
2894	- $help .= '<br />'.__('If you change the width of a display by the size=".." shortcode attribute, this value changes proportionally to match the aspect ratio as defined by this and the previous setting.', 'wp-photo-album-plus');
2895	$slug = 'wppa_maxheight';
2896	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2897	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -2906,10 +2906,10 @@ global $wppa_subtab_names;
2906	$name = __('Slideshow borderwidth', 'wp-photo-album-plus');
2907	$desc = __('The width of the border around slideshow images.', 'wp-photo-album-plus');
2908	$help = __('The border is made by the image background being larger than the image itsself (padding).', 'wp-photo-album-plus');
2909	- $help .= '<br />'.__('Additionally there may be a one pixel outline of a different color.', 'wp-photo-album-plus');
2910	- $help .= '<br />'.__('The number you enter here is exclusive the one pixel outline.', 'wp-photo-album-plus');
2911	- $help .= '<br />'.__('If you leave this entry empty, there will be no outline either.', 'wp-photo-album-plus');
2912	- $help .= '<br />'.wppa_see_also( 'slide', '1', '35' );
2913	$slug = 'wppa_fullimage_border_width';
2914	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2915	$clas = '';
	@@ -2928,7 +2928,7 @@ global $wppa_subtab_names;
2928	$name = __('Mini Threshold', 'wp-photo-album-plus');
2929	$desc = __('Show mini text at slideshow smaller than.', 'wp-photo-album-plus');
2930	$help = __('Display Next and Prev. as opposed to Next photo and Previous photo when the cotainer is smaller than this size.', 'wp-photo-album-plus');
2931	- $help .= '<br />'.__('Special use in responsive themes.', 'wp-photo-album-plus');
2932	$slug = 'wppa_mini_treshold';
2933	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2934	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
	@@ -2943,7 +2943,7 @@ global $wppa_subtab_names;
2943	$name = __('Filmstrip Thumbnail Size', 'wp-photo-album-plus');
2944	$desc = __('The size of the filmstrip images.', 'wp-photo-album-plus');
2945	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2946	- $help .= '<br />'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2947	$slug = 'wppa_film_thumbsize';
2948	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2949	wppa_setting_new($slug, '8', $name, $desc, $html, $help);
	@@ -3043,8 +3043,8 @@ global $wppa_subtab_names;
3043	$name = __('Big Browse Buttons', 'wp-photo-album-plus');
3044	$desc = __('Enable invisible browsing buttons.', 'wp-photo-album-plus');
3045	$help = __('If checked, the fullsize image is covered by two invisible areas that act as browse buttons.', 'wp-photo-album-plus');
3046	- $help .= '<br />'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
3047	- $help .= '<br />'.wppa_see_also( 'slide', '1', '2' );
3048	$slug = 'wppa_show_bbb';
3049	$html = wppa_checkbox($slug);
3050	wppa_setting_new($slug, '22', $name, $desc, $html, $help);
	@@ -3066,7 +3066,7 @@ global $wppa_subtab_names;
3066	$name = __('Show custom box', 'wp-photo-album-plus');
3067	$desc = __('Display the custom box in the slideshow', 'wp-photo-album-plus');
3068	$help = __('You can fill the custom box with any html you like. It will not be checked, so it is your own responsibility to close tags properly.', 'wp-photo-album-plus');
3069	- $help .= '<br />'.wppa_see_also( 'slide', '2' );
3070	$slug = 'wppa_custom_on';
3071	$html = wppa_checkbox($slug);
3072	wppa_setting_new($slug, '25', $name, $desc, $html, $help);
	@@ -3074,7 +3074,7 @@ global $wppa_subtab_names;
3074	$name = __('Custom content', 'wp-photo-album-plus');
3075	$desc = __('The content (html) of the custom box.', 'wp-photo-album-plus');
3076	$help = __('You can fill the custom box with any html you like. It will not be checked, so it is your own responsibility to close tags properly.', 'wp-photo-album-plus');
3077	- $help .= '<br />'.wppa_see_also( 'slide', '2' );
3078	$slug = 'wppa_custom_content';
3079	$html = wppa_textarea($slug, $name);
3080	wppa_setting_new(false, '26', $name, $desc, $html, $help);
	@@ -3148,7 +3148,7 @@ global $wppa_subtab_names;
3148	$name = __('Slide Image border', 'wp-photo-album-plus');
3149	$desc = __('Fullsize Slideshow Photos background and border.', 'wp-photo-album-plus');
3150	$help = '';
3151	- $help .= '<br />'.__('The colors may be equal or "transparent"', 'wp-photo-album-plus');
3152	$slug1 = 'wppa_bgcolor_fullimg';
3153	$slug2 = 'wppa_bcolor_fullimg';
3154	$slug = array($slug1, $slug2);
	@@ -3311,8 +3311,8 @@ global $wppa_subtab_names;
3311	$name = __('H align', 'wp-photo-album-plus');
3312	$desc = __('Horizontal alignment of slideshow images.', 'wp-photo-album-plus');
3313	$help = __('Specify the horizontal alignment of slideshow images. If you specify --- none --- , no horizontal alignment will take place.', 'wp-photo-album-plus');
3314	- $help .= '<br />'.(__('This setting is only usefull when the Column Width differs from the Maximum Width.', 'wp-photo-album-plus'));
3315	- $help .= '<br />'.(__('(Settings I-A1 and I-B1)', 'wp-photo-album-plus'));
3316	$slug = 'wppa_fullhalign';
3317	$opts = array(__('--- none ---', 'wp-photo-album-plus'), __('left', 'wp-photo-album-plus'), __('center', 'wp-photo-album-plus'), __('right', 'wp-photo-album-plus'));
3318	$vals = array('default', 'left', 'center', 'right');
	@@ -3331,7 +3331,7 @@ global $wppa_subtab_names;
3331	$name = __('Remove redundant space', 'wp-photo-album-plus');
3332	$desc = __('Removes unwanted <p> and <br> tags in fullsize descriptions.', 'wp-photo-album-plus');
3333	$help = __('This setting has only effect when Foreign Shortcodes is checked.', 'wp-photo-album-plus');
3334	- $help .= '<br />'.wppa_see_also( 'miscadv', '4', '1' );
3335	$slug = 'wppa_clean_pbr';
3336	$html = wppa_checkbox($slug);
3337	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
	@@ -3366,7 +3366,7 @@ global $wppa_subtab_names;
3366	$name = __('Start', 'wp-photo-album-plus');
3367	$desc = __('Start slideshow running.', 'wp-photo-album-plus');
3368	$help = __('If you select "running", the slideshow will start running immediately, if you select "still at first photo", the first photo will be displayed in browse mode.', 'wp-photo-album-plus');
3369	- $help .= '<br />'.__('If you select "still at first norated", the first photo that the visitor did not gave a rating will be displayed in browse mode.', 'wp-photo-album-plus');
3370	$slug = 'wppa_start_slide';
3371	$opts = array( __('running', 'wp-photo-album-plus'),
3372	__('still at first photo', 'wp-photo-album-plus'),
	@@ -3433,7 +3433,7 @@ global $wppa_subtab_names;
3433	$name = __('Speed', 'wp-photo-album-plus');
3434	$desc = __('Slideshow animation speed.', 'wp-photo-album-plus');
3435	$help = __('Specify the animation speed to be used in slideshows.', 'wp-photo-album-plus');
3436	- $help .= '<br />'.__('This is the time it takes a photo to fade in or out.', 'wp-photo-album-plus');
3437	$slug = 'wppa_animation_speed';
3438	$opts = array(__('--- off ---', 'wp-photo-album-plus'), '200 ms.', '400 ms.', '800 ms.', '1.2 s.', '2 s.', '4 s.', '6 s.', '8 s.', '10 s.');
3439	$vals = array('10', '200', '400', '800', '1200', '2000', '4000', '6000', '8000', '10000');
	@@ -3802,7 +3802,7 @@ global $wppa_subtab_names;
3802	$name = __('Last comment first', 'wp-photo-album-plus');
3803	$desc = __('Display the newest comment on top.', 'wp-photo-album-plus');
3804	$help = __('If checked: Display the newest comment on top.', 'wp-photo-album-plus');
3805	- $help .= '<br />'.(__('If unchecked, the comments are listed in the ordere they were entered.', 'wp-photo-album-plus'));
3806	$slug = 'wppa_comments_desc';
3807	$html = wppa_checkbox($slug);
3808	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -4016,7 +4016,7 @@ global $wppa_subtab_names;
4016	$name = __('Rating change', 'wp-photo-album-plus');
4017	$desc = __('Users may change their ratings.', 'wp-photo-album-plus');
4018	$help = __('Users may change their ratings.', 'wp-photo-album-plus');
4019	- $help .= '<br />'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4020	$slug = 'wppa_rating_change';
4021	$html = wppa_checkbox($slug);
4022	wppa_setting_new($slug, '10', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4061,7 +4061,7 @@ global $wppa_subtab_names;
4061	$name = __('Star off opacity', 'wp-photo-album-plus');
4062	$desc = __('Rating star off state opacity value.', 'wp-photo-album-plus');
4063	$help = __('Enter percentage of opacity. 100% is opaque, 0% is transparant', 'wp-photo-album-plus');
4064	- $help .= '<br />'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4065	$slug = 'wppa_star_opacity';
4066	$html = wppa_input($slug, '50px', '', __('%', 'wp-photo-album-plus'));
4067	wppa_setting_new($slug, '16', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4069,10 +4069,10 @@ global $wppa_subtab_names;
4069	$name = __('Notify inappropriate', 'wp-photo-album-plus');
4070	$desc = __('Notify admin every x times.', 'wp-photo-album-plus');
4071	$help = __('If this number is positive, there will be a thumb down icon in the rating bar.', 'wp-photo-album-plus');
4072	- $help .= '<br />'.(__('Clicking the thumbdown icon indicates a user dislikes a photo.', 'wp-photo-album-plus'));
4073	- $help .= '<br />'.(__('Admin will be notified by email after every x dislikes.', 'wp-photo-album-plus'));
4074	- $help .= '<br />'.(__('A value of 0 disables this feature.', 'wp-photo-album-plus'));
4075	- $help .= '<br />'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4076	$slug = 'wppa_dislike_mail_every';
4077	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4078	wppa_setting_new($slug, '17', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4080,7 +4080,7 @@ global $wppa_subtab_names;
4080	$name = __('Dislike value', 'wp-photo-album-plus');
4081	$desc = __('This value counts dislike rating.', 'wp-photo-album-plus');
4082	$help = (__('This value will be used for a dislike rating on calculation of avarage ratings.', 'wp-photo-album-plus'));
4083	- $help .= '<br />'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4084	$slug = 'wppa_dislike_value';
4085	$html = wppa_input($slug, '50px', '', __('points', 'wp-photo-album-plus'));
4086	wppa_setting_new($slug, '18', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4088,7 +4088,7 @@ global $wppa_subtab_names;
4088	$name = __('Pending after', 'wp-photo-album-plus');
4089	$desc = __('Set status to pending after xx dislike votes.', 'wp-photo-album-plus');
4090	$help = __('A value of 0 disables this feature.', 'wp-photo-album-plus');
4091	- $help .= '<br />'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4092	$slug = 'wppa_dislike_set_pending';
4093	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4094	wppa_setting_new($slug, '19', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4096,7 +4096,7 @@ global $wppa_subtab_names;
4096	$name = __('Delete after', 'wp-photo-album-plus');
4097	$desc = __('Delete photo after xx dislike votes.', 'wp-photo-album-plus');
4098	$help = __('A value of 0 disables this feature.', 'wp-photo-album-plus');
4099	- $help .= '<br />'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4100	$slug = 'wppa_dislike_delete';
4101	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4102	wppa_setting_new($slug, '20', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4104,7 +4104,7 @@ global $wppa_subtab_names;
4104	$name = __('Show dislike count', 'wp-photo-album-plus');
4105	$desc = __('Show the number of dislikes in the rating bar.', 'wp-photo-album-plus');
4106	$help = __('Displayes the total number of dislike votes for the current photo.', 'wp-photo-album-plus');
4107	- $help .= '<br />'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4108	$slug = 'wppa_dislike_show_count';
4109	$html = wppa_checkbox($slug);
4110	wppa_setting_new($slug, '21', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4112,8 +4112,8 @@ global $wppa_subtab_names;
4112	$name = __('Show average rating', 'wp-photo-album-plus');
4113	$desc = __('Display the avarage rating and/or vote count on the rating bar', 'wp-photo-album-plus');
4114	$help = __('If checked, the average rating as well as the current users rating is displayed in max 5 or 10 stars.', 'wp-photo-album-plus');
4115	- $help .= '<br />'.__('If unchecked, only the current users rating is displayed (if any).', 'wp-photo-album-plus');
4116	- $help .= '<br />'.__('If "One button vote" is selected in item 5, this box checked will display the vote count.', 'wp-photo-album-plus');
4117	$slug = 'wppa_show_avg_rating';
4118	$html = wppa_checkbox($slug);
4119	wppa_setting_new($slug, '22', $name, $desc, $html, $help);
	@@ -4259,8 +4259,8 @@ global $wppa_subtab_names;
4259	$name = __('Search landing page', 'wp-photo-album-plus');
4260	$desc = __('Display the search results on page.', 'wp-photo-album-plus');
4261	$help = __('Select the page to be used to display search results. The page MUST contain [wppa].', 'wp-photo-album-plus');
4262	- $help .= '<br />'.__('You may give it the title "Search results" or something alike.', 'wp-photo-album-plus');
4263	- $help .= '<br />'.__('Or you may use the standard page on which you display the generic album.', 'wp-photo-album-plus');
4264	$slug = 'wppa_search_linkpage';
4265	wppa_verify_page($slug);
4266	$pages = $wpdb->get_results( "SELECT ID, post_title, post_content FROM $wpdb->posts
	@@ -4302,7 +4302,7 @@ global $wppa_subtab_names;
4302	$name = __('Exclude separate', 'wp-photo-album-plus');
4303	$desc = __('Do not search \'separate\' albums.', 'wp-photo-album-plus');
4304	$help = __('When checked, albums (and photos in them) that have the parent set to --- separate --- will be excluded from being searched.', 'wp-photo-album-plus');
4305	- $help .= '<br />'.__('Except when you start searching in a \'saparate\' album, with the "search in current section" box ticked.', 'wp-photo-album-plus');
4306	$slug = 'wppa_excl_sep';
4307	$html = wppa_checkbox($slug);
4308	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -4400,7 +4400,7 @@ global $wppa_subtab_names;
4400	$name = __('Search toptext', 'wp-photo-album-plus');
4401	$desc = __('The text at the top of the search box.', 'wp-photo-album-plus');
4402	$help = __('This is the equivalence of the text you can enter in the widget activation screen to show above the input box, but now for the search shortcode display.', 'wp-photo-album-plus');
4403	- $help .= '<br />'.__('May contain unfiltered HTML.', 'wp-photo-album-plus');
4404	$slug = 'wppa_search_toptext';
4405	$html = wppa_textarea($slug, $name);
4406	wppa_setting_new($slug, '15', $name, $desc, $html, $help);
	@@ -4582,8 +4582,8 @@ global $wppa_subtab_names;
4582	$name = __('TopTen size', 'wp-photo-album-plus');
4583	$desc = __('Size of thumbnails in TopTen widget.', 'wp-photo-album-plus');
4584	$help = __('Enter the size for the mini photos in the TopTen widget.', 'wp-photo-album-plus');
4585	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4586	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4587	$slug = 'wppa_topten_size';
4588	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4589	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -4598,8 +4598,8 @@ global $wppa_subtab_names;
4598	$name = __('Comment size', 'wp-photo-album-plus');
4599	$desc = __('Size of thumbnails in Comment widget.', 'wp-photo-album-plus');
4600	$help = __('Enter the size for the mini photos in the Comment widget.', 'wp-photo-album-plus');
4601	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4602	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4603	$slug = 'wppa_comten_size';
4604	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4605	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
	@@ -4614,8 +4614,8 @@ global $wppa_subtab_names;
4614	$name = __('Thumbnail widget size', 'wp-photo-album-plus');
4615	$desc = __('Size of thumbnails in Thumbnail widget.', 'wp-photo-album-plus');
4616	$help = __('Enter the size for the mini photos in the Thumbnail widget.', 'wp-photo-album-plus');
4617	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4618	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4619	$slug = 'wppa_thumbnail_widget_size';
4620	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4621	wppa_setting_new($slug, '7', $name, $desc, $html, $help);
	@@ -4630,8 +4630,8 @@ global $wppa_subtab_names;
4630	$name = __('LasTen size', 'wp-photo-album-plus');
4631	$desc = __('Size of thumbnails in Last Ten widget.', 'wp-photo-album-plus');
4632	$help = __('Enter the size for the mini photos in the LasTen widget.', 'wp-photo-album-plus');
4633	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4634	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4635	$slug = 'wppa_lasten_size';
4636	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4637	wppa_setting_new($slug, '9', $name, $desc, $html, $help);
	@@ -4646,8 +4646,8 @@ global $wppa_subtab_names;
4646	$name = __('Album widget size', 'wp-photo-album-plus');
4647	$desc = __('Size of thumbnails in Album widget.', 'wp-photo-album-plus');
4648	$help = __('Enter the size for the mini photos in the Album widget.', 'wp-photo-album-plus');
4649	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4650	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4651	$slug = 'wppa_album_widget_size';
4652	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4653	wppa_setting_new($slug, '11', $name, $desc, $html, $help);
	@@ -4664,8 +4664,8 @@ global $wppa_subtab_names;
4664	$name = __('FeaTen size', 'wp-photo-album-plus');
4665	$desc = __('Size of thumbnails in Featured Ten widget.', 'wp-photo-album-plus');
4666	$help = __('Enter the size for the mini photos in the FeaTen widget.', 'wp-photo-album-plus');
4667	- $help .= '<br />'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4668	- $help .= '<br />'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4669	$slug = 'wppa_featen_size';
4670	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4671	wppa_setting_new($slug, '13', $name, $desc, $html, $help);
	@@ -4704,8 +4704,8 @@ global $wppa_subtab_names;
4704	$name = __('Big Browse Buttons in widget', 'wp-photo-album-plus');
4705	$desc = __('Enable invisible browsing buttons in widget slideshows.', 'wp-photo-album-plus');
4706	$help = __('If checked, the fullsize image is covered by two invisible areas that act as browse buttons.', 'wp-photo-album-plus');
4707	- $help .= '<br />'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
4708	- $help .= '<br />'.wppa_see_also( 'slide', '1', '2' );
4709	$slug = 'wppa_show_bbb_widget';
4710	$html = wppa_checkbox($slug);
4711	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -4713,8 +4713,8 @@ global $wppa_subtab_names;
4713	$name = __('Ugly Browse Buttons in widget', 'wp-photo-album-plus');
4714	$desc = __('Enable ugly browsing buttons in widget slideshows.', 'wp-photo-album-plus');
4715	$help = __('If checked, the fullsize image is covered by browse buttons.', 'wp-photo-album-plus');
4716	- $help .= '<br />'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
4717	- $help .= '<br />'.wppa_see_also( 'slide', '1', '2' );
4718	$slug = 'wppa_show_ubb_widget';
4719	$html = wppa_checkbox($slug);
4720	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -4776,7 +4776,7 @@ global $wppa_subtab_names;
4776	$name = __('Photo names in urls', 'wp-photo-album-plus');
4777	$desc = __('Display photo names in urls.', 'wp-photo-album-plus');
4778	$help = __('Urls to wppa+ displays will contain photonames instead of numbers.', 'wp-photo-album-plus');
4779	- $help .= '<br />'.__('It is your responsibility to avoid duplicate names of photos in the same album.', 'wp-photo-album-plus');
4780	$slug = 'wppa_use_photo_names_in_urls';
4781	$html = wppa_checkbox($slug);
4782	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -4784,7 +4784,7 @@ global $wppa_subtab_names;
4784	$name = __('Album names in urls', 'wp-photo-album-plus');
4785	$desc = __('Display album names in urls.', 'wp-photo-album-plus');
4786	$help = __('Urls to wppa+ displays will contain albumnames instead of numbers.', 'wp-photo-album-plus');
4787	- $help .= '<br />'.__('It is your responsibility to avoid duplicate names of albums in the system.', 'wp-photo-album-plus');
4788	$slug = 'wppa_use_album_names_in_urls';
4789	$html = wppa_checkbox($slug);
4790	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -4792,7 +4792,7 @@ global $wppa_subtab_names;
4792	$name = __('Use short query args', 'wp-photo-album-plus');
4793	$desc = __('Use &album=... &photo=...', 'wp-photo-album-plus');
4794	$help = __('Urls to wppa+ displays will contain &album=... &photo=... instead of &wppa-album=... &wppa-photo=...', 'wp-photo-album-plus');
4795	- $help .= '<br />'.__('Use this setting only when there are no conflicts with other plugins that may interprete arguments like &album= etc.', 'wp-photo-album-plus');
4796	$slug = 'wppa_use_short_qargs';
4797	$html = wppa_checkbox($slug);
4798	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -4800,11 +4800,11 @@ global $wppa_subtab_names;
4800	$name = __('Enable pretty links', 'wp-photo-album-plus');
4801	$desc = __('Enable the generation and understanding of pretty links.', 'wp-photo-album-plus');
4802	$help = __('If checked, links to social media and the qr code will have "/token1/token2/" etc instead of "&arg1=..&arg2=.." etc.', 'wp-photo-album-plus');
4803	- $help .= '<br />'.__('These types of links will be interpreted and cause a redirection on entering.', 'wp-photo-album-plus');
4804	- $help .= '<br />'.__('It is recommended to check this box. It shortens links dramatically and simplifies qr codes.', 'wp-photo-album-plus');
4805	- $help .= '<br />'.__('However, you may encounter conflicts with themes and/or other plugins, so test it throughly!', 'wp-photo-album-plus');
4806	- $help .= '<br />'.__('Photo names in urls must be UNchecked for this setting to work!', 'wp-photo-album-plus');
4807	- $help .= '<br />'.wppa_see_also( 'links', '1', '1' );
4808	$slug = 'wppa_use_pretty_links';
4809	$opts = array( __( 'None', 'wp-photo-album-plus' ),
4810	__( 'Classic', 'wp-photo-album-plus' ),
	@@ -4849,9 +4849,9 @@ global $wppa_subtab_names;
4849	$name = __('Cover Image', 'wp-photo-album-plus');
4850	$desc = __('The link from the cover image of an album.', 'wp-photo-album-plus');
4851	$help = __('Select the type of link the coverphoto points to.', 'wp-photo-album-plus');
4852	- $help .= '<br />'.__('The link from the album title can be configured on the Edit Album page.', 'wp-photo-album-plus');
4853	- $help .= '<br />'.__('This link will be used for the photo also if you select: same as title.', 'wp-photo-album-plus');
4854	- $help .= '<br />'.__('If you specify New Tab on this line, all links from the cover will open a new tab,', 'wp-photo-album-plus');
4855	$slug1 = 'wppa_coverimg_linktype';
4856	$slug2 = 'wppa_coverimg_linkpage';
4857	wppa_verify_page($slug2);
	@@ -4883,8 +4883,8 @@ global $wppa_subtab_names;
4883	$name = __('Thumbnail', 'wp-photo-album-plus');
4884	$desc = __('Thumbnail link.', 'wp-photo-album-plus');
4885	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4886	- $help .= '<br />'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4887	- $help .= '<br />'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4888	$slug1 = 'wppa_thumb_linktype';
4889	$slug2 = 'wppa_thumb_linkpage';
4890	wppa_verify_page($slug2);
	@@ -4928,8 +4928,8 @@ global $wppa_subtab_names;
4928	$name = __('Sphoto', 'wp-photo-album-plus');
4929	$desc = __('Single photo link.', 'wp-photo-album-plus');
4930	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4931	- $help .= '<br />'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4932	- $help .= '<br />'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4933	$slug1 = 'wppa_sphoto_linktype';
4934	$slug2 = 'wppa_sphoto_linkpage';
4935	wppa_verify_page($slug2);
	@@ -4963,8 +4963,8 @@ global $wppa_subtab_names;
4963	$name = __('Mphoto', 'wp-photo-album-plus');
4964	$desc = __('Media-like (like WP photo with caption) photo link.', 'wp-photo-album-plus');
4965	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4966	- $help .= '<br />'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4967	- $help .= '<br />'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4968	$slug1 = 'wppa_mphoto_linktype';
4969	$slug2 = 'wppa_mphoto_linkpage';
4970	wppa_verify_page($slug2);
	@@ -4982,8 +4982,8 @@ global $wppa_subtab_names;
4982	$name = __('Xphoto', 'wp-photo-album-plus');
4983	$desc = __('Media-like (like WP photo with - extended - caption) photo link.', 'wp-photo-album-plus');
4984	$help = __('Select the type of link you want, or no link at all, to act on a photo in the style of a wp photo with - an extended - caption.', 'wp-photo-album-plus');
4985	- $help .= '<br />'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4986	- $help .= '<br />'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4987	$slug1 = 'wppa_xphoto_linktype';
4988	$slug2 = 'wppa_xphoto_linkpage';
4989	wppa_verify_page($slug2);
	@@ -5062,8 +5062,8 @@ global $wppa_subtab_names;
5062	$name = __('Grid', 'wp-photo-album-plus');
5063	$desc = __('Grid photo link.', 'wp-photo-album-plus');
5064	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
5065	- $help .= '<br />'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
5066	- $help .= '<br />'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
5067	$slug1 = 'wppa_grid_linktype';
5068	$slug2 = 'wppa_grid_linkpage';
5069	wppa_verify_page($slug2);
	@@ -5103,7 +5103,7 @@ global $wppa_subtab_names;
5103	$name = __('PotdWidget', 'wp-photo-album-plus');
5104	$desc = __('Photo Of The Day widget link.', 'wp-photo-album-plus');
5105	$help = __('Select the type of link the photo of the day points to.', 'wp-photo-album-plus');
5106	- $help .= '<br />'.__('If you select \'defined on widget admin page\' you can manually enter a link and title on the Photo of the day Widget Admin page.', 'wp-photo-album-plus');
5107	$slug1 = 'wppa_potd_linktype';
5108	$slug2 = 'wppa_potd_linkpage';
5109	wppa_verify_page($slug2);
	@@ -5178,7 +5178,7 @@ global $wppa_subtab_names;
5178	$name = __('Album widget', 'wp-photo-album-plus');
5179	$desc = __('Album widget thumbnail link', 'wp-photo-album-plus');
5180	$help = __('Select the type of link the album widget photos point to.', 'wp-photo-album-plus') .
5181	- '<br />' .
5182	__('If you tick the ASO box, the album title link settings overrule these settings, but only when the album link page or post is not set to --- the same page or post ---', 'wp-photo-album-plus');
5183	$slug1 = 'wppa_album_widget_linktype';
5184	$slug2 = 'wppa_album_widget_linkpage';
	@@ -5209,7 +5209,7 @@ global $wppa_subtab_names;
5209	$name = __('Album navigator widget', 'wp-photo-album-plus');
5210	$desc = __('Album navigator widget link', 'wp-photo-album-plus');
5211	$help = __('Select the type of link the album widget photos point to.', 'wp-photo-album-plus') .
5212	- '<br />' .
5213	__('If you tick the ASO box, the album title link settings overrule these settings, but only when the album link page or post is not set to --- the same page or post ---', 'wp-photo-album-plus');
5214	$slug1 = 'wppa_album_navigator_widget_linktype';
5215	$slug2 = 'wppa_album_navigator_widget_linkpage';
	@@ -5390,7 +5390,7 @@ global $wppa_subtab_names;
5390	$name = __('Tagcloud Link', 'wp-photo-album-plus');
5391	$desc = __('Configure the link from the tags in the tag cloud.', 'wp-photo-album-plus');
5392	$help = __('Link the tag words to either the thumbnails or the slideshow.', 'wp-photo-album-plus');
5393	- $help .= '<br />'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5394	$slug1 = 'wppa_tagcloud_linktype';
5395	$slug2 = 'wppa_tagcloud_linkpage';
5396	wppa_verify_page($slug2);
	@@ -5421,7 +5421,7 @@ global $wppa_subtab_names;
5421	$name = __('Multitag Link', 'wp-photo-album-plus');
5422	$desc = __('Configure the link from the multitag selection.', 'wp-photo-album-plus');
5423	$help = __('Link to either the thumbnails or the slideshow.', 'wp-photo-album-plus');
5424	- $help .= '<br />'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5425	$slug1 = 'wppa_multitag_linktype';
5426	$slug2 = 'wppa_multitag_linkpage';
5427	wppa_verify_page($slug2);
	@@ -5468,8 +5468,8 @@ global $wppa_subtab_names;
5468	$name = __('SM widget return', 'wp-photo-album-plus');
5469	$desc = __('Select the return link for social media from widgets', 'wp-photo-album-plus');
5470	$help = __('If you select Landing page, and it wont work, it may be required to set the Occur to the sequence number of the landing shortcode on the page.', 'wp-photo-album-plus');
5471	- $help .= '<br />'.__('Normally it is 1, but you can try 2 etc. Always create a new shared link to test a setting.', 'wp-photo-album-plus');
5472	- $help .= '<br />'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5473	$slug1 = 'wppa_widget_sm_linktype';
5474	$slug2 = 'wppa_widget_sm_linkpage';
5475	wppa_verify_page($slug2);
	@@ -5796,7 +5796,7 @@ global $wppa_subtab_names;
5796	$name = __('User name', 'wp-photo-album-plus');
5797	$desc = __('Uploading users may overrule the default name.', 'wp-photo-album-plus');
5798	$help = __('If checked, the default photo name may be overruled by the user.', 'wp-photo-album-plus');
5799	- $help .= '<br />'.wppa_see_also( 'new', '1', '29' );
5800	$slug1 = 'wppa_name_user';
5801	$slug2 = 'wppa_name_user_mandatory';
5802	$html = wppa_checkbox( $slug1 ) . '<span style="float:left;" >' . __( 'Mandatory', 'wp-photo-album-plus' ) . ':</span>' . wppa_checkbox( $slug2 );
	@@ -5805,8 +5805,8 @@ global $wppa_subtab_names;
5805	$name = __('Apply Newphoto desc user', 'wp-photo-album-plus');
5806	$desc = __('Give each new frontend uploaded photo a standard description.', 'wp-photo-album-plus');
5807	$help = __('If checked, each new photo will get the default New photo description.', 'wp-photo-album-plus');
5808	- $help .= '<br />'.__('Note: If the next item is checked, the user can overwrite this', 'wp-photo-album-plus');
5809	- $help .= '<br />'.wppa_see_also( 'new', '1', '13' );
5810	$slug = 'wppa_apply_newphoto_desc_user';
5811	$html = wppa_checkbox($slug);
5812	wppa_setting_new($slug, '10', $name, $desc, $html, $help);
	@@ -6017,7 +6017,7 @@ global $wppa_subtab_names;
6017	$name = __('Mail on comment', 'wp-photo-album-plus');
6018	$desc = __('Enable mailing users when a new comment has been added', 'wp-photo-album-plus');
6019	$help = __('When moderation is required, the mails will be sent after approval', 'wp-photo-album-plus');
6020	- $help .= '<br />' . __('All subscribers will get the email, unless you tick the \'to owner and admin only\' box', 'wp-photo-album-plus');
6021	$slug1 = 'wppa_commentnotify';
6022	$slug2 = 'wppa_commentnotify_limit';
6023	$subs = count( wppa_index_string_to_array( wppa_get_option( 'wppa_mailinglist_commentnotify', '' ) ) );
	@@ -6074,7 +6074,7 @@ global $wppa_subtab_names;
6074
6075	$name = __('From email', 'wp-photo-album-plus');
6076	$desc = __('Enter the from email address you want to be used', 'wp-photo-album-plus');
6077	- $help = __('Be aware of the fact that an email plugin may overrule this setting.', 'wp-photo-album-plus') . '<br />' .
6078	__('Make sure this email address exists.', 'wp-photo-album-plus');
6079	$slug = 'wppa_email_from_email';
6080	$html = wppa_input($slug,'90%');
	@@ -6337,7 +6337,7 @@ global $wppa_subtab_names;
6337	$name = __('Meta all', 'wp-photo-album-plus');
6338	$desc = __('Meta tags for all featured photos.', 'wp-photo-album-plus');
6339	$help = __('If checked, the header of the page will contain metatags that refer to all featured photo files.', 'wp-photo-album-plus');
6340	- $help .= '<br />'.__('If you have many featured photos, you might wish to uncheck this item to reduce the size of the page header.', 'wp-photo-album-plus');
6341	$slug = 'wppa_meta_all';
6342	$html = wppa_checkbox($slug);
6343	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -6394,8 +6394,8 @@ global $wppa_subtab_names;
6394	$name = __('Update addressline', 'wp-photo-album-plus');
6395	$desc = __('Update the addressline after an ajax action or next slide.', 'wp-photo-album-plus');
6396	$help = __('If checked, refreshing the page will show the current content and the browsers back and forth arrows will browse the history on the page.', 'wp-photo-album-plus');
6397	- $help .= '<br />'.__('If unchecked, refreshing the page will re-display the content of the original page.', 'wp-photo-album-plus');
6398	- $help .= '<br />'.__('This will only work on browsers that support history.pushState() and therefor NOT in IE', 'wp-photo-album-plus');
6399	$slug = 'wppa_update_addressline';
6400	$html = wppa_checkbox($slug);
6401	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
	@@ -6648,12 +6648,12 @@ global $wppa_subtab_names;
6648	$name = __('Nice scroller options', 'wp-photo-album-plus');
6649	$desc = __('The nice scroller configuration options', 'wp-photo-album-plus');
6650	$help = __('Enter options, one per line, seperated by commas(,).', 'wp-photo-album-plus');
6651	- $help .= '<br />' .
6652	sprintf( __('Click %s here %s for documentation and a full list of available options', 'wp-photo-album-plus'),
6653	'<a href="' . WPPA_URL . '/vendor/nicescroll/README.txt" target="_blank" >',
6654	'</a>'
6655	) .
6656	- '<br />';
6657	$slug = 'wppa_nicescroll_opts';
6658	$html = wppa_textarea( $slug );
6659	wppa_setting_new($slug, '35', $name, $desc, $html, $help);
	@@ -6749,7 +6749,7 @@ global $wppa_subtab_names;
6749	$name = __('Keep source files', 'wp-photo-album-plus');
6750	$desc = __('Keep the original uploaded and imported photo files.', 'wp-photo-album-plus');
6751	$help = __('The files will be kept in a separate directory with subdirectories for each album', 'wp-photo-album-plus');
6752	- $help .= '<br />'.__('These files can be used to update the photos used in displaying in wppa+ and optionally for downloading original, un-downsized images.', 'wp-photo-album-plus');
6753	$slug = 'wppa_keep_source';
6754	$html = wppa_checkbox($slug);
6755	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -6757,8 +6757,8 @@ global $wppa_subtab_names;
6757	$name = __('Source directory', 'wp-photo-album-plus');
6758	$desc = __('The path to the directory where the original photofiles will be saved.', 'wp-photo-album-plus');
6759	$help = __('You may change the directory path, but it can not be an url.', 'wp-photo-album-plus');
6760	- $help .= '<br />'.__('The parent of the directory that you enter here must exist and be writable.', 'wp-photo-album-plus');
6761	- $help .= '<br />'.__('The directory itsself will be created if it does not exist yet.', 'wp-photo-album-plus');
6762	$slug = 'wppa_source_dir';
6763	$html = wppa_input($slug, '90%');
6764	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -6766,7 +6766,7 @@ global $wppa_subtab_names;
6766	$name = __('Keep sync', 'wp-photo-album-plus');
6767	$desc = __('Keep source synchronously with wppa system.', 'wp-photo-album-plus');
6768	$help = __('If checked, photos that are deleted from wppa, will also be removed from the source files.', 'wp-photo-album-plus');
6769	- $help .= '<br />'.__('Also, copying or moving photos to different albums, will also copy/move the source files.', 'wp-photo-album-plus');
6770	$slug = 'wppa_keep_sync';
6771	$html = wppa_checkbox($slug);
6772	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -6931,12 +6931,12 @@ global $wppa_subtab_names;
6931	$name = __('New photo desc', 'wp-photo-album-plus');
6932	$desc = __('The description (template) to add to a new photo.', 'wp-photo-album-plus');
6933	$help = __('Enter the default description.', 'wp-photo-album-plus');
6934	- $help .= '<br />'.__('If you use html, please check item B-1 of this table.', 'wp-photo-album-plus');
6935	- $help .= '<br />'.__('If you tick the checkbox, linebreaks and redundand spaces will be removed.', 'wp-photo-album-plus');
6936	$slug = 'wppa_newphoto_description';
6937	$slug2 = 'wppa_compress_newdesc';
6938	$html = wppa_textarea($slug, $name) .
6939	- '<br />' .
6940	__('Compress', 'wp-photo-album-plus') .
6941	wppa_checkbox($slug2);
6942	wppa_setting_new($slug, '13', $name, $desc, $html, $help);
	@@ -6951,7 +6951,7 @@ global $wppa_subtab_names;
6951	$name = __('Upload limit', 'wp-photo-album-plus');
6952	$desc = __('New albums are created with this upload limit.', 'wp-photo-album-plus');
6953	$help = __('Administrators can change the limit settings in the "Edit Album Information" admin page.', 'wp-photo-album-plus');
6954	- $help .= '<br />'.(__('A value of 0 means: no limit.', 'wp-photo-album-plus'));
6955	$slug = 'wppa_upload_limit_count';
6956	$html = wppa_input($slug, '50px', '', __('photos', 'wp-photo-album-plus'));
6957	$slug = 'wppa_upload_limit_time';
	@@ -7317,7 +7317,7 @@ global $wppa_subtab_names;
7317	$name = __('Max user albums', 'wp-photo-album-plus');
7318	$desc = __('The max number of albums a user can create.', 'wp-photo-album-plus');
7319	$help = __('The maximum number of albums a user can create when he is not admin', 'wp-photo-album-plus');
7320	- $help .= '<br />'.__('A number of 0 means No limit', 'wp-photo-album-plus');
7321	$slug = 'wppa_max_albums';
7322	$html1 = wppa_input($slug, '50px', '', 'albums');
7323	$html2 = '';
	@@ -7365,7 +7365,7 @@ global $wppa_subtab_names;
7365	$name = __('Fe limts per album', 'wp-photo-album-plus');
7366	$desc = __('The following limits apply to individual albums', 'wp-photo-album-plus');
7367	$help = __('If this box is ticked, users can upload the limit on every album they have fe upload rights to', 'wp-photo-album-plus');
7368	- $help .= '<br />'.__('If this box is unticked, the limits apply to all the users uploads in the system regardless of the album(s)', 'wp-photo-album-plus');
7369	$slug = 'wppa_role_limit_per_album';
7370	$html1 = wppa_checkbox($slug);
7371	$html2 = '';
	@@ -7390,7 +7390,7 @@ global $wppa_subtab_names;
7390	$name = sprintf(__('Upload limit %s', 'wp-photo-album-plus'), $t_role);
7391	$desc = sprintf(__('Limit upload capacity for the user role %s.', 'wp-photo-album-plus'), $t_role);
7392	$help = __('This limitation only applies to frontend uploads when the same userrole does not have the Upload checkbox checked.', 'wp-photo-album-plus');
7393	- $help .= '<br />'.__('A value of 0 means: no limit.', 'wp-photo-album-plus') . wppa_see_also( 'admin', '1' );
7394	$slug1 = 'wppa_'.$role.'_upload_limit_count';
7395	$html1 = wppa_input($slug1, '50px', '', __('photos', 'wp-photo-album-plus'));
7396	$slug2 = 'wppa_'.$role.'_upload_limit_time';
	@@ -7405,7 +7405,7 @@ global $wppa_subtab_names;
7405	$name = sprintf(__('Album limit %s', 'wp-photo-album-plus'), $t_role);
7406	$desc = sprintf(__('Limit number of albums for the user role %s.', 'wp-photo-album-plus'), $t_role);
7407	$help = __('This limitation only applies to frontend create albums when the same userrole does not have the Album admin checkbox checked.', 'wp-photo-album-plus');
7408	- $help .= '<br />'.__('A value of 0 means: no limit.', 'wp-photo-album-plus') . wppa_see_also( 'admin', '1' );
7409	$slug1 = 'wppa_'.$role.'_album_limit_count';
7410	$html1 = wppa_input($slug1, '50px', '', __('albums', 'wp-photo-album-plus'));
7411	$slug2 = '';
	@@ -7426,8 +7426,8 @@ global $wppa_subtab_names;
7426	$name = __('Upload moderation', 'wp-photo-album-plus');
7427	$desc = __('Uploaded photos need moderation.', 'wp-photo-album-plus');
7428	$help = __('If checked, photos uploaded by users who do not have photo album admin access rights need moderation.', 'wp-photo-album-plus');
7429	- $help .= '<br />'.__('Users who have photo album admin access rights can change the photo status to publish or featured.', 'wp-photo-album-plus');
7430	- $help .= '<br />'.wppa_see_also( 'admin', '1' );
7431	$slug = 'wppa_upload_moderate';
7432	$html1 = wppa_checkbox($slug);
7433	$html2 = '';
	@@ -7539,7 +7539,7 @@ global $wppa_subtab_names;
7539	$name = __('Permalink root', 'wp-photo-album-plus');
7540	$desc = __('The name of the root for the photofile permalink structure.', 'wp-photo-album-plus');
7541	$help = __('Choose a convenient name like "albums" or so; this will be the name of a folder inside .../wp-content/. Make sure you choose a unique name', 'wp-photo-album-plus');
7542	- $help .= '<br />'.__('If you make this field empty, the feature is disabled.', 'wp-photo-album-plus');
7543	$slug = 'wppa_pl_dirname';
7544	$html = wppa_input($slug, '150px');
7545	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
	@@ -7685,7 +7685,7 @@ global $wppa_subtab_names;
7685	$name = __('Frontend Edit', 'wp-photo-album-plus');
7686	$desc = __('Allow the uploader to edit the photo info', 'wp-photo-album-plus');
7687	$help = __('If selected, any logged in user who meets the criteria has the capability to edit the photo information.', 'wp-photo-album-plus');
7688	- $help .= '<br />'.__('Note: This may be AFTER moderation!!', 'wp-photo-album-plus');
7689	$slug = 'wppa_upload_edit';
7690	$opts = array( __('--- none ---', 'wp-photo-album-plus'), __('New style', 'wp-photo-album-plus') );
7691	$vals = array( '-none-', 'new' );
	@@ -7891,8 +7891,8 @@ global $wppa_subtab_names;
7891	$name = __('Super user', 'wp-photo-album-plus');
7892	$desc = __('Give these users all rights in wppa.', 'wp-photo-album-plus');
7893	$help = __('This gives the user all the administrator privileges within wppa.', 'wp-photo-album-plus');
7894	- $help .= '<br />'.__('Make sure the user also has a role that has all the capability boxes ticked', 'wp-photo-album-plus');
7895	- $help .= '<br />'.wppa_see_also( 'admin', '1' );
7896	$slug = 'wppa_superuser_user';
7897	$superlist = wppa_get_option( 'wppa_super_users', array() );
7898
	@@ -8126,7 +8126,7 @@ global $wppa_subtab_names;
8126	$name = __('Setup', 'wp-photo-album-plus');
8127	$desc = __('Re-initialize plugin.', 'wp-photo-album-plus');
8128	$help = __('Re-initilizes the plugin, (re)creates database tables and sets up default settings and directories if required.', 'wp-photo-album-plus');
8129	- $help .= '<br />'.__('This action may be required to setup blogs in a multiblog (network) site as well as in rare cases to correct initilization errors.', 'wp-photo-album-plus');
8130	$slug = 'wppa_setup';
8131	$html1 = '';
8132	$html2 = wppa_doit_button_new($slug);
	@@ -8475,7 +8475,7 @@ global $wppa_subtab_names;
8475	$name = __('Apply Default Photoname', 'wp-photo-album-plus');
8476	$desc = __('Apply Default photo name on all photos in the system.', 'wp-photo-album-plus');
8477	$help = __('Puts the content of Default photo name in all photo name.', 'wp-photo-album-plus');
8478	- $help .= '<br />'.wppa_see_also( 'new', '1', '29' );
8479	$slug2 = 'wppa_apply_default_photoname_all';
8480	$html1 = '';
8481	$html2 = wppa_maintenance_button( $slug2 );
	@@ -8487,7 +8487,7 @@ global $wppa_subtab_names;
8487	$name = __('Apply New Photodesc', 'wp-photo-album-plus');
8488	$desc = __('Apply New photo description on all photos in the system.', 'wp-photo-album-plus');
8489	$help = __('Puts the content of New photo desc in all photo descriptions.', 'wp-photo-album-plus');
8490	- $help .= '<br />'.wppa_see_also( 'new', '1', '13' );
8491	$slug2 = 'wppa_apply_new_photodesc_all';
8492	$html1 = '';
8493	$html2 = wppa_maintenance_button( $slug2 );
	@@ -8499,7 +8499,7 @@ global $wppa_subtab_names;
8499	$name = __('Append to photodesc', 'wp-photo-album-plus');
8500	$desc = __('Append this text to all photo descriptions.', 'wp-photo-album-plus');
8501	$help = __('Appends a space character and the given text to the description of all photos.', 'wp-photo-album-plus');
8502	- $help .= '<br />'.__('First edit the text to append, click outside the edit window and wait for the green checkmark to appear. Then click the Start! button.', 'wp-photo-album-plus');
8503	$slug1 = 'wppa_append_text';
8504	$slug2 = 'wppa_append_to_photodesc';
8505	$html1 = wppa_input( $slug1, '200px' );
	@@ -8512,7 +8512,7 @@ global $wppa_subtab_names;
8512	$name = __('Remove from photodesc', 'wp-photo-album-plus');
8513	$desc = __('Remove this text from all photo descriptions.', 'wp-photo-album-plus');
8514	$help = __('Removes all occurrencies of the given text from the description of all photos.', 'wp-photo-album-plus');
8515	- $help .= '<br />'.__('First edit the text to remove, click outside the edit window and wait for the green checkmark to appear. Then click the Start! button.', 'wp-photo-album-plus');
8516	$slug1 = 'wppa_remove_text';
8517	$slug2 = 'wppa_remove_from_photodesc';
8518	$html1 = wppa_input( $slug1, '200px' );
	@@ -8568,7 +8568,7 @@ global $wppa_subtab_names;
8568
8569	$name = __('Create all autopages', 'wp-photo-album-plus');
8570	$desc = __('Create all the pages to display slides individually.', 'wp-photo-album-plus');
8571	- $help = '<br />'.__('Make sure you have a custom menu and the "Automatically add new top-level pages to this menu" box UNticked!!', 'wp-photo-album-plus');
8572	$help .= wppa_see_also( 'system', '1', '8' );
8573	$slug2 = 'wppa_create_all_autopages';
8574	$html1 = '';
	@@ -8654,13 +8654,13 @@ global $wppa_subtab_names;
8654	$html3 = wppa_maintenance_button( $slug3 );
8655	$html4 = wppa_status_field( $slug3 );
8656	$html5 = wppa_togo_field( $slug3 );
8657	- $html = array( $html1 . '<br />' . $html2, $html3, $html4, $html5 );
8658	wppa_setting_new( false, '20', $name, $desc, $html, $help);
8659
8660	$name = __('Synchronize Cloudinary', 'wp-photo-album-plus');
8661	$desc = __('Removes/adds images in the cloud.', 'wp-photo-album-plus');
8662	$help = __('Removes old images and verifies/adds new images to Cloudinary.', 'wp-photo-album-plus');
8663	- $help .= '<br />'.wppa_see_also( 'miscadv', '4', '7' );
8664	$slug2 = 'wppa_sync_cloud';
8665	$html1 = '';
8666	$html2 = wppa_maintenance_button( $slug2 );
	@@ -8823,7 +8823,7 @@ global $wppa_subtab_names;
8823	$desc = __('The php code to execute on all albums', 'wp-photo-album-plus');
8824	$help = __('Only run this if you know what you are doing!', 'wp-photo-album-plus');
8825	$slug2 = 'wppa_custom_album_proc';
8826	- $html1 = wppa_textarea( $slug2 );
8827	$html2 = wppa_maintenance_button( $slug2 );
8828	$html3 = wppa_status_field( $slug2 );
8829	$html4 = wppa_togo_field( $slug2 );
	@@ -8834,7 +8834,7 @@ global $wppa_subtab_names;
8834	$desc = __('The php code to execute on all photos', 'wp-photo-album-plus');
8835	$help = __('Only run this if you know what you are doing!', 'wp-photo-album-plus');
8836	$slug2 = 'wppa_custom_photo_proc';
8837	- $html1 = wppa_textarea( $slug2 );
8838	$html2 = wppa_maintenance_button( $slug2 );
8839	$html3 = wppa_status_field( $slug2 );
8840	$html4 = wppa_togo_field( $slug2 );
	@@ -8909,7 +8909,7 @@ global $wppa_subtab_names;
8909	$name = __('All to lower', 'wp-photo-album-plus');
8910	$desc = __('Convert all file-extensions to lowercase.', 'wp-photo-album-plus');
8911	$help = __('Affects display files, thumbnail files, and saved extensions in database table. Leaves sourcefiles untouched', 'wp-photo-album-plus');
8912	- $help .= '<br />'.__('If both upper and lowercase files exist, the file with the uppercase extension will be removed.', 'wp-photo-album-plus');
8913	$slug2 = 'wppa_all_ext_to_lower';
8914	$html1 = wppa_cronjob_button( $slug2 );
8915	$html2 = wppa_maintenance_button( $slug2 );
	@@ -8951,7 +8951,7 @@ global $wppa_subtab_names;
8951	foreach ( $wppa_supported_camara_brands as $brand ) {
8952	$lbl = wppa_exif_tagname( $label['tag'], $brand, 'brandonly' );
8953	if ( $lbl ) {
8954	- $desc .= '<br />' . $brand;
8955	}
8956	}
8957
	@@ -8963,7 +8963,7 @@ global $wppa_subtab_names;
8963	foreach ( $wppa_supported_camara_brands as $brand ) {
8964	$lbl = wppa_exif_tagname( $label['tag'], $brand, 'brandonly' );
8965	if ( $lbl ) {
8966	- $html1 .= '<br ~~/><~~span style="clear:left;float:left;" >' . $lbl . ':</span>';
8967	}
8968	}
8969
	@@ -9055,7 +9055,7 @@ global $wppa_subtab_names;
9055	$name = __('GPX Shortcode', 'wp-photo-album-plus');
9056	$desc = __('The shortcode to be used for the gpx feature.', 'wp-photo-album-plus');
9057	$help = __('Enter / modify the shortcode to be generated for the gpx plugin. It must contain w#lat and w#lon as placeholders for the latitude and longitude.', 'wp-photo-album-plus');
9058	- $help .= '<br />' . __('This item is required for using an external Google maps viewer plugin only', 'wp-photo-album-plus');
9059	$slug = 'wppa_gpx_shortcode';
9060	$html = wppa_input($slug, '500px');
9061	wppa_setting_new($slug, '4', $name, $desc, $html, $help, wppa_opt( 'gpx_implementation' ) == 'external-plugin' );
	@@ -9096,7 +9096,7 @@ global $wppa_subtab_names;
9096	$name = sprintf(__('Name, vis, edit %s', 'wp-photo-album-plus'), $i);
9097	$desc = sprintf(__('The caption for field %s, visibility and editability at frontend.', 'wp-photo-album-plus'), $i);
9098	$help = sprintf(__('If you check the first box, the value of this field is displayable in photo descriptions at the frontend with keyword w#c%s', 'wp-photo-album-plus'), $i);
9099	- $help .= '<br />'.__('If you check the second box, the value of this field is editable at the frontend new style dialog.', 'wp-photo-album-plus');
9100	$slug1 = 'wppa_album_custom_caption_'.$i;
9101	$html1 = wppa_input($slug1, '300px');
9102	$slug2 = 'wppa_album_custom_visible_'.$i;
	@@ -9196,7 +9196,7 @@ global $wppa_subtab_names;
9196	$name = sprintf(__('Name, vis, edit %s dflt', 'wp-photo-album-plus'), $i);
9197	$desc = sprintf(__('The caption for field %s, visibility and editability at frontend.', 'wp-photo-album-plus'), $i);
9198	$help = sprintf(__('If you check the first box, the value of this field is displayable in photo descriptions at the frontend with keyword w#c%s', 'wp-photo-album-plus'), $i);
9199	- $help .= '<br />'.__('If you check the second box, the value of this field is editable at the frontend new style dialog.', 'wp-photo-album-plus');
9200	$slug1 = 'wppa_custom_caption_'.$i;
9201	$html1 = wppa_input($slug1, '300px');
9202	$slug2 = 'wppa_custom_visible_'.$i;
	@@ -9225,9 +9225,9 @@ global $wppa_subtab_names;
9225	$name = __('Watermark file', 'wp-photo-album-plus');
9226	$desc = __('The default watermarkfile to be used.', 'wp-photo-album-plus');
9227	$help = __('Watermark files are of type png and reside in', 'wp-photo-album-plus') . ' ' . WPPA_UPLOAD_URL . '/watermarks/';
9228	- $help .= '<br />'.__('A suitable watermarkfile typically consists of a transparent background and a black text or drawing.', 'wp-photo-album-plus');
9229	- $help .= '<br />'.sprintf(__('The watermark image will be overlaying the photo with %s%% transparency.', 'wp-photo-album-plus'), (100-wppa_opt( 'watermark_opacity' )));
9230	- $help .= '<br />'.__('You may also select one of the textual watermark types at the bottom of the selection list.', 'wp-photo-album-plus');
9231	$slug = 'wppa_watermark_file';
9232	$html = '<select style="float:left; font-size:11px; height:20px; margin:0 4px 0 0; padding:0; " id="wppa_watermark_file" onchange="wppaAjaxUpdateOptionValue(\'watermark_file\', this)" >' . wppa_watermark_file_select( 'system' ) . '</select>';
9233	$html .= '<img id="img_watermark_file" src="'.wppa_get_imgdir().'star.ico" title="'.__('Setting unmodified', 'wp-photo-album-plus').'" style="padding-left:4px; float:left; height:16px; width:16px;" />';
	@@ -9265,7 +9265,7 @@ global $wppa_subtab_names;
9265	$name = __('Predefined watermark text', 'wp-photo-album-plus');
9266	$desc = __('The text to use when --- pre-defined --- is selected.', 'wp-photo-album-plus');
9267	$help = __('You may use the following keywords:', 'wp-photo-album-plus');
9268	- $help .= '<br />'.__('w#site, w#displayname, all standard photo keywords, iptc and exif keywords', 'wp-photo-album-plus');
9269	$slug = 'wppa_textual_watermark_text';
9270	$html = wppa_textarea($slug, $name);
9271	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
	@@ -9303,8 +9303,8 @@ global $wppa_subtab_names;
9303	$name = __('Textual watermark font size', 'wp-photo-album-plus');
9304	$desc = __('You can set the size of the truetype fonts only.', 'wp-photo-album-plus');
9305	$help = __('System font can have size 1,2,3,4 or 5, in some stoneage fontsize units. Any value > 5 will be treated as 5.', 'wp-photo-album-plus');
9306	- $help .= '<br />'.__('Truetype fonts can have any positive integer size, if your PHPs GD version is 1, in pixels, in GD2 in points.', 'wp-photo-album-plus');
9307	- $help .= '<br />'.__('It is unclear how many pixels a point is...', 'wp-photo-album-plus');
9308	$slug = 'wppa_textual_watermark_size';
9309	$html = wppa_input($slug, '50px', '', 'points');
9310	wppa_setting_new($slug, '7', $name, $desc, $html, $help);
	@@ -9700,7 +9700,7 @@ global $wppa_subtab_names;
9700	$name = __('Default coverphoto selection', 'wp-photo-album-plus');
9701	$desc = __('Default select cover photo method.', 'wp-photo-album-plus');
9702	$help = __('The coverphoto slection method can be overruled on the edit album page.', 'wp-photo-album-plus');
9703	- $help .= '<br />' . __('Alternatively an individual photo can be selected on the edit album page.', 'wp-photo-album-plus');
9704	$opts = array( __('--- random ---', 'wp-photo-album-plus'),
9705	__('--- random featured ---', 'wp-photo-album-plus'),
9706	__('--- most recent added ---', 'wp-photo-album-plus'),
	@@ -9716,7 +9716,7 @@ global $wppa_subtab_names;
9716	$name = __('Default coverphoto selection', 'wp-photo-album-plus');
9717	$desc = __('Default select cover photo method.', 'wp-photo-album-plus');
9718	$help = __('The coverphoto slection method can be overruled on the edit album page.', 'wp-photo-album-plus');
9719	- $help .= '<br />' . __('Alternatively an individual photo can be selected on the edit album page.', 'wp-photo-album-plus');
9720	$opts = array( __('--- random ---', 'wp-photo-album-plus'),
9721	__('--- random featured ---', 'wp-photo-album-plus'),
9722	__('--- most recent added ---', 'wp-photo-album-plus'),
	@@ -9890,7 +9890,7 @@ global $wppa_subtab_names;
9890	$name = __('JPG image quality', 'wp-photo-album-plus');
9891	$desc = __('The jpg quality when photos are downsized', 'wp-photo-album-plus');
9892	$help = __('The higher the number the better the quality but the larger the file', 'wp-photo-album-plus');
9893	- $help .= '<br />'.__('Possible values 20..100', 'wp-photo-album-plus');
9894	$slug = 'wppa_jpeg_quality';
9895	$html = wppa_input($slug, '50px');
9896	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -9905,9 +9905,9 @@ global $wppa_subtab_names;
9905	$name = __('Enable <b>in-line</b> settings', 'wp-photo-album-plus');
9906	$desc = __('Activates shortcode [wppa_set].', 'wp-photo-album-plus');
9907	$help = __('Syntax: [wppa_set name="any wppa setting" value="new value"]', 'wp-photo-album-plus');
9908	- $help .= '<br />'.__('Example: [wppa_set name="wppa_thumbtype" value="masonry-v"] sets the thumbnail type to vertical masonry style', 'wp-photo-album-plus');
9909	- $help .= '<br />'.__('Do not forget to reset with [wppa_set]', 'wp-photo-album-plus');
9910	- $help .= '<br />'.__('Use with great care! There is no check on validity of values!', 'wp-photo-album-plus');
9911	$slug = 'wppa_enable_shortcode_wppa_set';
9912	$html = wppa_checkbox($slug);
9913	wppa_setting_new($slug, '3', $name, $desc, $html, $help);
	@@ -9915,7 +9915,7 @@ global $wppa_subtab_names;
9915	$name = __('Minimum tags', 'wp-photo-album-plus');
9916	$desc = __('These tags exist even when they do not occur in any photo.', 'wp-photo-album-plus');
9917	$help = __('Enter tags, separated by comma\'s (,)', 'wp-photo-album-plus');
9918	- $help .= '<br />'.__('Tags exist when they appear on any photo, and vanish when they do no longer appear. Except the tags you list here; they exist always.', 'wp-photo-album-plus');
9919	$slug = 'wppa_minimum_tags';
9920	$html = wppa_input($slug, '300px');
9921	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
	@@ -9945,7 +9945,7 @@ global $wppa_subtab_names;
9945	$name = __('Direct comment', 'wp-photo-album-plus');
9946	$desc = __('Enable direct commenting and rating from remote source', 'wp-photo-album-plus');
9947	$help = __('This setting has only effect when Encrypted links is mandatory', 'wp-photo-album-plus');
9948	- $help .= '<br />' . __('Use with care, and only in special situations!', 'wp-photo-album-plus');
9949	$slug = 'wppa_direct_comment';
9950	$html = wppa_checkbox($slug) . wppa_see_also( 'links', '1', '5.6' );
9951	wppa_setting_new($slug, '8', $name, $desc, $html, $help);
	@@ -10216,10 +10216,10 @@ global $wppa_subtab_names;
10216	$name = __('Fotomoto', 'wp-photo-album-plus');
10217	$desc = __('Yes, we use Fotomoto on this site. Read the help text!', 'wp-photo-album-plus');
10218	$help = __('In order to function properly:', 'wp-photo-album-plus');
10219	- $help .= '<br />'.__('1. Get yourself a Fotomoto account.', 'wp-photo-album-plus');
10220	- $help .= '<br />'.__('2. Install the Fotomoto plugin, enter the "Fotomoto Site Key:" and check the "Use API Mode:" checkbox.', 'wp-photo-album-plus');
10221	- $help .= '<br />'.__('Note: Do NOT Disable the Custom box in the Slideshow component specification.', 'wp-photo-album-plus');
10222	- $help .= '<br />'.__('Do NOT remove the text w#fotomoto from the Custombox content.', 'wp-photo-album-plus');
10223	$slug = 'wppa_fotomoto_on';
10224	$html = wppa_checkbox($slug, 'wppaRefreshAfter();') . wppa_see_also( 'slide', '1', '25.26' );
10225	wppa_setting_new($slug, '9', $name, $desc, $html, $help);
	@@ -10296,7 +10296,7 @@ global $wppa_subtab_names;
10296	$name = __('Foreign shortcodes fullsize', 'wp-photo-album-plus');
10297	$desc = __('Enable the use of non-wppa+ shortcodes in fullsize photo descriptions.', 'wp-photo-album-plus');
10298	$help = __('When checked, you can use shortcodes from other plugins in the description of photos.', 'wp-photo-album-plus');
10299	- $help .= '<br />'.__('The shortcodes will be expanded in the descriptions of fullsize images.', 'wp-photo-album-plus');
10300	$slug = 'wppa_allow_foreign_shortcodes';
10301	$html = wppa_checkbox($slug);
10302	wppa_setting_new($slug, '1', $name, $desc, $html, $help);
	@@ -10304,7 +10304,7 @@ global $wppa_subtab_names;
10304	$name = __('Foreign shortcodes thumbnails', 'wp-photo-album-plus');
10305	$desc = __('Enable the use of non-wppa+ shortcodes in thumbnail photo descriptions.', 'wp-photo-album-plus');
10306	$help = __('When checked, you can use shortcodes from other plugins in the description of photos.', 'wp-photo-album-plus');
10307	- $help .= '<br />'.__('The shortcodes will be expanded in the descriptions of thumbnail images.', 'wp-photo-album-plus');
10308	$slug = 'wppa_allow_foreign_shortcodes_thumbs';
10309	$html = wppa_checkbox($slug);
10310	wppa_setting_new($slug, '2', $name, $desc, $html, $help);
	@@ -10340,12 +10340,12 @@ global $wppa_subtab_names;
10340	$name = __('Use SCABN', 'wp-photo-album-plus');
10341	$desc = __('Use the wppa interface to Simple Cart & Buy Now plugin.', 'wp-photo-album-plus');
10342	$help = __('If checked, the shortcode to use for the "add to cart" button in photo descriptions is [cart ...]', 'wp-photo-album-plus');
10343	- $help .= '<br />'.__('as opposed to [scabn ...] for the original scabn "add to cart" button.', 'wp-photo-album-plus');
10344	- $help .= '<br />'.__('The shortcode for the check-out page is still [scabn]', 'wp-photo-album-plus');
10345	- $help .= '<br />'.__('The arguments are the same, the defaults are: name = photoname, price = 0.01.', 'wp-photo-album-plus');
10346	- $help .= '<br />'.__('Supplying the price should be sufficient; supply a name only when it differs from the photo name.', 'wp-photo-album-plus');
10347	- $help .= '<br />'.__('This shortcode handler will also work with Ajax enabled.', 'wp-photo-album-plus');
10348	- $help .= '<br />'.__('Using this interface makes sure that the item urls and callback action urls are correct.', 'wp-photo-album-plus');
10349	$slug = 'wppa_use_scabn';
10350	$html = wppa_checkbox($slug);
10351	wppa_setting_new($slug, '7', $name, $desc, $html, $help);
	@@ -10405,8 +10405,8 @@ global $wppa_subtab_names;
10405	// Report resource used
10406	echo '
10407	<div style="clear:both;" >' .
10408	- sprintf(__('<br />Memory used on this page: %6.2f Mb.', 'wp-photo-album-plus'), memory_get_peak_usage(true)/(1024*1024)) .
10409	- sprintf(__('<br />There are %d settings and %d runtime parameters.', 'wp-photo-album-plus'), count($wppa_opt), count($wppa)) . '
10410	</div>';
10411
10412	wppa_initialize_runtime( true );


3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	+ * Version 8.1.05.001
7	*
8	*/
9

269	}
270	else {
271	wppa_ok_message( 'Not yet Done! wppa_delete_all_from_cloudinary' .
272	+ '<br>Please restart' );
273	}
274	break;
275

280	}
281	else {
282	wppa_ok_message( 'Not yet Done! wppa_delete_derived_from_cloudinary' .
283	+ '<br>Please restart' );
284	}
285	break;
286

319	__( 'Filesystem method:', 'wp-photo-album-plus' ) . ' ' . get_filesystem_method();
320	}
321	echo '
322	+ <br>';
323
324	if ( is_multisite() ) {
325	if ( WPPA_MULTISITE_GLOBAL ) {

383	if ( wppa_opt( 'photo_admin_max_albums' ) ) { // Not OFF
384	$abs = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_albums" );
385	if ( wppa_opt( 'photo_admin_max_albums' ) < $abs ) {
386	+ wppa_warning_message( __( 'This system contains more albums than the maximum configured.', 'wp-photo-album-plus' ) . wppa_see_also( 'admin', '6', '6' ) . '<br>' .
387	__( 'No problem, but some widgets may not work and some album selectionboxes will revert to a simple input field asking for an album id.', 'wp-photo-album-plus' ) . ' ' .
388	+ __( 'If you do not have pageload performance problems, you may increase the number number configured.', 'wp-photo-album-plus' ) . '<br>' .
389	__( 'If there are many empty albums, you can simply remove them by running the appropriate maintenance routine.', 'wp-photo-album-plus' ) . wppa_see_also( 'maintenance', '2', '9' ) );
390	}
391	}

393	// Check for availability of hires urls in case panorama is on
394	if ( wppa_switch( 'enable_panorama' ) ) {
395	if ( ! wppa_switch( 'keep_source' ) ) {
396	+ wppa_warning_message( __( 'You enabled the display of complex panoramic photos', 'wp-photo-album-plus' ) . wppa_see_also( 'photos', '1', '3' ) . '<br>' .
397	__( 'It is strongly recommended that you save sourcefiles during upload in order to preserve resolution.', 'wp-photo-album-plus' ) . wppa_see_also( 'files', '1', '1', '', '', true ) );
398	}
399	}
400
401	// Check on configuration when Grid covertype has been selected.
402	if ( wppa_opt( 'cover_type' ) == 'grid' ) {
403	+ $stdmsg = __( 'You selected covertype "Grid with images only".', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '3', '4' ) . '<br>' .
404	+ __( 'To assure proper layout, please correct the following configuration issues.', 'wp-photo-album-plus' ) . '<br>';
405	$message = $stdmsg;
406	$doit = false;
407	if ( wppa_opt( 'max_cover_width' ) > wppa_opt( 'smallsize' ) ) {
408	+ $msg = __( 'Max Cover width may not be larger than Coverphoto size', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '1', '1.7', '', '', true ) . '<br>';
409	$message .= $msg;
410	$doit = true;
411	}
412	if ( wppa_opt( 'thumb_aspect' ) == '0:0:none' && ! ( wppa_switch( 'cover_use_thumb' ) ) ) {
413	+ $msg = __( 'Thumbnail Aspect may not be set to "--- same as fullsize ---"','wp-photo-album-plus') . wppa_see_also( 'thumbs', '1', '3', '', '', true ) . '<br>' .
414	__( 'Alternatively you can activate Use thumb on cover', 'wp-photo-album-plus' ) . wppa_see_also( 'covers', '3', '8' );
415	$message .= $msg;
416	$doit = true;

426
427	$result = wppa_search_magick();
428	$mes = __('Image Magick is detected on your server', 'wp-photo-album-plus') . '. ';
429	+ $mes .= __('To be able to use the most advanced features of WPPA, the Imagic shellcommand <b>convert</b> must be available', 'wp-photo-album-plus') . '.<br>';
430
431	// Shell command found
432	if ( ! empty( $result ) ) {
433	+ $mes .= __('This command is found on the following file system locations', 'wp-photo-album-plus') . ':<br>';
434	foreach ( $result as $item ) {
435	+ $mes .= $item[0] . '<br>';
436	}
437	update_option( 'wppa_image_magick', $result[0][0] );
438	$wppa_opt['wppa_image_magick'] = $result[0][0];
439	+ $mes .= sprintf( __('The location <b>%s</b> has been activated.', 'wp-photo-album-plus'), $result[0][0] ) . wppa_see_also( 'miscadv', '3', '13' ) . '<br>';
440	+ $mes .= __('You may change it into a different path that contains the Imagick <b>convert</b> command at any time', 'wp-photo-album-plus') . '.<br>';
441	$mes .= __('To disable ImageMagick, enter <b>none</b>', 'wp-photo-album-plus');
442	}
443
444	// Shell command not found
445	else {
446	$mes .= __('The Imagick shellcommand <b>convert</b> could not be detected.', 'wp-photo-album-plus') . '<br >';
447	+ $mes .= __('Ask your hosting provider for the absolute path to this command if it is available', 'wp-photo-album-plus') . '<br>';
448	}
449
450	wppa_ok_message($mes);

1025	$name = __('Separator', 'wp-photo-album-plus');
1026	$desc = __('Breadcrumb separator symbol.', 'wp-photo-album-plus');
1027	$help = __('Select the desired breadcrumb separator element.', 'wp-photo-album-plus');
1028	+ $help .= '<br>'.__('A text string may contain valid html.', 'wp-photo-album-plus');
1029	+ $help .= '<br>'.__('An image will be scaled automatically if you set the navigation font size.', 'wp-photo-album-plus');
1030	$slug = 'wppa_bc_separator';
1031	$opts = array('&raquo', '&rsaquo', '&gt', '&bull', __('Text (html):', 'wp-photo-album-plus'), __('Image (url):', 'wp-photo-album-plus'));
1032	$vals = array('raquo', 'rsaquo', 'gt', 'bull', 'txt', 'url');

1036	$name = __('Html', 'wp-photo-album-plus');
1037	$desc = __('Breadcrumb separator text.', 'wp-photo-album-plus');
1038	$help = __('Enter the HTML code that produces the separator symbol you want.', 'wp-photo-album-plus');
1039	+ $help .= '<br>'.__('It may be as simple as \'-\' (without the quotes) or as complex as a tag like <div>..</div>.', 'wp-photo-album-plus');
1040	$slug = 'wppa_bc_txt';
1041	$html = wppa_input($slug, '90%', '300px');
1042	wppa_setting_new($slug, '15', $name, $desc, $html, $help);

1533	$name = __('Max Cover width', 'wp-photo-album-plus');
1534	$desc = __('Maximum width for a album cover display.', 'wp-photo-album-plus');
1535	$help = __('Display covers in 2 or more columns if the display area is wider than the given width.', 'wp-photo-album-plus');
1536	+ $help .= '<br>'.__('This also applies for \'thumbnails as covers\', and will NOT apply to single items.', 'wp-photo-album-plus');
1537	$slug = 'wppa_max_cover_width';
1538	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1539	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

1548	$name = __('Min Text frame height', 'wp-photo-album-plus');
1549	$desc = __('The minimal cover text frame height incl header.', 'wp-photo-album-plus');
1550	$help = __('The height starting with the album title up to and including the view- and the slideshow- links.', 'wp-photo-album-plus');
1551	+ $help .= '<br>'.__('This setting enables you to give the album covers the same height while the title does not need to fit on one line.', 'wp-photo-album-plus');
1552	+ $help .= '<br>'.__('This is the recommended setting to line-up your covers!', 'wp-photo-album-plus');
1553	$slug = 'wppa_head_and_text_frame_height';
1554	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1555	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

1557	$name = __('Min Description height', 'wp-photo-album-plus');
1558	$desc = __('The minimal height of the album description text frame.', 'wp-photo-album-plus');
1559	$help = __('The minimal height of the description field in an album cover display.', 'wp-photo-album-plus');
1560	+ $help .= '<br>'.__('This setting enables you to give the album covers the same height provided that the cover images are equally sized and the titles fit on one line.', 'wp-photo-album-plus');
1561	+ $help .= '<br>'.__('To force the coverphotos have equal heights, tick the box in <b>Albums -> I -> Size is height</b>', 'wp-photo-album-plus');
1562	+ $help .= '<br>'.__('You may need this setting if changing the previous setting is not sufficient to line-up the covers.', 'wp-photo-album-plus');
1563	$slug = 'wppa_text_frame_height';
1564	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1565	wppa_setting_new($slug, '4', $name, $desc, $html, $help);

1577	$name = __('Coverphoto size', 'wp-photo-album-plus');
1578	$desc = __('The size of the coverphoto.', 'wp-photo-album-plus');
1579	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1580	+ $help .= '<br>'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1581	$slug = 'wppa_smallsize';
1582	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1583	wppa_setting_new($slug, '6', $name, $desc, $html, $help, ! wppa_switch( 'coverphoto_responsive' ));

1585	$name = __('Coverphoto size', 'wp-photo-album-plus');
1586	$desc = __('The size of the coverphoto.', 'wp-photo-album-plus');
1587	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1588	+ $help .= '<br>'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1589	$slug = 'wppa_smallsize_percentage';
1590	$html = wppa_input($slug, '40px', '', __('percent', 'wp-photo-album-plus'));
1591	wppa_setting_new($slug, '7', $name, $desc, $html, $help, wppa_switch( 'coverphoto_responsive' ));

1593	$name = __('Coverphoto size multi', 'wp-photo-album-plus');
1594	$desc = __('The size of coverphotos if more than one.', 'wp-photo-album-plus');
1595	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1596	+ $help .= '<br>'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1597	$slug = 'wppa_smallsize_multi';
1598	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
1599	wppa_setting_new($slug, '8', $name, $desc, $html, $help, ! wppa_switch( 'coverphoto_responsive' ));

1601	$name = __('Coverphoto size multi', 'wp-photo-album-plus');
1602	$desc = __('The size of coverphotos if more than one.', 'wp-photo-album-plus');
1603	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
1604	+ $help .= '<br>'.__('Changing the coverphoto size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
1605	$slug = 'wppa_smallsize_multi_percentage';
1606	$html = wppa_input($slug, '40px', '', __('percent', 'wp-photo-album-plus'));
1607	wppa_setting_new($slug, '9', $name, $desc, $html, $help, wppa_switch( 'coverphoto_responsive' ));

1609	$name = __('Size is height', 'wp-photo-album-plus');
1610	$desc = __('The size of the coverphoto is the height of it.', 'wp-photo-album-plus');
1611	$help = __('If set: the previous setting is the height, if unset: the largest of width and height.', 'wp-photo-album-plus');
1612	+ $help .= '<br>'.__('This setting applies for coverphoto position top or bottom only (<b>Albums -> III -> Placement</b>).', 'wp-photo-album-plus');
1613	+ $help .= '<br>'.__('This makes it easyer to make the covers of equal height.', 'wp-photo-album-plus');
1614	$slug = 'wppa_coversize_is_height';
1615	$html = wppa_checkbox($slug);
1616	wppa_setting_new($slug, '10', $name, $desc, $html, $help);

1654	$name = __('Slideshow/Browse', 'wp-photo-album-plus');
1655	$desc = __('Display the Slideshow / Browse photos link on album covers', 'wp-photo-album-plus');
1656	$help = __('This setting causes the Slideshow link to be displayed on the album cover.', 'wp-photo-album-plus');
1657	+ $help .= '<br>'.__('If slideshows are disabled in item 2 in this table, you will see a browse link to fullsize images.', 'wp-photo-album-plus');
1658	+ $help .= '<br>'.__('If you do not want the browse link either, uncheck this item.', 'wp-photo-album-plus');
1659	$slug = 'wppa_show_slideshowbrowselink';
1660	$html = wppa_checkbox($slug);
1661	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

1728	$name = __('Placement', 'wp-photo-album-plus');
1729	$desc = __('Cover image position.', 'wp-photo-album-plus');
1730	$help = __('Enter the position that you want to be used for the default album cover selected in <b>Albums -> III -> Cover type</b>', 'wp-photo-album-plus');
1731	+ $help .= '<br>'.__('For covertype Image Factory: left will be treated as top and right will be treted as bottom.', 'wp-photo-album-plus');
1732	+ $help .= '<br>'.__('For covertype Long Descriptions: top will be treated as left and bottom will be treted as right.', 'wp-photo-album-plus');
1733	$slug = 'wppa_coverphoto_pos';
1734	$opts = array(__('Left', 'wp-photo-album-plus'), __('Right', 'wp-photo-album-plus'), __('Top', 'wp-photo-album-plus'), __('Bottom', 'wp-photo-album-plus'));
1735	$vals = array('left', 'right', 'top', 'bottom');

1753	$name = __('Cover type', 'wp-photo-album-plus');
1754	$desc = __('Select the default cover type.', 'wp-photo-album-plus');
1755	$help = __('Types with the addition mcr are suitable for Multi Column in a Responsive theme', 'wp-photo-album-plus');
1756	+ $help .= '<br>'.__("Type 'Grid with images only' is always responsive and requires a fixed aspect ratio selected for thumbnails in <b>Thumbnails -> I -> Thumbnail Aspect</b>", 'wp-photo-album-plus');
1757	$slug = 'wppa_cover_type';
1758	$opts = array( __('Standard', 'wp-photo-album-plus'),
1759	__('Long Descriptions', 'wp-photo-album-plus'),

1904	$name = __('Size', 'wp-photo-album-plus');
1905	$desc = __('Specify the size (width) of the image.', 'wp-photo-album-plus');
1906	$help = __('Use the same syntax as in the [wppa size=".."] shortcode', 'wp-photo-album-plus');
1907	+ $help .= '<br>'.__('Examples: 350 for a fixed width of 350 pixels, or: 0.75 for a responsive display of 75% width, or: auto,350 for responsive with a maximum of 350 pixels.', 'wp-photo-album-plus');
1908	$slug = 'wppa_photo_shortcode_size';
1909	$html = wppa_input($slug, '300px');
1910	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

1929	$name = __('Fe type', 'wp-photo-album-plus');
1930	$desc = __('Frontend editor shortcode generator output type', 'wp-photo-album-plus');
1931	$help = __( 'If you want to use the shortcode generator in frontend tinymce editors, select if you want the shortcode or the html to be entered in the post', 'wp-photo-album-plus');
1932	+ $help .= '<br>'.__('Select \'html\' if the inserted shortcode not is converted to the photo', 'wp-photo-album-plus');
1933	$slug = 'wppa_photo_shortcode_fe_type';
1934	$opts = array( __('--- none ---', 'wp-photo-album-plus'),
1935	__('shortcode', 'wp-photo-album-plus'),

1970	$name = __('Select photo once', 'wp-photo-album-plus');
1971	$desc = __('The same random photo on every pageload', 'wp-photo-album-plus');
1972	$help = __('If ticked: the random photo is determined once at page/post creation time', 'wp-photo-album-plus');
1973	+ $help .= '<br>'.__('If unticked: every pageload a different photo', 'wp-photo-album-plus');
1974	$slug = 'wppa_photo_shortcode_random_fixed';
1975	$html = wppa_checkbox($slug);
1976	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
1977
1978	$name = __('Render photo once', 'wp-photo-album-plus');
1979	$desc = __('Replace shortcode by html', 'wp-photo-album-plus');
1980	+ $help = __('Do not replace \'random\' by a number, but by the corresponding html', 'wp-photo-album-plus') . '<br>';
1981	$help .= __('WARNING: changes in [photo] shortcode afterwards do no longer have any effect!', 'wp-photo-album-plus');
1982	$slug = 'wppa_photo_shortcode_random_fixed_html';
1983	$html = wppa_checkbox($slug);

2264	$html .= '
2265	<div style="display:inline-block;width:75%;text-align:center;vertical-align:middle;" >' .
2266	__( 'Album', 'wp-photo-album-plus' ) . ': ' . htmlspecialchars( wppa_get_album_name( $photo['album'] ) ) . '
2267	+ <br>' .
2268	__('Uploader', 'wp-photo-album-plus') . ': ' . htmlspecialchars( $photo['owner'] ) . '
2269	</div>';
2270	}

2448	$name = __('Thumbnail Size', 'wp-photo-album-plus');
2449	$desc = __('The size of the thumbnail images.', 'wp-photo-album-plus');
2450	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2451	+ $help .= '<br>'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2452	$slug = 'wppa_thumbsize';
2453	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2454	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

2456	$name = __('Thumbnail Size Alt', 'wp-photo-album-plus');
2457	$desc = __('The alternative size of the thumbnail images.', 'wp-photo-album-plus');
2458	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2459	+ $help .= '<br>'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2460	$slug = 'wppa_thumbsize_alt';
2461	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2462	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

2512	$name = __('Thumbframe width', 'wp-photo-album-plus');
2513	$desc = __('The width of the thumbnail frame.', 'wp-photo-album-plus');
2514	$help = __('Set the width of the thumbnail frame.', 'wp-photo-album-plus');
2515	+ $help .= '<br>'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2516	+ $help .= '<br>'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2517	$slug = 'wppa_tf_width';
2518	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2519	wppa_setting_new($slug, '5', $name, $desc, $html, $help);

2521	$name = __('Thumbframe width Alt', 'wp-photo-album-plus');
2522	$desc = __('The width of the alternative thumbnail frame.', 'wp-photo-album-plus');
2523	$help = __('Set the width of the thumbnail frame.', 'wp-photo-album-plus');
2524	+ $help .= '<br>'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2525	+ $help .= '<br>'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2526	$slug = 'wppa_tf_width_alt';
2527	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2528	wppa_setting_new($slug, '6', $name, $desc, $html, $help);

2530	$name = __('Thumbframe height', 'wp-photo-album-plus');
2531	$desc = __('The height of the thumbnail frame.', 'wp-photo-album-plus');
2532	$help = __('Set the height of the thumbnail frame.', 'wp-photo-album-plus');
2533	+ $help .= '<br>'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2534	+ $help .= '<br>'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2535	$slug = 'wppa_tf_height';
2536	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2537	wppa_setting_new($slug, '7', $name, $desc, $html, $help);

2539	$name = __('Thumbframe height Alt', 'wp-photo-album-plus');
2540	$desc = __('The height of the alternative thumbnail frame.', 'wp-photo-album-plus');
2541	$help = __('Set the height of the thumbnail frame.', 'wp-photo-album-plus');
2542	+ $help .= '<br>'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2543	+ $help .= '<br>'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2544	$slug = 'wppa_tf_height_alt';
2545	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2546	wppa_setting_new($slug, '8', $name, $desc, $html, $help);

2548	$name = __('Thumbnail spacing', 'wp-photo-album-plus');
2549	$desc = __('The spacing between adjacent thumbnail frames.', 'wp-photo-album-plus');
2550	$help = __('Set the minimal spacing between the adjacent thumbnail frames', 'wp-photo-album-plus');
2551	+ $help .= '<br>'.__('Set width, height and spacing for the thumbnail frames.', 'wp-photo-album-plus');
2552	+ $help .= '<br>'.__('These sizes should be large enough for a thumbnail image and - optionally - the text under it.', 'wp-photo-album-plus');
2553	$slug = 'wppa_tn_margin';
2554	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2555	wppa_setting_new($slug, '9', $name, $desc, $html, $help);

2557	$name = __('Auto spacing', 'wp-photo-album-plus');
2558	$desc = __('Space the thumbnail frames automatic.', 'wp-photo-album-plus');
2559	$help = __('If you check this box, the thumbnail images will be evenly distributed over the available width.', 'wp-photo-album-plus');
2560	+ $help .= '<br>'.__('In this case, the thumbnail spacing value (setting I-9) will be regarded as a minimum value.', 'wp-photo-album-plus');
2561	$slug = 'wppa_thumb_auto';
2562	$html = wppa_checkbox($slug);
2563	wppa_setting_new($slug, '10', $name, $desc, $html, $help);

2572	$name = __('Popup size', 'wp-photo-album-plus');
2573	$desc = __('The size of the thumbnail popup images.', 'wp-photo-album-plus');
2574	$help = __('Enter the size of the popup images. This size should be larger than the thumbnail size.', 'wp-photo-album-plus');
2575	+ $help .= '<br>'.__('This size should also be at least the cover image size.', 'wp-photo-album-plus');
2576	+ $help .= '<br>'.__('Changing the popup size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2577	+ $help .= '<br>'.__('Although this setting has only visual effect if "Thumb popup" (<b>Thumbnails -> III -> Thumb popup</b>) is checked,', 'wp-photo-album-plus');
2578	$help .= ' '.__('the value must be right as it is the physical size of the thumbnail and coverphoto images.', 'wp-photo-album-plus');
2579	$slug = 'wppa_popupsize';
2580	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));

2583	$name = __('Use thumbs if fit', 'wp-photo-album-plus');
2584	$desc = __('Use the thumbnail image files if they are large enough.', 'wp-photo-album-plus');
2585	$help = __('This setting speeds up page loading for small photos.', 'wp-photo-album-plus');
2586	+ $help .= '<br>'.__('Do NOT use this when your thumbnails have a forced aspect ratio (when <b>Thumbnails -> I -> Thumbnail Aspect</b> is set to anything different from --- same as fullsize ---)', 'wp-photo-album-plus');
2587	$slug = 'wppa_use_thumbs_if_fit';
2588	$html = wppa_checkbox($slug);
2589	wppa_setting_new($slug, '13', $name, $desc, $html, $help);

2804	$name = __('Vertical alignment', 'wp-photo-album-plus');
2805	$desc = __('Vertical alignment of thumbnails.', 'wp-photo-album-plus');
2806	$help = __('Specify the vertical alignment of thumbnail images. Use this setting when albums contain both portrait and landscape photos.', 'wp-photo-album-plus');
2807	+ $help .= '<br>'.__('It is NOT recommended to use the value --- default ---; it will affect the horizontal alignment also and is meant to be used with custom css.', 'wp-photo-album-plus');
2808	$slug = 'wppa_valign';
2809	$opts = array( __('--- default ---', 'wp-photo-album-plus'), __('top', 'wp-photo-album-plus'), __('center', 'wp-photo-album-plus'), __('bottom', 'wp-photo-album-plus'));
2810	$vals = array('default', 'top', 'center', 'bottom');

2881	$name = __('Maximum Width', 'wp-photo-album-plus');
2882	$desc = __('The maximum width photos will be displayed in slideshows.', 'wp-photo-album-plus');
2883	$help = __('Enter the largest size in pixels as how you want your photos to be displayed.', 'wp-photo-album-plus');
2884	+ $help .= '<br>'.__('This is usually the same as the Column Width, but it may differ.', 'wp-photo-album-plus');
2885	+ $help .= '<br>'.wppa_see_also( 'layout', '1', '5' );
2886	$slug = 'wppa_fullsize';
2887	$html = wppa_input($slug, '40px', '', __('pixels wide', 'wp-photo-album-plus'));
2888	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

2890	$name = __('Maximum Height', 'wp-photo-album-plus');
2891	$desc = __('The maximum height photos will be displayed in slideshows.', 'wp-photo-album-plus');
2892	$help = __('Enter the largest size in pixels as how you want your photos to be displayed.', 'wp-photo-album-plus');
2893	+ $help .= '<br>'.__('This setting defines the height of the space reserved for photos in slideshows.', 'wp-photo-album-plus');
2894	+ $help .= '<br>'.__('If you change the width of a display by the size=".." shortcode attribute, this value changes proportionally to match the aspect ratio as defined by this and the previous setting.', 'wp-photo-album-plus');
2895	$slug = 'wppa_maxheight';
2896	$html = wppa_input($slug, '40px', '', __('pixels high', 'wp-photo-album-plus'));
2897	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

2906	$name = __('Slideshow borderwidth', 'wp-photo-album-plus');
2907	$desc = __('The width of the border around slideshow images.', 'wp-photo-album-plus');
2908	$help = __('The border is made by the image background being larger than the image itsself (padding).', 'wp-photo-album-plus');
2909	+ $help .= '<br>'.__('Additionally there may be a one pixel outline of a different color.', 'wp-photo-album-plus');
2910	+ $help .= '<br>'.__('The number you enter here is exclusive the one pixel outline.', 'wp-photo-album-plus');
2911	+ $help .= '<br>'.__('If you leave this entry empty, there will be no outline either.', 'wp-photo-album-plus');
2912	+ $help .= '<br>'.wppa_see_also( 'slide', '1', '35' );
2913	$slug = 'wppa_fullimage_border_width';
2914	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2915	$clas = '';

2928	$name = __('Mini Threshold', 'wp-photo-album-plus');
2929	$desc = __('Show mini text at slideshow smaller than.', 'wp-photo-album-plus');
2930	$help = __('Display Next and Prev. as opposed to Next photo and Previous photo when the cotainer is smaller than this size.', 'wp-photo-album-plus');
2931	+ $help .= '<br>'.__('Special use in responsive themes.', 'wp-photo-album-plus');
2932	$slug = 'wppa_mini_treshold';
2933	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2934	wppa_setting_new($slug, '6', $name, $desc, $html, $help);

2943	$name = __('Filmstrip Thumbnail Size', 'wp-photo-album-plus');
2944	$desc = __('The size of the filmstrip images.', 'wp-photo-album-plus');
2945	$help = __('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus');
2946	+ $help .= '<br>'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
2947	$slug = 'wppa_film_thumbsize';
2948	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
2949	wppa_setting_new($slug, '8', $name, $desc, $html, $help);

3043	$name = __('Big Browse Buttons', 'wp-photo-album-plus');
3044	$desc = __('Enable invisible browsing buttons.', 'wp-photo-album-plus');
3045	$help = __('If checked, the fullsize image is covered by two invisible areas that act as browse buttons.', 'wp-photo-album-plus');
3046	+ $help .= '<br>'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
3047	+ $help .= '<br>'.wppa_see_also( 'slide', '1', '2' );
3048	$slug = 'wppa_show_bbb';
3049	$html = wppa_checkbox($slug);
3050	wppa_setting_new($slug, '22', $name, $desc, $html, $help);

3066	$name = __('Show custom box', 'wp-photo-album-plus');
3067	$desc = __('Display the custom box in the slideshow', 'wp-photo-album-plus');
3068	$help = __('You can fill the custom box with any html you like. It will not be checked, so it is your own responsibility to close tags properly.', 'wp-photo-album-plus');
3069	+ $help .= '<br>'.wppa_see_also( 'slide', '2' );
3070	$slug = 'wppa_custom_on';
3071	$html = wppa_checkbox($slug);
3072	wppa_setting_new($slug, '25', $name, $desc, $html, $help);

3074	$name = __('Custom content', 'wp-photo-album-plus');
3075	$desc = __('The content (html) of the custom box.', 'wp-photo-album-plus');
3076	$help = __('You can fill the custom box with any html you like. It will not be checked, so it is your own responsibility to close tags properly.', 'wp-photo-album-plus');
3077	+ $help .= '<br>'.wppa_see_also( 'slide', '2' );
3078	$slug = 'wppa_custom_content';
3079	$html = wppa_textarea($slug, $name);
3080	wppa_setting_new(false, '26', $name, $desc, $html, $help);

3148	$name = __('Slide Image border', 'wp-photo-album-plus');
3149	$desc = __('Fullsize Slideshow Photos background and border.', 'wp-photo-album-plus');
3150	$help = '';
3151	+ $help .= '<br>'.__('The colors may be equal or "transparent"', 'wp-photo-album-plus');
3152	$slug1 = 'wppa_bgcolor_fullimg';
3153	$slug2 = 'wppa_bcolor_fullimg';
3154	$slug = array($slug1, $slug2);

3311	$name = __('H align', 'wp-photo-album-plus');
3312	$desc = __('Horizontal alignment of slideshow images.', 'wp-photo-album-plus');
3313	$help = __('Specify the horizontal alignment of slideshow images. If you specify --- none --- , no horizontal alignment will take place.', 'wp-photo-album-plus');
3314	+ $help .= '<br>'.(__('This setting is only usefull when the Column Width differs from the Maximum Width.', 'wp-photo-album-plus'));
3315	+ $help .= '<br>'.(__('(Settings I-A1 and I-B1)', 'wp-photo-album-plus'));
3316	$slug = 'wppa_fullhalign';
3317	$opts = array(__('--- none ---', 'wp-photo-album-plus'), __('left', 'wp-photo-album-plus'), __('center', 'wp-photo-album-plus'), __('right', 'wp-photo-album-plus'));
3318	$vals = array('default', 'left', 'center', 'right');

3331	$name = __('Remove redundant space', 'wp-photo-album-plus');
3332	$desc = __('Removes unwanted <p> and <br> tags in fullsize descriptions.', 'wp-photo-album-plus');
3333	$help = __('This setting has only effect when Foreign Shortcodes is checked.', 'wp-photo-album-plus');
3334	+ $help .= '<br>'.wppa_see_also( 'miscadv', '4', '1' );
3335	$slug = 'wppa_clean_pbr';
3336	$html = wppa_checkbox($slug);
3337	wppa_setting_new($slug, '5', $name, $desc, $html, $help);

3366	$name = __('Start', 'wp-photo-album-plus');
3367	$desc = __('Start slideshow running.', 'wp-photo-album-plus');
3368	$help = __('If you select "running", the slideshow will start running immediately, if you select "still at first photo", the first photo will be displayed in browse mode.', 'wp-photo-album-plus');
3369	+ $help .= '<br>'.__('If you select "still at first norated", the first photo that the visitor did not gave a rating will be displayed in browse mode.', 'wp-photo-album-plus');
3370	$slug = 'wppa_start_slide';
3371	$opts = array( __('running', 'wp-photo-album-plus'),
3372	__('still at first photo', 'wp-photo-album-plus'),

3433	$name = __('Speed', 'wp-photo-album-plus');
3434	$desc = __('Slideshow animation speed.', 'wp-photo-album-plus');
3435	$help = __('Specify the animation speed to be used in slideshows.', 'wp-photo-album-plus');
3436	+ $help .= '<br>'.__('This is the time it takes a photo to fade in or out.', 'wp-photo-album-plus');
3437	$slug = 'wppa_animation_speed';
3438	$opts = array(__('--- off ---', 'wp-photo-album-plus'), '200 ms.', '400 ms.', '800 ms.', '1.2 s.', '2 s.', '4 s.', '6 s.', '8 s.', '10 s.');
3439	$vals = array('10', '200', '400', '800', '1200', '2000', '4000', '6000', '8000', '10000');

3802	$name = __('Last comment first', 'wp-photo-album-plus');
3803	$desc = __('Display the newest comment on top.', 'wp-photo-album-plus');
3804	$help = __('If checked: Display the newest comment on top.', 'wp-photo-album-plus');
3805	+ $help .= '<br>'.(__('If unchecked, the comments are listed in the ordere they were entered.', 'wp-photo-album-plus'));
3806	$slug = 'wppa_comments_desc';
3807	$html = wppa_checkbox($slug);
3808	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

4016	$name = __('Rating change', 'wp-photo-album-plus');
4017	$desc = __('Users may change their ratings.', 'wp-photo-album-plus');
4018	$help = __('Users may change their ratings.', 'wp-photo-album-plus');
4019	+ $help .= '<br>'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4020	$slug = 'wppa_rating_change';
4021	$html = wppa_checkbox($slug);
4022	wppa_setting_new($slug, '10', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4061	$name = __('Star off opacity', 'wp-photo-album-plus');
4062	$desc = __('Rating star off state opacity value.', 'wp-photo-album-plus');
4063	$help = __('Enter percentage of opacity. 100% is opaque, 0% is transparant', 'wp-photo-album-plus');
4064	+ $help .= '<br>'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4065	$slug = 'wppa_star_opacity';
4066	$html = wppa_input($slug, '50px', '', __('%', 'wp-photo-album-plus'));
4067	wppa_setting_new($slug, '16', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4069	$name = __('Notify inappropriate', 'wp-photo-album-plus');
4070	$desc = __('Notify admin every x times.', 'wp-photo-album-plus');
4071	$help = __('If this number is positive, there will be a thumb down icon in the rating bar.', 'wp-photo-album-plus');
4072	+ $help .= '<br>'.(__('Clicking the thumbdown icon indicates a user dislikes a photo.', 'wp-photo-album-plus'));
4073	+ $help .= '<br>'.(__('Admin will be notified by email after every x dislikes.', 'wp-photo-album-plus'));
4074	+ $help .= '<br>'.(__('A value of 0 disables this feature.', 'wp-photo-album-plus'));
4075	+ $help .= '<br>'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4076	$slug = 'wppa_dislike_mail_every';
4077	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4078	wppa_setting_new($slug, '17', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4080	$name = __('Dislike value', 'wp-photo-album-plus');
4081	$desc = __('This value counts dislike rating.', 'wp-photo-album-plus');
4082	$help = (__('This value will be used for a dislike rating on calculation of avarage ratings.', 'wp-photo-album-plus'));
4083	+ $help .= '<br>'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus'));
4084	$slug = 'wppa_dislike_value';
4085	$html = wppa_input($slug, '50px', '', __('points', 'wp-photo-album-plus'));
4086	wppa_setting_new($slug, '18', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4088	$name = __('Pending after', 'wp-photo-album-plus');
4089	$desc = __('Set status to pending after xx dislike votes.', 'wp-photo-album-plus');
4090	$help = __('A value of 0 disables this feature.', 'wp-photo-album-plus');
4091	+ $help .= '<br>'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4092	$slug = 'wppa_dislike_set_pending';
4093	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4094	wppa_setting_new($slug, '19', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4096	$name = __('Delete after', 'wp-photo-album-plus');
4097	$desc = __('Delete photo after xx dislike votes.', 'wp-photo-album-plus');
4098	$help = __('A value of 0 disables this feature.', 'wp-photo-album-plus');
4099	+ $help .= '<br>'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4100	$slug = 'wppa_dislike_delete';
4101	$html = wppa_input($slug, '40px', '', __('reports', 'wp-photo-album-plus'));
4102	wppa_setting_new($slug, '20', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4104	$name = __('Show dislike count', 'wp-photo-album-plus');
4105	$desc = __('Show the number of dislikes in the rating bar.', 'wp-photo-album-plus');
4106	$help = __('Displayes the total number of dislike votes for the current photo.', 'wp-photo-album-plus');
4107	+ $help .= '<br>'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus');
4108	$slug = 'wppa_dislike_show_count';
4109	$html = wppa_checkbox($slug);
4110	wppa_setting_new($slug, '21', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4112	$name = __('Show average rating', 'wp-photo-album-plus');
4113	$desc = __('Display the avarage rating and/or vote count on the rating bar', 'wp-photo-album-plus');
4114	$help = __('If checked, the average rating as well as the current users rating is displayed in max 5 or 10 stars.', 'wp-photo-album-plus');
4115	+ $help .= '<br>'.__('If unchecked, only the current users rating is displayed (if any).', 'wp-photo-album-plus');
4116	+ $help .= '<br>'.__('If "One button vote" is selected in item 5, this box checked will display the vote count.', 'wp-photo-album-plus');
4117	$slug = 'wppa_show_avg_rating';
4118	$html = wppa_checkbox($slug);
4119	wppa_setting_new($slug, '22', $name, $desc, $html, $help);

4259	$name = __('Search landing page', 'wp-photo-album-plus');
4260	$desc = __('Display the search results on page.', 'wp-photo-album-plus');
4261	$help = __('Select the page to be used to display search results. The page MUST contain [wppa].', 'wp-photo-album-plus');
4262	+ $help .= '<br>'.__('You may give it the title "Search results" or something alike.', 'wp-photo-album-plus');
4263	+ $help .= '<br>'.__('Or you may use the standard page on which you display the generic album.', 'wp-photo-album-plus');
4264	$slug = 'wppa_search_linkpage';
4265	wppa_verify_page($slug);
4266	$pages = $wpdb->get_results( "SELECT ID, post_title, post_content FROM $wpdb->posts

4302	$name = __('Exclude separate', 'wp-photo-album-plus');
4303	$desc = __('Do not search \'separate\' albums.', 'wp-photo-album-plus');
4304	$help = __('When checked, albums (and photos in them) that have the parent set to --- separate --- will be excluded from being searched.', 'wp-photo-album-plus');
4305	+ $help .= '<br>'.__('Except when you start searching in a \'saparate\' album, with the "search in current section" box ticked.', 'wp-photo-album-plus');
4306	$slug = 'wppa_excl_sep';
4307	$html = wppa_checkbox($slug);
4308	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

4400	$name = __('Search toptext', 'wp-photo-album-plus');
4401	$desc = __('The text at the top of the search box.', 'wp-photo-album-plus');
4402	$help = __('This is the equivalence of the text you can enter in the widget activation screen to show above the input box, but now for the search shortcode display.', 'wp-photo-album-plus');
4403	+ $help .= '<br>'.__('May contain unfiltered HTML.', 'wp-photo-album-plus');
4404	$slug = 'wppa_search_toptext';
4405	$html = wppa_textarea($slug, $name);
4406	wppa_setting_new($slug, '15', $name, $desc, $html, $help);

4582	$name = __('TopTen size', 'wp-photo-album-plus');
4583	$desc = __('Size of thumbnails in TopTen widget.', 'wp-photo-album-plus');
4584	$help = __('Enter the size for the mini photos in the TopTen widget.', 'wp-photo-album-plus');
4585	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4586	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4587	$slug = 'wppa_topten_size';
4588	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4589	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

4598	$name = __('Comment size', 'wp-photo-album-plus');
4599	$desc = __('Size of thumbnails in Comment widget.', 'wp-photo-album-plus');
4600	$help = __('Enter the size for the mini photos in the Comment widget.', 'wp-photo-album-plus');
4601	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4602	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4603	$slug = 'wppa_comten_size';
4604	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4605	wppa_setting_new($slug, '5', $name, $desc, $html, $help);

4614	$name = __('Thumbnail widget size', 'wp-photo-album-plus');
4615	$desc = __('Size of thumbnails in Thumbnail widget.', 'wp-photo-album-plus');
4616	$help = __('Enter the size for the mini photos in the Thumbnail widget.', 'wp-photo-album-plus');
4617	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4618	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4619	$slug = 'wppa_thumbnail_widget_size';
4620	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4621	wppa_setting_new($slug, '7', $name, $desc, $html, $help);

4630	$name = __('LasTen size', 'wp-photo-album-plus');
4631	$desc = __('Size of thumbnails in Last Ten widget.', 'wp-photo-album-plus');
4632	$help = __('Enter the size for the mini photos in the LasTen widget.', 'wp-photo-album-plus');
4633	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4634	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4635	$slug = 'wppa_lasten_size';
4636	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4637	wppa_setting_new($slug, '9', $name, $desc, $html, $help);

4646	$name = __('Album widget size', 'wp-photo-album-plus');
4647	$desc = __('Size of thumbnails in Album widget.', 'wp-photo-album-plus');
4648	$help = __('Enter the size for the mini photos in the Album widget.', 'wp-photo-album-plus');
4649	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4650	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4651	$slug = 'wppa_album_widget_size';
4652	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4653	wppa_setting_new($slug, '11', $name, $desc, $html, $help);

4664	$name = __('FeaTen size', 'wp-photo-album-plus');
4665	$desc = __('Size of thumbnails in Featured Ten widget.', 'wp-photo-album-plus');
4666	$help = __('Enter the size for the mini photos in the FeaTen widget.', 'wp-photo-album-plus');
4667	+ $help .= '<br>'.__('The size applies to the width or height, whatever is the largest.', 'wp-photo-album-plus');
4668	+ $help .= '<br>'.__('Recommended values: 86 for a two column and 56 for a three column display.', 'wp-photo-album-plus');
4669	$slug = 'wppa_featen_size';
4670	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
4671	wppa_setting_new($slug, '13', $name, $desc, $html, $help);

4704	$name = __('Big Browse Buttons in widget', 'wp-photo-album-plus');
4705	$desc = __('Enable invisible browsing buttons in widget slideshows.', 'wp-photo-album-plus');
4706	$help = __('If checked, the fullsize image is covered by two invisible areas that act as browse buttons.', 'wp-photo-album-plus');
4707	+ $help .= '<br>'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
4708	+ $help .= '<br>'.wppa_see_also( 'slide', '1', '2' );
4709	$slug = 'wppa_show_bbb_widget';
4710	$html = wppa_checkbox($slug);
4711	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

4713	$name = __('Ugly Browse Buttons in widget', 'wp-photo-album-plus');
4714	$desc = __('Enable ugly browsing buttons in widget slideshows.', 'wp-photo-album-plus');
4715	$help = __('If checked, the fullsize image is covered by browse buttons.', 'wp-photo-album-plus');
4716	+ $help .= '<br>'.__('Make sure the Maximum height is properly configured to prevent these areas to overlap unwanted space.', 'wp-photo-album-plus');
4717	+ $help .= '<br>'.wppa_see_also( 'slide', '1', '2' );
4718	$slug = 'wppa_show_ubb_widget';
4719	$html = wppa_checkbox($slug);
4720	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

4776	$name = __('Photo names in urls', 'wp-photo-album-plus');
4777	$desc = __('Display photo names in urls.', 'wp-photo-album-plus');
4778	$help = __('Urls to wppa+ displays will contain photonames instead of numbers.', 'wp-photo-album-plus');
4779	+ $help .= '<br>'.__('It is your responsibility to avoid duplicate names of photos in the same album.', 'wp-photo-album-plus');
4780	$slug = 'wppa_use_photo_names_in_urls';
4781	$html = wppa_checkbox($slug);
4782	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

4784	$name = __('Album names in urls', 'wp-photo-album-plus');
4785	$desc = __('Display album names in urls.', 'wp-photo-album-plus');
4786	$help = __('Urls to wppa+ displays will contain albumnames instead of numbers.', 'wp-photo-album-plus');
4787	+ $help .= '<br>'.__('It is your responsibility to avoid duplicate names of albums in the system.', 'wp-photo-album-plus');
4788	$slug = 'wppa_use_album_names_in_urls';
4789	$html = wppa_checkbox($slug);
4790	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

4792	$name = __('Use short query args', 'wp-photo-album-plus');
4793	$desc = __('Use &album=... &photo=...', 'wp-photo-album-plus');
4794	$help = __('Urls to wppa+ displays will contain &album=... &photo=... instead of &wppa-album=... &wppa-photo=...', 'wp-photo-album-plus');
4795	+ $help .= '<br>'.__('Use this setting only when there are no conflicts with other plugins that may interprete arguments like &album= etc.', 'wp-photo-album-plus');
4796	$slug = 'wppa_use_short_qargs';
4797	$html = wppa_checkbox($slug);
4798	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

4800	$name = __('Enable pretty links', 'wp-photo-album-plus');
4801	$desc = __('Enable the generation and understanding of pretty links.', 'wp-photo-album-plus');
4802	$help = __('If checked, links to social media and the qr code will have "/token1/token2/" etc instead of "&arg1=..&arg2=.." etc.', 'wp-photo-album-plus');
4803	+ $help .= '<br>'.__('These types of links will be interpreted and cause a redirection on entering.', 'wp-photo-album-plus');
4804	+ $help .= '<br>'.__('It is recommended to check this box. It shortens links dramatically and simplifies qr codes.', 'wp-photo-album-plus');
4805	+ $help .= '<br>'.__('However, you may encounter conflicts with themes and/or other plugins, so test it throughly!', 'wp-photo-album-plus');
4806	+ $help .= '<br>'.__('Photo names in urls must be UNchecked for this setting to work!', 'wp-photo-album-plus');
4807	+ $help .= '<br>'.wppa_see_also( 'links', '1', '1' );
4808	$slug = 'wppa_use_pretty_links';
4809	$opts = array( __( 'None', 'wp-photo-album-plus' ),
4810	__( 'Classic', 'wp-photo-album-plus' ),

4849	$name = __('Cover Image', 'wp-photo-album-plus');
4850	$desc = __('The link from the cover image of an album.', 'wp-photo-album-plus');
4851	$help = __('Select the type of link the coverphoto points to.', 'wp-photo-album-plus');
4852	+ $help .= '<br>'.__('The link from the album title can be configured on the Edit Album page.', 'wp-photo-album-plus');
4853	+ $help .= '<br>'.__('This link will be used for the photo also if you select: same as title.', 'wp-photo-album-plus');
4854	+ $help .= '<br>'.__('If you specify New Tab on this line, all links from the cover will open a new tab,', 'wp-photo-album-plus');
4855	$slug1 = 'wppa_coverimg_linktype';
4856	$slug2 = 'wppa_coverimg_linkpage';
4857	wppa_verify_page($slug2);

4883	$name = __('Thumbnail', 'wp-photo-album-plus');
4884	$desc = __('Thumbnail link.', 'wp-photo-album-plus');
4885	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4886	+ $help .= '<br>'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4887	+ $help .= '<br>'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4888	$slug1 = 'wppa_thumb_linktype';
4889	$slug2 = 'wppa_thumb_linkpage';
4890	wppa_verify_page($slug2);

4928	$name = __('Sphoto', 'wp-photo-album-plus');
4929	$desc = __('Single photo link.', 'wp-photo-album-plus');
4930	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4931	+ $help .= '<br>'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4932	+ $help .= '<br>'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4933	$slug1 = 'wppa_sphoto_linktype';
4934	$slug2 = 'wppa_sphoto_linkpage';
4935	wppa_verify_page($slug2);

4963	$name = __('Mphoto', 'wp-photo-album-plus');
4964	$desc = __('Media-like (like WP photo with caption) photo link.', 'wp-photo-album-plus');
4965	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
4966	+ $help .= '<br>'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4967	+ $help .= '<br>'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4968	$slug1 = 'wppa_mphoto_linktype';
4969	$slug2 = 'wppa_mphoto_linkpage';
4970	wppa_verify_page($slug2);

4982	$name = __('Xphoto', 'wp-photo-album-plus');
4983	$desc = __('Media-like (like WP photo with - extended - caption) photo link.', 'wp-photo-album-plus');
4984	$help = __('Select the type of link you want, or no link at all, to act on a photo in the style of a wp photo with - an extended - caption.', 'wp-photo-album-plus');
4985	+ $help .= '<br>'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
4986	+ $help .= '<br>'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
4987	$slug1 = 'wppa_xphoto_linktype';
4988	$slug2 = 'wppa_xphoto_linkpage';
4989	wppa_verify_page($slug2);

5062	$name = __('Grid', 'wp-photo-album-plus');
5063	$desc = __('Grid photo link.', 'wp-photo-album-plus');
5064	$help = __('Select the type of link you want, or no link at all.', 'wp-photo-album-plus');
5065	+ $help .= '<br>'.__('If you select the fullsize photo on its own, it will be stretched to fit, regardless of that setting.', 'wp-photo-album-plus');
5066	+ $help .= '<br>'.__('Note that a page must have at least [wppa] in its content to show up the photo(s).', 'wp-photo-album-plus');
5067	$slug1 = 'wppa_grid_linktype';
5068	$slug2 = 'wppa_grid_linkpage';
5069	wppa_verify_page($slug2);

5103	$name = __('PotdWidget', 'wp-photo-album-plus');
5104	$desc = __('Photo Of The Day widget link.', 'wp-photo-album-plus');
5105	$help = __('Select the type of link the photo of the day points to.', 'wp-photo-album-plus');
5106	+ $help .= '<br>'.__('If you select \'defined on widget admin page\' you can manually enter a link and title on the Photo of the day Widget Admin page.', 'wp-photo-album-plus');
5107	$slug1 = 'wppa_potd_linktype';
5108	$slug2 = 'wppa_potd_linkpage';
5109	wppa_verify_page($slug2);

5178	$name = __('Album widget', 'wp-photo-album-plus');
5179	$desc = __('Album widget thumbnail link', 'wp-photo-album-plus');
5180	$help = __('Select the type of link the album widget photos point to.', 'wp-photo-album-plus') .
5181	+ '<br>' .
5182	__('If you tick the ASO box, the album title link settings overrule these settings, but only when the album link page or post is not set to --- the same page or post ---', 'wp-photo-album-plus');
5183	$slug1 = 'wppa_album_widget_linktype';
5184	$slug2 = 'wppa_album_widget_linkpage';

5209	$name = __('Album navigator widget', 'wp-photo-album-plus');
5210	$desc = __('Album navigator widget link', 'wp-photo-album-plus');
5211	$help = __('Select the type of link the album widget photos point to.', 'wp-photo-album-plus') .
5212	+ '<br>' .
5213	__('If you tick the ASO box, the album title link settings overrule these settings, but only when the album link page or post is not set to --- the same page or post ---', 'wp-photo-album-plus');
5214	$slug1 = 'wppa_album_navigator_widget_linktype';
5215	$slug2 = 'wppa_album_navigator_widget_linkpage';

5390	$name = __('Tagcloud Link', 'wp-photo-album-plus');
5391	$desc = __('Configure the link from the tags in the tag cloud.', 'wp-photo-album-plus');
5392	$help = __('Link the tag words to either the thumbnails or the slideshow.', 'wp-photo-album-plus');
5393	+ $help .= '<br>'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5394	$slug1 = 'wppa_tagcloud_linktype';
5395	$slug2 = 'wppa_tagcloud_linkpage';
5396	wppa_verify_page($slug2);

5421	$name = __('Multitag Link', 'wp-photo-album-plus');
5422	$desc = __('Configure the link from the multitag selection.', 'wp-photo-album-plus');
5423	$help = __('Link to either the thumbnails or the slideshow.', 'wp-photo-album-plus');
5424	+ $help .= '<br>'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5425	$slug1 = 'wppa_multitag_linktype';
5426	$slug2 = 'wppa_multitag_linkpage';
5427	wppa_verify_page($slug2);

5468	$name = __('SM widget return', 'wp-photo-album-plus');
5469	$desc = __('Select the return link for social media from widgets', 'wp-photo-album-plus');
5470	$help = __('If you select Landing page, and it wont work, it may be required to set the Occur to the sequence number of the landing shortcode on the page.', 'wp-photo-album-plus');
5471	+ $help .= '<br>'.__('Normally it is 1, but you can try 2 etc. Always create a new shared link to test a setting.', 'wp-photo-album-plus');
5472	+ $help .= '<br>'.__('The Occur(rance) indicates the sequence number of the [wppa] shortcode on the landing page to be used.', 'wp-photo-album-plus');
5473	$slug1 = 'wppa_widget_sm_linktype';
5474	$slug2 = 'wppa_widget_sm_linkpage';
5475	wppa_verify_page($slug2);

5796	$name = __('User name', 'wp-photo-album-plus');
5797	$desc = __('Uploading users may overrule the default name.', 'wp-photo-album-plus');
5798	$help = __('If checked, the default photo name may be overruled by the user.', 'wp-photo-album-plus');
5799	+ $help .= '<br>'.wppa_see_also( 'new', '1', '29' );
5800	$slug1 = 'wppa_name_user';
5801	$slug2 = 'wppa_name_user_mandatory';
5802	$html = wppa_checkbox( $slug1 ) . '<span style="float:left;" >' . __( 'Mandatory', 'wp-photo-album-plus' ) . ':</span>' . wppa_checkbox( $slug2 );

5805	$name = __('Apply Newphoto desc user', 'wp-photo-album-plus');
5806	$desc = __('Give each new frontend uploaded photo a standard description.', 'wp-photo-album-plus');
5807	$help = __('If checked, each new photo will get the default New photo description.', 'wp-photo-album-plus');
5808	+ $help .= '<br>'.__('Note: If the next item is checked, the user can overwrite this', 'wp-photo-album-plus');
5809	+ $help .= '<br>'.wppa_see_also( 'new', '1', '13' );
5810	$slug = 'wppa_apply_newphoto_desc_user';
5811	$html = wppa_checkbox($slug);
5812	wppa_setting_new($slug, '10', $name, $desc, $html, $help);

6017	$name = __('Mail on comment', 'wp-photo-album-plus');
6018	$desc = __('Enable mailing users when a new comment has been added', 'wp-photo-album-plus');
6019	$help = __('When moderation is required, the mails will be sent after approval', 'wp-photo-album-plus');
6020	+ $help .= '<br>' . __('All subscribers will get the email, unless you tick the \'to owner and admin only\' box', 'wp-photo-album-plus');
6021	$slug1 = 'wppa_commentnotify';
6022	$slug2 = 'wppa_commentnotify_limit';
6023	$subs = count( wppa_index_string_to_array( wppa_get_option( 'wppa_mailinglist_commentnotify', '' ) ) );

6074
6075	$name = __('From email', 'wp-photo-album-plus');
6076	$desc = __('Enter the from email address you want to be used', 'wp-photo-album-plus');
6077	+ $help = __('Be aware of the fact that an email plugin may overrule this setting.', 'wp-photo-album-plus') . '<br>' .
6078	__('Make sure this email address exists.', 'wp-photo-album-plus');
6079	$slug = 'wppa_email_from_email';
6080	$html = wppa_input($slug,'90%');

6337	$name = __('Meta all', 'wp-photo-album-plus');
6338	$desc = __('Meta tags for all featured photos.', 'wp-photo-album-plus');
6339	$help = __('If checked, the header of the page will contain metatags that refer to all featured photo files.', 'wp-photo-album-plus');
6340	+ $help .= '<br>'.__('If you have many featured photos, you might wish to uncheck this item to reduce the size of the page header.', 'wp-photo-album-plus');
6341	$slug = 'wppa_meta_all';
6342	$html = wppa_checkbox($slug);
6343	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

6394	$name = __('Update addressline', 'wp-photo-album-plus');
6395	$desc = __('Update the addressline after an ajax action or next slide.', 'wp-photo-album-plus');
6396	$help = __('If checked, refreshing the page will show the current content and the browsers back and forth arrows will browse the history on the page.', 'wp-photo-album-plus');
6397	+ $help .= '<br>'.__('If unchecked, refreshing the page will re-display the content of the original page.', 'wp-photo-album-plus');
6398	+ $help .= '<br>'.__('This will only work on browsers that support history.pushState() and therefor NOT in IE', 'wp-photo-album-plus');
6399	$slug = 'wppa_update_addressline';
6400	$html = wppa_checkbox($slug);
6401	wppa_setting_new($slug, '4', $name, $desc, $html, $help);

6648	$name = __('Nice scroller options', 'wp-photo-album-plus');
6649	$desc = __('The nice scroller configuration options', 'wp-photo-album-plus');
6650	$help = __('Enter options, one per line, seperated by commas(,).', 'wp-photo-album-plus');
6651	+ $help .= '<br>' .
6652	sprintf( __('Click %s here %s for documentation and a full list of available options', 'wp-photo-album-plus'),
6653	'<a href="' . WPPA_URL . '/vendor/nicescroll/README.txt" target="_blank" >',
6654	'</a>'
6655	) .
6656	+ '<br>';
6657	$slug = 'wppa_nicescroll_opts';
6658	$html = wppa_textarea( $slug );
6659	wppa_setting_new($slug, '35', $name, $desc, $html, $help);

6749	$name = __('Keep source files', 'wp-photo-album-plus');
6750	$desc = __('Keep the original uploaded and imported photo files.', 'wp-photo-album-plus');
6751	$help = __('The files will be kept in a separate directory with subdirectories for each album', 'wp-photo-album-plus');
6752	+ $help .= '<br>'.__('These files can be used to update the photos used in displaying in wppa+ and optionally for downloading original, un-downsized images.', 'wp-photo-album-plus');
6753	$slug = 'wppa_keep_source';
6754	$html = wppa_checkbox($slug);
6755	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

6757	$name = __('Source directory', 'wp-photo-album-plus');
6758	$desc = __('The path to the directory where the original photofiles will be saved.', 'wp-photo-album-plus');
6759	$help = __('You may change the directory path, but it can not be an url.', 'wp-photo-album-plus');
6760	+ $help .= '<br>'.__('The parent of the directory that you enter here must exist and be writable.', 'wp-photo-album-plus');
6761	+ $help .= '<br>'.__('The directory itsself will be created if it does not exist yet.', 'wp-photo-album-plus');
6762	$slug = 'wppa_source_dir';
6763	$html = wppa_input($slug, '90%');
6764	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

6766	$name = __('Keep sync', 'wp-photo-album-plus');
6767	$desc = __('Keep source synchronously with wppa system.', 'wp-photo-album-plus');
6768	$help = __('If checked, photos that are deleted from wppa, will also be removed from the source files.', 'wp-photo-album-plus');
6769	+ $help .= '<br>'.__('Also, copying or moving photos to different albums, will also copy/move the source files.', 'wp-photo-album-plus');
6770	$slug = 'wppa_keep_sync';
6771	$html = wppa_checkbox($slug);
6772	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

6931	$name = __('New photo desc', 'wp-photo-album-plus');
6932	$desc = __('The description (template) to add to a new photo.', 'wp-photo-album-plus');
6933	$help = __('Enter the default description.', 'wp-photo-album-plus');
6934	+ $help .= '<br>'.__('If you use html, please check item B-1 of this table.', 'wp-photo-album-plus');
6935	+ $help .= '<br>'.__('If you tick the checkbox, linebreaks and redundand spaces will be removed.', 'wp-photo-album-plus');
6936	$slug = 'wppa_newphoto_description';
6937	$slug2 = 'wppa_compress_newdesc';
6938	$html = wppa_textarea($slug, $name) .
6939	+ '<br>' .
6940	__('Compress', 'wp-photo-album-plus') .
6941	wppa_checkbox($slug2);
6942	wppa_setting_new($slug, '13', $name, $desc, $html, $help);

6951	$name = __('Upload limit', 'wp-photo-album-plus');
6952	$desc = __('New albums are created with this upload limit.', 'wp-photo-album-plus');
6953	$help = __('Administrators can change the limit settings in the "Edit Album Information" admin page.', 'wp-photo-album-plus');
6954	+ $help .= '<br>'.(__('A value of 0 means: no limit.', 'wp-photo-album-plus'));
6955	$slug = 'wppa_upload_limit_count';
6956	$html = wppa_input($slug, '50px', '', __('photos', 'wp-photo-album-plus'));
6957	$slug = 'wppa_upload_limit_time';

7317	$name = __('Max user albums', 'wp-photo-album-plus');
7318	$desc = __('The max number of albums a user can create.', 'wp-photo-album-plus');
7319	$help = __('The maximum number of albums a user can create when he is not admin', 'wp-photo-album-plus');
7320	+ $help .= '<br>'.__('A number of 0 means No limit', 'wp-photo-album-plus');
7321	$slug = 'wppa_max_albums';
7322	$html1 = wppa_input($slug, '50px', '', 'albums');
7323	$html2 = '';

7365	$name = __('Fe limts per album', 'wp-photo-album-plus');
7366	$desc = __('The following limits apply to individual albums', 'wp-photo-album-plus');
7367	$help = __('If this box is ticked, users can upload the limit on every album they have fe upload rights to', 'wp-photo-album-plus');
7368	+ $help .= '<br>'.__('If this box is unticked, the limits apply to all the users uploads in the system regardless of the album(s)', 'wp-photo-album-plus');
7369	$slug = 'wppa_role_limit_per_album';
7370	$html1 = wppa_checkbox($slug);
7371	$html2 = '';

7390	$name = sprintf(__('Upload limit %s', 'wp-photo-album-plus'), $t_role);
7391	$desc = sprintf(__('Limit upload capacity for the user role %s.', 'wp-photo-album-plus'), $t_role);
7392	$help = __('This limitation only applies to frontend uploads when the same userrole does not have the Upload checkbox checked.', 'wp-photo-album-plus');
7393	+ $help .= '<br>'.__('A value of 0 means: no limit.', 'wp-photo-album-plus') . wppa_see_also( 'admin', '1' );
7394	$slug1 = 'wppa_'.$role.'_upload_limit_count';
7395	$html1 = wppa_input($slug1, '50px', '', __('photos', 'wp-photo-album-plus'));
7396	$slug2 = 'wppa_'.$role.'_upload_limit_time';

7405	$name = sprintf(__('Album limit %s', 'wp-photo-album-plus'), $t_role);
7406	$desc = sprintf(__('Limit number of albums for the user role %s.', 'wp-photo-album-plus'), $t_role);
7407	$help = __('This limitation only applies to frontend create albums when the same userrole does not have the Album admin checkbox checked.', 'wp-photo-album-plus');
7408	+ $help .= '<br>'.__('A value of 0 means: no limit.', 'wp-photo-album-plus') . wppa_see_also( 'admin', '1' );
7409	$slug1 = 'wppa_'.$role.'_album_limit_count';
7410	$html1 = wppa_input($slug1, '50px', '', __('albums', 'wp-photo-album-plus'));
7411	$slug2 = '';

7426	$name = __('Upload moderation', 'wp-photo-album-plus');
7427	$desc = __('Uploaded photos need moderation.', 'wp-photo-album-plus');
7428	$help = __('If checked, photos uploaded by users who do not have photo album admin access rights need moderation.', 'wp-photo-album-plus');
7429	+ $help .= '<br>'.__('Users who have photo album admin access rights can change the photo status to publish or featured.', 'wp-photo-album-plus');
7430	+ $help .= '<br>'.wppa_see_also( 'admin', '1' );
7431	$slug = 'wppa_upload_moderate';
7432	$html1 = wppa_checkbox($slug);
7433	$html2 = '';

7539	$name = __('Permalink root', 'wp-photo-album-plus');
7540	$desc = __('The name of the root for the photofile permalink structure.', 'wp-photo-album-plus');
7541	$help = __('Choose a convenient name like "albums" or so; this will be the name of a folder inside .../wp-content/. Make sure you choose a unique name', 'wp-photo-album-plus');
7542	+ $help .= '<br>'.__('If you make this field empty, the feature is disabled.', 'wp-photo-album-plus');
7543	$slug = 'wppa_pl_dirname';
7544	$html = wppa_input($slug, '150px');
7545	wppa_setting_new($slug, '5', $name, $desc, $html, $help);

7685	$name = __('Frontend Edit', 'wp-photo-album-plus');
7686	$desc = __('Allow the uploader to edit the photo info', 'wp-photo-album-plus');
7687	$help = __('If selected, any logged in user who meets the criteria has the capability to edit the photo information.', 'wp-photo-album-plus');
7688	+ $help .= '<br>'.__('Note: This may be AFTER moderation!!', 'wp-photo-album-plus');
7689	$slug = 'wppa_upload_edit';
7690	$opts = array( __('--- none ---', 'wp-photo-album-plus'), __('New style', 'wp-photo-album-plus') );
7691	$vals = array( '-none-', 'new' );

7891	$name = __('Super user', 'wp-photo-album-plus');
7892	$desc = __('Give these users all rights in wppa.', 'wp-photo-album-plus');
7893	$help = __('This gives the user all the administrator privileges within wppa.', 'wp-photo-album-plus');
7894	+ $help .= '<br>'.__('Make sure the user also has a role that has all the capability boxes ticked', 'wp-photo-album-plus');
7895	+ $help .= '<br>'.wppa_see_also( 'admin', '1' );
7896	$slug = 'wppa_superuser_user';
7897	$superlist = wppa_get_option( 'wppa_super_users', array() );
7898

8126	$name = __('Setup', 'wp-photo-album-plus');
8127	$desc = __('Re-initialize plugin.', 'wp-photo-album-plus');
8128	$help = __('Re-initilizes the plugin, (re)creates database tables and sets up default settings and directories if required.', 'wp-photo-album-plus');
8129	+ $help .= '<br>'.__('This action may be required to setup blogs in a multiblog (network) site as well as in rare cases to correct initilization errors.', 'wp-photo-album-plus');
8130	$slug = 'wppa_setup';
8131	$html1 = '';
8132	$html2 = wppa_doit_button_new($slug);

8475	$name = __('Apply Default Photoname', 'wp-photo-album-plus');
8476	$desc = __('Apply Default photo name on all photos in the system.', 'wp-photo-album-plus');
8477	$help = __('Puts the content of Default photo name in all photo name.', 'wp-photo-album-plus');
8478	+ $help .= '<br>'.wppa_see_also( 'new', '1', '29' );
8479	$slug2 = 'wppa_apply_default_photoname_all';
8480	$html1 = '';
8481	$html2 = wppa_maintenance_button( $slug2 );

8487	$name = __('Apply New Photodesc', 'wp-photo-album-plus');
8488	$desc = __('Apply New photo description on all photos in the system.', 'wp-photo-album-plus');
8489	$help = __('Puts the content of New photo desc in all photo descriptions.', 'wp-photo-album-plus');
8490	+ $help .= '<br>'.wppa_see_also( 'new', '1', '13' );
8491	$slug2 = 'wppa_apply_new_photodesc_all';
8492	$html1 = '';
8493	$html2 = wppa_maintenance_button( $slug2 );

8499	$name = __('Append to photodesc', 'wp-photo-album-plus');
8500	$desc = __('Append this text to all photo descriptions.', 'wp-photo-album-plus');
8501	$help = __('Appends a space character and the given text to the description of all photos.', 'wp-photo-album-plus');
8502	+ $help .= '<br>'.__('First edit the text to append, click outside the edit window and wait for the green checkmark to appear. Then click the Start! button.', 'wp-photo-album-plus');
8503	$slug1 = 'wppa_append_text';
8504	$slug2 = 'wppa_append_to_photodesc';
8505	$html1 = wppa_input( $slug1, '200px' );

8512	$name = __('Remove from photodesc', 'wp-photo-album-plus');
8513	$desc = __('Remove this text from all photo descriptions.', 'wp-photo-album-plus');
8514	$help = __('Removes all occurrencies of the given text from the description of all photos.', 'wp-photo-album-plus');
8515	+ $help .= '<br>'.__('First edit the text to remove, click outside the edit window and wait for the green checkmark to appear. Then click the Start! button.', 'wp-photo-album-plus');
8516	$slug1 = 'wppa_remove_text';
8517	$slug2 = 'wppa_remove_from_photodesc';
8518	$html1 = wppa_input( $slug1, '200px' );

8568
8569	$name = __('Create all autopages', 'wp-photo-album-plus');
8570	$desc = __('Create all the pages to display slides individually.', 'wp-photo-album-plus');
8571	+ $help = '<br>'.__('Make sure you have a custom menu and the "Automatically add new top-level pages to this menu" box UNticked!!', 'wp-photo-album-plus');
8572	$help .= wppa_see_also( 'system', '1', '8' );
8573	$slug2 = 'wppa_create_all_autopages';
8574	$html1 = '';

8654	$html3 = wppa_maintenance_button( $slug3 );
8655	$html4 = wppa_status_field( $slug3 );
8656	$html5 = wppa_togo_field( $slug3 );
8657	+ $html = array( $html1 . '<br>' . $html2, $html3, $html4, $html5 );
8658	wppa_setting_new( false, '20', $name, $desc, $html, $help);
8659
8660	$name = __('Synchronize Cloudinary', 'wp-photo-album-plus');
8661	$desc = __('Removes/adds images in the cloud.', 'wp-photo-album-plus');
8662	$help = __('Removes old images and verifies/adds new images to Cloudinary.', 'wp-photo-album-plus');
8663	+ $help .= '<br>'.wppa_see_also( 'miscadv', '4', '7' );
8664	$slug2 = 'wppa_sync_cloud';
8665	$html1 = '';
8666	$html2 = wppa_maintenance_button( $slug2 );

8823	$desc = __('The php code to execute on all albums', 'wp-photo-album-plus');
8824	$help = __('Only run this if you know what you are doing!', 'wp-photo-album-plus');
8825	$slug2 = 'wppa_custom_album_proc';
8826	+ $html1 = wppa_textarea( $slug2, '', true );
8827	$html2 = wppa_maintenance_button( $slug2 );
8828	$html3 = wppa_status_field( $slug2 );
8829	$html4 = wppa_togo_field( $slug2 );

8834	$desc = __('The php code to execute on all photos', 'wp-photo-album-plus');
8835	$help = __('Only run this if you know what you are doing!', 'wp-photo-album-plus');
8836	$slug2 = 'wppa_custom_photo_proc';
8837	+ $html1 = wppa_textarea( $slug2, '', true );
8838	$html2 = wppa_maintenance_button( $slug2 );
8839	$html3 = wppa_status_field( $slug2 );
8840	$html4 = wppa_togo_field( $slug2 );

8909	$name = __('All to lower', 'wp-photo-album-plus');
8910	$desc = __('Convert all file-extensions to lowercase.', 'wp-photo-album-plus');
8911	$help = __('Affects display files, thumbnail files, and saved extensions in database table. Leaves sourcefiles untouched', 'wp-photo-album-plus');
8912	+ $help .= '<br>'.__('If both upper and lowercase files exist, the file with the uppercase extension will be removed.', 'wp-photo-album-plus');
8913	$slug2 = 'wppa_all_ext_to_lower';
8914	$html1 = wppa_cronjob_button( $slug2 );
8915	$html2 = wppa_maintenance_button( $slug2 );

8951	foreach ( $wppa_supported_camara_brands as $brand ) {
8952	$lbl = wppa_exif_tagname( $label['tag'], $brand, 'brandonly' );
8953	if ( $lbl ) {
8954	+ $desc .= '<br>' . $brand;
8955	}
8956	}
8957

8963	foreach ( $wppa_supported_camara_brands as $brand ) {
8964	$lbl = wppa_exif_tagname( $label['tag'], $brand, 'brandonly' );
8965	if ( $lbl ) {
8966	+ $html1 .= '<br><span style="clear:left;float:left;" >' . $lbl . ':</span>';
8967	}
8968	}
8969

9055	$name = __('GPX Shortcode', 'wp-photo-album-plus');
9056	$desc = __('The shortcode to be used for the gpx feature.', 'wp-photo-album-plus');
9057	$help = __('Enter / modify the shortcode to be generated for the gpx plugin. It must contain w#lat and w#lon as placeholders for the latitude and longitude.', 'wp-photo-album-plus');
9058	+ $help .= '<br>' . __('This item is required for using an external Google maps viewer plugin only', 'wp-photo-album-plus');
9059	$slug = 'wppa_gpx_shortcode';
9060	$html = wppa_input($slug, '500px');
9061	wppa_setting_new($slug, '4', $name, $desc, $html, $help, wppa_opt( 'gpx_implementation' ) == 'external-plugin' );

9096	$name = sprintf(__('Name, vis, edit %s', 'wp-photo-album-plus'), $i);
9097	$desc = sprintf(__('The caption for field %s, visibility and editability at frontend.', 'wp-photo-album-plus'), $i);
9098	$help = sprintf(__('If you check the first box, the value of this field is displayable in photo descriptions at the frontend with keyword w#c%s', 'wp-photo-album-plus'), $i);
9099	+ $help .= '<br>'.__('If you check the second box, the value of this field is editable at the frontend new style dialog.', 'wp-photo-album-plus');
9100	$slug1 = 'wppa_album_custom_caption_'.$i;
9101	$html1 = wppa_input($slug1, '300px');
9102	$slug2 = 'wppa_album_custom_visible_'.$i;

9196	$name = sprintf(__('Name, vis, edit %s dflt', 'wp-photo-album-plus'), $i);
9197	$desc = sprintf(__('The caption for field %s, visibility and editability at frontend.', 'wp-photo-album-plus'), $i);
9198	$help = sprintf(__('If you check the first box, the value of this field is displayable in photo descriptions at the frontend with keyword w#c%s', 'wp-photo-album-plus'), $i);
9199	+ $help .= '<br>'.__('If you check the second box, the value of this field is editable at the frontend new style dialog.', 'wp-photo-album-plus');
9200	$slug1 = 'wppa_custom_caption_'.$i;
9201	$html1 = wppa_input($slug1, '300px');
9202	$slug2 = 'wppa_custom_visible_'.$i;

9225	$name = __('Watermark file', 'wp-photo-album-plus');
9226	$desc = __('The default watermarkfile to be used.', 'wp-photo-album-plus');
9227	$help = __('Watermark files are of type png and reside in', 'wp-photo-album-plus') . ' ' . WPPA_UPLOAD_URL . '/watermarks/';
9228	+ $help .= '<br>'.__('A suitable watermarkfile typically consists of a transparent background and a black text or drawing.', 'wp-photo-album-plus');
9229	+ $help .= '<br>'.sprintf(__('The watermark image will be overlaying the photo with %s%% transparency.', 'wp-photo-album-plus'), (100-wppa_opt( 'watermark_opacity' )));
9230	+ $help .= '<br>'.__('You may also select one of the textual watermark types at the bottom of the selection list.', 'wp-photo-album-plus');
9231	$slug = 'wppa_watermark_file';
9232	$html = '<select style="float:left; font-size:11px; height:20px; margin:0 4px 0 0; padding:0; " id="wppa_watermark_file" onchange="wppaAjaxUpdateOptionValue(\'watermark_file\', this)" >' . wppa_watermark_file_select( 'system' ) . '</select>';
9233	$html .= '<img id="img_watermark_file" src="'.wppa_get_imgdir().'star.ico" title="'.__('Setting unmodified', 'wp-photo-album-plus').'" style="padding-left:4px; float:left; height:16px; width:16px;" />';

9265	$name = __('Predefined watermark text', 'wp-photo-album-plus');
9266	$desc = __('The text to use when --- pre-defined --- is selected.', 'wp-photo-album-plus');
9267	$help = __('You may use the following keywords:', 'wp-photo-album-plus');
9268	+ $help .= '<br>'.__('w#site, w#displayname, all standard photo keywords, iptc and exif keywords', 'wp-photo-album-plus');
9269	$slug = 'wppa_textual_watermark_text';
9270	$html = wppa_textarea($slug, $name);
9271	wppa_setting_new($slug, '5', $name, $desc, $html, $help);

9303	$name = __('Textual watermark font size', 'wp-photo-album-plus');
9304	$desc = __('You can set the size of the truetype fonts only.', 'wp-photo-album-plus');
9305	$help = __('System font can have size 1,2,3,4 or 5, in some stoneage fontsize units. Any value > 5 will be treated as 5.', 'wp-photo-album-plus');
9306	+ $help .= '<br>'.__('Truetype fonts can have any positive integer size, if your PHPs GD version is 1, in pixels, in GD2 in points.', 'wp-photo-album-plus');
9307	+ $help .= '<br>'.__('It is unclear how many pixels a point is...', 'wp-photo-album-plus');
9308	$slug = 'wppa_textual_watermark_size';
9309	$html = wppa_input($slug, '50px', '', 'points');
9310	wppa_setting_new($slug, '7', $name, $desc, $html, $help);

9700	$name = __('Default coverphoto selection', 'wp-photo-album-plus');
9701	$desc = __('Default select cover photo method.', 'wp-photo-album-plus');
9702	$help = __('The coverphoto slection method can be overruled on the edit album page.', 'wp-photo-album-plus');
9703	+ $help .= '<br>' . __('Alternatively an individual photo can be selected on the edit album page.', 'wp-photo-album-plus');
9704	$opts = array( __('--- random ---', 'wp-photo-album-plus'),
9705	__('--- random featured ---', 'wp-photo-album-plus'),
9706	__('--- most recent added ---', 'wp-photo-album-plus'),

9716	$name = __('Default coverphoto selection', 'wp-photo-album-plus');
9717	$desc = __('Default select cover photo method.', 'wp-photo-album-plus');
9718	$help = __('The coverphoto slection method can be overruled on the edit album page.', 'wp-photo-album-plus');
9719	+ $help .= '<br>' . __('Alternatively an individual photo can be selected on the edit album page.', 'wp-photo-album-plus');
9720	$opts = array( __('--- random ---', 'wp-photo-album-plus'),
9721	__('--- random featured ---', 'wp-photo-album-plus'),
9722	__('--- most recent added ---', 'wp-photo-album-plus'),

9890	$name = __('JPG image quality', 'wp-photo-album-plus');
9891	$desc = __('The jpg quality when photos are downsized', 'wp-photo-album-plus');
9892	$help = __('The higher the number the better the quality but the larger the file', 'wp-photo-album-plus');
9893	+ $help .= '<br>'.__('Possible values 20..100', 'wp-photo-album-plus');
9894	$slug = 'wppa_jpeg_quality';
9895	$html = wppa_input($slug, '50px');
9896	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

9905	$name = __('Enable <b>in-line</b> settings', 'wp-photo-album-plus');
9906	$desc = __('Activates shortcode [wppa_set].', 'wp-photo-album-plus');
9907	$help = __('Syntax: [wppa_set name="any wppa setting" value="new value"]', 'wp-photo-album-plus');
9908	+ $help .= '<br>'.__('Example: [wppa_set name="wppa_thumbtype" value="masonry-v"] sets the thumbnail type to vertical masonry style', 'wp-photo-album-plus');
9909	+ $help .= '<br>'.__('Do not forget to reset with [wppa_set]', 'wp-photo-album-plus');
9910	+ $help .= '<br>'.__('Use with great care! There is no check on validity of values!', 'wp-photo-album-plus');
9911	$slug = 'wppa_enable_shortcode_wppa_set';
9912	$html = wppa_checkbox($slug);
9913	wppa_setting_new($slug, '3', $name, $desc, $html, $help);

9915	$name = __('Minimum tags', 'wp-photo-album-plus');
9916	$desc = __('These tags exist even when they do not occur in any photo.', 'wp-photo-album-plus');
9917	$help = __('Enter tags, separated by comma\'s (,)', 'wp-photo-album-plus');
9918	+ $help .= '<br>'.__('Tags exist when they appear on any photo, and vanish when they do no longer appear. Except the tags you list here; they exist always.', 'wp-photo-album-plus');
9919	$slug = 'wppa_minimum_tags';
9920	$html = wppa_input($slug, '300px');
9921	wppa_setting_new($slug, '4', $name, $desc, $html, $help);

9945	$name = __('Direct comment', 'wp-photo-album-plus');
9946	$desc = __('Enable direct commenting and rating from remote source', 'wp-photo-album-plus');
9947	$help = __('This setting has only effect when Encrypted links is mandatory', 'wp-photo-album-plus');
9948	+ $help .= '<br>' . __('Use with care, and only in special situations!', 'wp-photo-album-plus');
9949	$slug = 'wppa_direct_comment';
9950	$html = wppa_checkbox($slug) . wppa_see_also( 'links', '1', '5.6' );
9951	wppa_setting_new($slug, '8', $name, $desc, $html, $help);

10216	$name = __('Fotomoto', 'wp-photo-album-plus');
10217	$desc = __('Yes, we use Fotomoto on this site. Read the help text!', 'wp-photo-album-plus');
10218	$help = __('In order to function properly:', 'wp-photo-album-plus');
10219	+ $help .= '<br>'.__('1. Get yourself a Fotomoto account.', 'wp-photo-album-plus');
10220	+ $help .= '<br>'.__('2. Install the Fotomoto plugin, enter the "Fotomoto Site Key:" and check the "Use API Mode:" checkbox.', 'wp-photo-album-plus');
10221	+ $help .= '<br>'.__('Note: Do NOT Disable the Custom box in the Slideshow component specification.', 'wp-photo-album-plus');
10222	+ $help .= '<br>'.__('Do NOT remove the text w#fotomoto from the Custombox content.', 'wp-photo-album-plus');
10223	$slug = 'wppa_fotomoto_on';
10224	$html = wppa_checkbox($slug, 'wppaRefreshAfter();') . wppa_see_also( 'slide', '1', '25.26' );
10225	wppa_setting_new($slug, '9', $name, $desc, $html, $help);

10296	$name = __('Foreign shortcodes fullsize', 'wp-photo-album-plus');
10297	$desc = __('Enable the use of non-wppa+ shortcodes in fullsize photo descriptions.', 'wp-photo-album-plus');
10298	$help = __('When checked, you can use shortcodes from other plugins in the description of photos.', 'wp-photo-album-plus');
10299	+ $help .= '<br>'.__('The shortcodes will be expanded in the descriptions of fullsize images.', 'wp-photo-album-plus');
10300	$slug = 'wppa_allow_foreign_shortcodes';
10301	$html = wppa_checkbox($slug);
10302	wppa_setting_new($slug, '1', $name, $desc, $html, $help);

10304	$name = __('Foreign shortcodes thumbnails', 'wp-photo-album-plus');
10305	$desc = __('Enable the use of non-wppa+ shortcodes in thumbnail photo descriptions.', 'wp-photo-album-plus');
10306	$help = __('When checked, you can use shortcodes from other plugins in the description of photos.', 'wp-photo-album-plus');
10307	+ $help .= '<br>'.__('The shortcodes will be expanded in the descriptions of thumbnail images.', 'wp-photo-album-plus');
10308	$slug = 'wppa_allow_foreign_shortcodes_thumbs';
10309	$html = wppa_checkbox($slug);
10310	wppa_setting_new($slug, '2', $name, $desc, $html, $help);

10340	$name = __('Use SCABN', 'wp-photo-album-plus');
10341	$desc = __('Use the wppa interface to Simple Cart & Buy Now plugin.', 'wp-photo-album-plus');
10342	$help = __('If checked, the shortcode to use for the "add to cart" button in photo descriptions is [cart ...]', 'wp-photo-album-plus');
10343	+ $help .= '<br>'.__('as opposed to [scabn ...] for the original scabn "add to cart" button.', 'wp-photo-album-plus');
10344	+ $help .= '<br>'.__('The shortcode for the check-out page is still [scabn]', 'wp-photo-album-plus');
10345	+ $help .= '<br>'.__('The arguments are the same, the defaults are: name = photoname, price = 0.01.', 'wp-photo-album-plus');
10346	+ $help .= '<br>'.__('Supplying the price should be sufficient; supply a name only when it differs from the photo name.', 'wp-photo-album-plus');
10347	+ $help .= '<br>'.__('This shortcode handler will also work with Ajax enabled.', 'wp-photo-album-plus');
10348	+ $help .= '<br>'.__('Using this interface makes sure that the item urls and callback action urls are correct.', 'wp-photo-album-plus');
10349	$slug = 'wppa_use_scabn';
10350	$html = wppa_checkbox($slug);
10351	wppa_setting_new($slug, '7', $name, $desc, $html, $help);

10405	// Report resource used
10406	echo '
10407	<div style="clear:both;" >' .
10408	+ sprintf(__('<br>Memory used on this page: %6.2f Mb.', 'wp-photo-album-plus'), memory_get_peak_usage(true)/(1024*1024)) .
10409	+ sprintf(__('<br>There are %d settings and %d runtime parameters.', 'wp-photo-album-plus'), count($wppa_opt), count($wppa)) . '
10410	</div>';
10411
10412	wppa_initialize_runtime( true );

wppa-slideshow.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Contains all the slideshow high level functions
6	*
7	- * Version 8.1.00.~~008~~
8	*
9	*/
10
	@@ -1055,7 +1055,7 @@ global $wpdb;
1055
1056	// Rating on 2 lines?
1057	if ( wppa_switch( 'show_avg_mine_2' ) && wppa_switch( 'show_avg_rating' ) ) {
1058	- $result .= '<br />';
1059	}
1060
1061	// Text left if no avg rating OR on 2 lines


4	*
5	* Contains all the slideshow high level functions
6	*
7	+ * Version 8.1.05.001
8	*
9	*/
10

1055
1056	// Rating on 2 lines?
1057	if ( wppa_switch( 'show_avg_mine_2' ) && wppa_switch( 'show_avg_rating' ) ) {
1058	+ $result .= '<br>';
1059	}
1060
1061	// Text left if no avg rating OR on 2 lines

wppa-stats-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the stats widget
6	- * Version 8.0.08.~~006~~
7	*
8	*/
9	class WppaStatsWidget extends WP_Widget {
	@@ -35,46 +35,46 @@ class WppaStatsWidget extends WP_Widget {
35
36	// Make the widget content
37	if ( wppa_checked( $instance['ip'] ) ) {
38	- $widget_content .= __('Your ip is', 'wp-photo-album-plus') . ': <b>'.$_SERVER['REMOTE_ADDR'].'</b><br />';
39	}
40	if ( wppa_checked( $instance['browser'] ) ) {
41	$browser = isset( $_SERVER["HTTP_USER_AGENT"] ) ? $_SERVER["HTTP_USER_AGENT"] : 'unknown';
42	- $widget_content .= __('Your browser is', 'wp-photo-album-plus') . ': <b>' . $browser .'</b><br />';
43	}
44	if ( wppa_checked( $instance['dayno'] ) ) {
45	- $widget_content .= __('Today is day no', 'wp-photo-album-plus') . ': <b>' . ( date_i18n( 'z', time() ) + 1 ) . '</b><br />';
46	}
47	if ( wppa_checked( $instance['sessions-active'] ) ) {
48	$sescount = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . ( time() - 3600 ) . "'" );
49	- $widget_content .= __('Number of active sessions', 'wp-photo-album-plus') . ': <b>' . $sescount . '</b><br />';
50	}
51	if ( wppa_checked( $instance['sessions-day'] ) ) {
52	$t = time() - 3600*24;
53	$daysescount = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . $t . "'" );
54	$robots = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . $t . "' AND data LIKE '%\"isrobot\";b:1;%'" );
55	- $widget_content .= __('Number of sessions last 24 hours', 'wp-photo-album-plus') . ': <b>' . $daysescount . '</b><br />' .
56	- __('Of which robots', 'wp-photo-album-plus') . ': <b>' . $robots . '</b><br />';
57	}
58	if ( wppa_checked( $instance['reg-users'] ) ) {
59	$users = $wpdb->get_var( "SELECT COUNT(*) FROM " . $wpdb->prefix . 'users' . "" );
60	- $widget_content .= __('Number of registered users', 'wp-photo-album-plus') . ': <b>' . $users . '</b><br />';
61	}
62	if ( wppa_checked( $instance['albums'] ) ) {
63	$albums = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_albums" );
64	if ( $albums ) {
65	- $widget_content .= __('Number of albums', 'wp-photo-album-plus') . ': <b>' . $albums . '</b><br />';
66	}
67	}
68	if ( wppa_checked( $instance['mediaitems'] ) ) {
69	$items = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos" );
70	if ( $items ) {
71	- $widget_content .= __('Number of media items', 'wp-photo-album-plus') . ': <b>' . $items . '</b><br />';
72	}
73	}
74	if ( wppa_checked( $instance['photos'] ) ) {
75	$photos = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos WHERE ext <> 'xxx' AND filename NOT LIKE '%.pdf'" );
76	if ( $photos ) {
77	- $widget_content .= __('Number of photos', 'wp-photo-album-plus') . ': <b>' . $photos . '</b><br />';
78	}
79	}
80	$multi = false;
	@@ -85,7 +85,7 @@ class WppaStatsWidget extends WP_Widget {
85	if ( wppa_is_video( $item ) ) $cnt++;
86	}
87	if ( $cnt ) {
88	- $widget_content .= __('Number of videos', 'wp-photo-album-plus') . ': <b>' . $cnt . '</b><br />';
89	}
90	}
91	if ( wppa_checked( $instance['audios'] ) && wppa_switch( 'enable_audio' ) ) {
	@@ -97,29 +97,29 @@ class WppaStatsWidget extends WP_Widget {
97	if ( wppa_has_audio( $item ) ) $cnt++;
98	}
99	if ( $cnt ) {
100	- $widget_content .= __('Number of audios', 'wp-photo-album-plus') . ': <b>' . $cnt . '</b><br />';
101	}
102	}
103	if ( wppa_checked( $instance['pdfs'] ) && wppa_switch( 'enable_pdf' ) ) {
104	$pdfs = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos WHERE filename LIKE '%.pdf'" );
105	if ( $pdfs ) {
106	- $widget_content .= __('Number of pdfs', 'wp-photo-album-plus') . ': <b>' . $pdfs . '</b><br />';
107	}
108	}
109	if ( wppa_checked( $instance['comments'] ) && wppa_switch( 'show_comments' ) ) {
110	$comments = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_comments" );
111	if ( $comments ) {
112	- $widget_content .= __('Number of comments', 'wp-photo-album-plus') . ': <b>' . $comments . '</b><br />';
113	}
114	}
115	if ( wppa_checked( $instance['rating'] ) && wppa_switch( 'rating_on' ) ) {
116	$ratings = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_rating" );
117	if ( $ratings ) {
118	- $widget_content .= __('Number of ratings', 'wp-photo-album-plus') . ': <b>' . $ratings . '</b><br />';
119	}
120	}
121
122	- if ( substr( $widget_content, -6 ) == '<br />' ) {
123	$widget_content = substr( $widget_content, 0, strlen( $widget_content ) - 6 );
124	}
125


3	* Package: wp-photo-album-plus
4	*
5	* display the stats widget
6	+ * Version 8.1.05.001
7	*
8	*/
9	class WppaStatsWidget extends WP_Widget {

35
36	// Make the widget content
37	if ( wppa_checked( $instance['ip'] ) ) {
38	+ $widget_content .= __('Your ip is', 'wp-photo-album-plus') . ': <b>'.$_SERVER['REMOTE_ADDR'].'</b><br>';
39	}
40	if ( wppa_checked( $instance['browser'] ) ) {
41	$browser = isset( $_SERVER["HTTP_USER_AGENT"] ) ? $_SERVER["HTTP_USER_AGENT"] : 'unknown';
42	+ $widget_content .= __('Your browser is', 'wp-photo-album-plus') . ': <b>' . $browser .'</b><br>';
43	}
44	if ( wppa_checked( $instance['dayno'] ) ) {
45	+ $widget_content .= __('Today is day no', 'wp-photo-album-plus') . ': <b>' . ( date_i18n( 'z', time() ) + 1 ) . '</b><br>';
46	}
47	if ( wppa_checked( $instance['sessions-active'] ) ) {
48	$sescount = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . ( time() - 3600 ) . "'" );
49	+ $widget_content .= __('Number of active sessions', 'wp-photo-album-plus') . ': <b>' . $sescount . '</b><br>';
50	}
51	if ( wppa_checked( $instance['sessions-day'] ) ) {
52	$t = time() - 3600*24;
53	$daysescount = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . $t . "'" );
54	$robots = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_session WHERE timestamp > '" . $t . "' AND data LIKE '%\"isrobot\";b:1;%'" );
55	+ $widget_content .= __('Number of sessions last 24 hours', 'wp-photo-album-plus') . ': <b>' . $daysescount . '</b><br>' .
56	+ __('Of which robots', 'wp-photo-album-plus') . ': <b>' . $robots . '</b><br>';
57	}
58	if ( wppa_checked( $instance['reg-users'] ) ) {
59	$users = $wpdb->get_var( "SELECT COUNT(*) FROM " . $wpdb->prefix . 'users' . "" );
60	+ $widget_content .= __('Number of registered users', 'wp-photo-album-plus') . ': <b>' . $users . '</b><br>';
61	}
62	if ( wppa_checked( $instance['albums'] ) ) {
63	$albums = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_albums" );
64	if ( $albums ) {
65	+ $widget_content .= __('Number of albums', 'wp-photo-album-plus') . ': <b>' . $albums . '</b><br>';
66	}
67	}
68	if ( wppa_checked( $instance['mediaitems'] ) ) {
69	$items = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos" );
70	if ( $items ) {
71	+ $widget_content .= __('Number of media items', 'wp-photo-album-plus') . ': <b>' . $items . '</b><br>';
72	}
73	}
74	if ( wppa_checked( $instance['photos'] ) ) {
75	$photos = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos WHERE ext <> 'xxx' AND filename NOT LIKE '%.pdf'" );
76	if ( $photos ) {
77	+ $widget_content .= __('Number of photos', 'wp-photo-album-plus') . ': <b>' . $photos . '</b><br>';
78	}
79	}
80	$multi = false;

85	if ( wppa_is_video( $item ) ) $cnt++;
86	}
87	if ( $cnt ) {
88	+ $widget_content .= __('Number of videos', 'wp-photo-album-plus') . ': <b>' . $cnt . '</b><br>';
89	}
90	}
91	if ( wppa_checked( $instance['audios'] ) && wppa_switch( 'enable_audio' ) ) {

97	if ( wppa_has_audio( $item ) ) $cnt++;
98	}
99	if ( $cnt ) {
100	+ $widget_content .= __('Number of audios', 'wp-photo-album-plus') . ': <b>' . $cnt . '</b><br>';
101	}
102	}
103	if ( wppa_checked( $instance['pdfs'] ) && wppa_switch( 'enable_pdf' ) ) {
104	$pdfs = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos WHERE filename LIKE '%.pdf'" );
105	if ( $pdfs ) {
106	+ $widget_content .= __('Number of pdfs', 'wp-photo-album-plus') . ': <b>' . $pdfs . '</b><br>';
107	}
108	}
109	if ( wppa_checked( $instance['comments'] ) && wppa_switch( 'show_comments' ) ) {
110	$comments = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_comments" );
111	if ( $comments ) {
112	+ $widget_content .= __('Number of comments', 'wp-photo-album-plus') . ': <b>' . $comments . '</b><br>';
113	}
114	}
115	if ( wppa_checked( $instance['rating'] ) && wppa_switch( 'rating_on' ) ) {
116	$ratings = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_rating" );
117	if ( $ratings ) {
118	+ $widget_content .= __('Number of ratings', 'wp-photo-album-plus') . ': <b>' . $ratings . '</b><br>';
119	}
120	}
121
122	+ if ( substr( $widget_content, -6 ) == '<br>' ) {
123	$widget_content = substr( $widget_content, 0, strlen( $widget_content ) - 6 );
124	}
125

wppa-tagcloud-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the tagcloud widget
6	- * Version 8.0.08.~~006~~
7	*
8	*/
9
	@@ -121,7 +121,7 @@ class TagcloudPhotos extends WP_Widget {
121	else {
122	$s = __( '--- all ---', 'wp-photo-album-plus' );
123	}
124	- echo '<p style="word-break:break-all;" >' . __( 'Currently selected tags', 'wp-photo-album-plus' ) . ': <br ~~/><~~b>' . $s . '</b></p>';
125
126	// Loggedin only
127	echo


3	* Package: wp-photo-album-plus
4	*
5	* display the tagcloud widget
6	+ * Version 8.1.05.001
7	*
8	*/
9

121	else {
122	$s = __( '--- all ---', 'wp-photo-album-plus' );
123	}
124	+ echo '<p style="word-break:break-all;" >' . __( 'Currently selected tags', 'wp-photo-album-plus' ) . ': <br><b>' . $s . '</b></p>';
125
126	// Loggedin only
127	echo

wppa-tinymce-common.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-tinymce-common.php
3	* Pachkage: wp-photo-album-plus
4	*
5	- * Version 8.1.00.~~009~~
6	*
7	*/
8
	@@ -40,10 +40,10 @@ global $wpdb;
40	' value="' . esc_attr( __( 'All photos', 'wp-photo-album-plus' ) ) . '"' .
41	' onclick="jQuery(\'#wppaphoto-myphoto-tr\').hide();jQuery(\'#wppaphoto-allphoto-tr\').show();wppaMyPhotoSelection=false;jQuery(\'#wppaphoto-photo-preview\').html(\'\');wppaPhotoEvaluate();"' .
42	' />' .
43	- '<br />'.
44	'<small class="wppamyphoto-photo" >'.
45	- __('Specify the photo to be used', 'wp-photo-album-plus').'<br />'.
46	- sprintf( __('You can select one of your photos from a maximum of %d most recently added', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br />'.
47	'</small>' .
48	'</td>' .
49	'</tr>' .
	@@ -56,10 +56,10 @@ global $wpdb;
56	'<select id="wppaphoto-allphoto" name="photo" class="wppaphoto-allphoto" onchange="wppaPhotoEvaluate()" >' .
57	wppa_get_allphotos_selection_body_for_tinymce() .
58	'</select>' .
59	- '<br />' .
60	'<small class="wppaphoto-allphoto" >'.
61	- __('Specify the photo to be used', 'wp-photo-album-plus').'<br />'.
62	- sprintf( __('You can select from a maximum of %d most recently added photos', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br />'.
63	'</small>'.
64	'</td>'.
65	'</tr>'.


2	/* wppa-tinymce-common.php
3	* Pachkage: wp-photo-album-plus
4	*
5	+ * Version 8.1.05.001
6	*
7	*/
8

40	' value="' . esc_attr( __( 'All photos', 'wp-photo-album-plus' ) ) . '"' .
41	' onclick="jQuery(\'#wppaphoto-myphoto-tr\').hide();jQuery(\'#wppaphoto-allphoto-tr\').show();wppaMyPhotoSelection=false;jQuery(\'#wppaphoto-photo-preview\').html(\'\');wppaPhotoEvaluate();"' .
42	' />' .
43	+ '<br>'.
44	'<small class="wppamyphoto-photo" >'.
45	+ __('Specify the photo to be used', 'wp-photo-album-plus').'<br>'.
46	+ sprintf( __('You can select one of your photos from a maximum of %d most recently added', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br>'.
47	'</small>' .
48	'</td>' .
49	'</tr>' .

56	'<select id="wppaphoto-allphoto" name="photo" class="wppaphoto-allphoto" onchange="wppaPhotoEvaluate()" >' .
57	wppa_get_allphotos_selection_body_for_tinymce() .
58	'</select>' .
59	+ '<br>' .
60	'<small class="wppaphoto-allphoto" >'.
61	+ __('Specify the photo to be used', 'wp-photo-album-plus').'<br>'.
62	+ sprintf( __('You can select from a maximum of %d most recently added photos', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br>'.
63	'</small>'.
64	'</td>'.
65	'</tr>'.

wppa-tinymce-shortcodes.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-tinymce-shortcodes.php
3	* Pachkage: wp-photo-album-plus
4	*
5	- * Version 8.1.00.~~004~~
6	*/
7
8	if ( ! defined( 'ABSPATH' ) )
	@@ -253,7 +253,7 @@ global $wpdb;
253	if ( wppa_has_many_albums() ) {
254	$result .=
255	'<input id="wppagallery-album-real" style="max-width:400px;" name="album" onchange="wppaGalleryEvaluate()" />'.
256	- '<br />'.
257	__('Enter one or more album numbers, seperated by commas', 'wp-photo-album-plus');
258	}
259	else {
	@@ -284,7 +284,7 @@ global $wpdb;
284	'<th><label for="">'.__('Filter album:', 'wp-photo-album-plus').'</label></th>'.
285	'<td>'.
286	'<input id="wppagallery-album-real-search" type="text" onkeyup="wppaGalleryEvaluate()" />'.
287	- '<br />'.
288	'<small>'.
289	__('Enter a (part of) the album name to limit the options in the selection box above.', 'wp-photo-album-plus').' '.
290	'</small>'.
	@@ -300,7 +300,7 @@ global $wpdb;
300	if ( wppa_has_many_albums() ) {
301	$result .=
302	'<input id="wppagallery-album-realopt" style="max-width:400px;" name="album" onchange="wppaGalleryEvaluate()" value="0" />'.
303	- '<br />'.
304	__('Optinally enter one or more album numbers, seperated by commas, or 0 for all albums', 'wp-photo-album-plus');
305	}
306	else {
	@@ -480,10 +480,10 @@ global $wpdb;
480	}
481	$result .=
482	'</select>'.
483	- '<br />'.
484	'<small style="display:none;" class="wppagallery-photo" >'.
485	- __('Specify the photo to be used', 'wp-photo-album-plus').'<br />'.
486	- sprintf( __('You can select from a maximum of %d most recently added photos', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br />'.
487	'</small>'.
488	'</td>'.
489	'</tr>'.
	@@ -617,7 +617,7 @@ global $wpdb;
617	'<option value="timestamp" >'.__('By date of upload', 'wp-photo-album-plus').'</option>'.
618	'<option value="modified" >'.__('By date last modified', 'wp-photo-album-plus').'</option>'.
619	'</select>'.
620	- '<br />'.
621	'<input type="checkbox" id="wppagallery-calendar-reverse" onchange="wppaGalleryEvaluate()" >'.__('Last date first', 'wp-photo-album-plus').'  '.
622	'<input type="checkbox" id="wppagallery-calendar-allopen" onchange="wppaGalleryEvaluate()" >'.__('Initially display all', 'wp-photo-album-plus').
623	'</td>'.
	@@ -628,11 +628,11 @@ global $wpdb;
628	'<th><label for="wppagallery-size">'.__('The size of the display:', 'wp-photo-album-plus').'</label></th>'.
629	'<td>'.
630	'<input type="text" id="wppagallery-size" value="" style="color:#070;" onchange="wppaGalleryEvaluate();"/>'.
631	- '<br />'.
632	'<small>'.
633	__('Specify the horizontal size in pixels or <span style="color:blue" >auto</span>.', 'wp-photo-album-plus').' '.
634	__('A value less than <span style="color:blue" >100</span> will automatically be interpreted as a <span style="color:blue" >percentage</span> of the available space.', 'wp-photo-album-plus').
635	- __('For responsive with a fixed maximum, add the max to auto e.g. <span style="color:blue" >auto,550</span>', 'wp-photo-album-plus' ).'<br />'.
636	__('Leave this blank for default size', 'wp-photo-album-plus').
637	'</small>'.
638	'</td>'.
	@@ -648,7 +648,7 @@ global $wpdb;
648	'<option value="center" >'.__('center', 'wp-photo-album-plus').'</option>'.
649	'<option value="right" >'.__('right', 'wp-photo-album-plus').'</option>'.
650	'</select>'.
651	- '<br />'.
652	'<small>'.__('Specify the alignment to be used or --- none ---', 'wp-photo-album-plus').'</small>'.
653	'</td>'.
654	'</tr>'.


2	/* wppa-tinymce-shortcodes.php
3	* Pachkage: wp-photo-album-plus
4	*
5	+ * Version 8.1.05.001
6	*/
7
8	if ( ! defined( 'ABSPATH' ) )

253	if ( wppa_has_many_albums() ) {
254	$result .=
255	'<input id="wppagallery-album-real" style="max-width:400px;" name="album" onchange="wppaGalleryEvaluate()" />'.
256	+ '<br>'.
257	__('Enter one or more album numbers, seperated by commas', 'wp-photo-album-plus');
258	}
259	else {

284	'<th><label for="">'.__('Filter album:', 'wp-photo-album-plus').'</label></th>'.
285	'<td>'.
286	'<input id="wppagallery-album-real-search" type="text" onkeyup="wppaGalleryEvaluate()" />'.
287	+ '<br>'.
288	'<small>'.
289	__('Enter a (part of) the album name to limit the options in the selection box above.', 'wp-photo-album-plus').' '.
290	'</small>'.

300	if ( wppa_has_many_albums() ) {
301	$result .=
302	'<input id="wppagallery-album-realopt" style="max-width:400px;" name="album" onchange="wppaGalleryEvaluate()" value="0" />'.
303	+ '<br>'.
304	__('Optinally enter one or more album numbers, seperated by commas, or 0 for all albums', 'wp-photo-album-plus');
305	}
306	else {

480	}
481	$result .=
482	'</select>'.
483	+ '<br>'.
484	'<small style="display:none;" class="wppagallery-photo" >'.
485	+ __('Specify the photo to be used', 'wp-photo-album-plus').'<br>'.
486	+ sprintf( __('You can select from a maximum of %d most recently added photos', 'wp-photo-album-plus'), wppa_opt( 'generator_max' ) ).'<br>'.
487	'</small>'.
488	'</td>'.
489	'</tr>'.

617	'<option value="timestamp" >'.__('By date of upload', 'wp-photo-album-plus').'</option>'.
618	'<option value="modified" >'.__('By date last modified', 'wp-photo-album-plus').'</option>'.
619	'</select>'.
620	+ '<br>'.
621	'<input type="checkbox" id="wppagallery-calendar-reverse" onchange="wppaGalleryEvaluate()" >'.__('Last date first', 'wp-photo-album-plus').'  '.
622	'<input type="checkbox" id="wppagallery-calendar-allopen" onchange="wppaGalleryEvaluate()" >'.__('Initially display all', 'wp-photo-album-plus').
623	'</td>'.

628	'<th><label for="wppagallery-size">'.__('The size of the display:', 'wp-photo-album-plus').'</label></th>'.
629	'<td>'.
630	'<input type="text" id="wppagallery-size" value="" style="color:#070;" onchange="wppaGalleryEvaluate();"/>'.
631	+ '<br>'.
632	'<small>'.
633	__('Specify the horizontal size in pixels or <span style="color:blue" >auto</span>.', 'wp-photo-album-plus').' '.
634	__('A value less than <span style="color:blue" >100</span> will automatically be interpreted as a <span style="color:blue" >percentage</span> of the available space.', 'wp-photo-album-plus').
635	+ __('For responsive with a fixed maximum, add the max to auto e.g. <span style="color:blue" >auto,550</span>', 'wp-photo-album-plus' ).'<br>'.
636	__('Leave this blank for default size', 'wp-photo-album-plus').
637	'</small>'.
638	'</td>'.

648	'<option value="center" >'.__('center', 'wp-photo-album-plus').'</option>'.
649	'<option value="right" >'.__('right', 'wp-photo-album-plus').'</option>'.
650	'</select>'.
651	+ '<br>'.
652	'<small>'.__('Specify the alignment to be used or --- none ---', 'wp-photo-album-plus').'</small>'.
653	'</td>'.
654	'</tr>'.

wppa-upldr-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display a list of users linking to their photos
6	- * Version 8.0.08.~~006~~
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -138,10 +138,10 @@ class UpldrWidget extends WP_Widget {
138	$widget_content = "\n".'<!-- WPPA+ Upldr Widget start -->';
139	$widget_content .= '<div class="wppa-upldr" data-wppa="yes" >';
140	if ( $showownercount ) {
141	- $widget_content .= sprintf( _n( 'Number of contributors: %d', 'Number of contributors: %d', $total_ownercount, 'wp-photo-album-plus' ), $total_ownercount ) . '<br />';
142	}
143	if ( $showphotocount ) {
144	- $widget_content .= sprintf( _n( 'Number of photos: %d', 'Number of photos: %d', $total_photocount, 'wp-photo-album-plus' ), $total_photocount ) . '<br ~~/><~~br />';
145	}
146	$widget_content .= '<table><tbody>';
147	$albs = $instance['parent'] ? wppa_expand_enum( wppa_alb_to_enum_children( wppa_expand_enum( $instance['parent'] ) ) ) : '';


3	* Package: wp-photo-album-plus
4	*
5	* display a list of users linking to their photos
6	+ * Version 8.1.05.001
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

138	$widget_content = "\n".'<!-- WPPA+ Upldr Widget start -->';
139	$widget_content .= '<div class="wppa-upldr" data-wppa="yes" >';
140	if ( $showownercount ) {
141	+ $widget_content .= sprintf( _n( 'Number of contributors: %d', 'Number of contributors: %d', $total_ownercount, 'wp-photo-album-plus' ), $total_ownercount ) . '<br>';
142	}
143	if ( $showphotocount ) {
144	+ $widget_content .= sprintf( _n( 'Number of photos: %d', 'Number of photos: %d', $total_photocount, 'wp-photo-album-plus' ), $total_photocount ) . '<br><br>';
145	}
146	$widget_content .= '<table><tbody>';
147	$albs = $instance['parent'] ? wppa_expand_enum( wppa_alb_to_enum_children( wppa_expand_enum( $instance['parent'] ) ) ) : '';

wppa-upload-widget.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* A wppa widget to upload photos
6	*
7	- * Version 8.0.10.~~003~~
8	*/
9
10	class WppaUploadWidget extends WP_Widget {
	@@ -48,16 +48,9 @@ class WppaUploadWidget extends WP_Widget {
48	wppa_user_upload(); // Do the upload if required
49
50	$mocc = wppa( 'mocc' );
51	- $is_responsive = true;
52
53	- if ( $is_responsive ) { // Responsive widget
54	- $js = wppa_get_responsive_widget_js_html( $mocc );
55	- }
56	- else {
57	- $js = '';
58	- }
59	$create = wppa_get_user_create_html( $album, wppa_opt( 'widget_width' ), 'widget' );
60	- $upload = wppa_get_user_upload_html( $album, wppa_opt( 'widget_width' ), 'widget', ~~$is_responsive~~ );
61
62	// Anything to do?
63	if ( ! $create && ! $upload ) {
	@@ -71,7 +64,6 @@ class WppaUploadWidget extends WP_Widget {
71	' style="margin-top:2px;margin-left:2px;"' .
72	' data-wppa="yes"' .
73	' >' .
74	- $js .
75	$create .
76	$upload .
77	'</div>';


4	*
5	* A wppa widget to upload photos
6	*
7	+ * Version 8.1.05.001
8	*/
9
10	class WppaUploadWidget extends WP_Widget {

48	wppa_user_upload(); // Do the upload if required
49
50	$mocc = wppa( 'mocc' );

51






52	$create = wppa_get_user_create_html( $album, wppa_opt( 'widget_width' ), 'widget' );
53	+ $upload = wppa_get_user_upload_html( $album, wppa_opt( 'widget_width' ), 'widget' );
54
55	// Anything to do?
56	if ( ! $create && ! $upload ) {

64	' style="margin-top:2px;margin-left:2px;"' .
65	' data-wppa="yes"' .
66	' >' .

67	$create .
68	$upload .
69	'</div>';

wppa-upload.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the upload pages and functions
6	- * Version 8.1.00.~~002~~
7	*
8	*/
9
	@@ -130,7 +130,7 @@ global $upload_album;
130	echo
131	'<p>' .
132	__( 'There are no albums where you are allowed to upload photos to.', 'wp-photo-album-plus' ) .
133	- '<br />' .
134	__( 'Ask your administrator to create at least one album that is accessible for you to upload to, or ask him to give you album admin rights.', 'wp-photo-album-plus' ) .
135	'</p>';
136	return;
	@@ -156,7 +156,7 @@ global $upload_album;
156	__( 'If your request exceeds these limitations, it will fail, probably without an errormessage.' , 'wp-photo-album-plus' ) .
157	' ' .
158	__( 'Additionally your hosting provider may have set other limitations on uploading files.' , 'wp-photo-album-plus' ) .
159	- '<br />' .
160	wppa_check_memory_limit() .
161	'</div>';
162	}
	@@ -178,11 +178,11 @@ global $upload_album;
178	) . '
179	</h3>' .
180	( $multi ?
181	- sprintf( __( 'You can select up to %s files in one selection and upload them.' , 'wp-photo-album-plus' ), $max_files_txt ) .'<br />' :
182	''
183	) .
184	__( 'Supported filetypes are', 'wp-photo-album-plus' ) . ': ' . implode( ', ', wppa_get_supported_extensions() ) . '
185	- <br />' .
186	( $multi ?
187	'<small style="color:blue" >' .
188	__( 'You need a modern browser that supports HTML-5 to select multiple files' , 'wp-photo-album-plus') . '


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the upload pages and functions
6	+ * Version 8.1.05.001
7	*
8	*/
9

130	echo
131	'<p>' .
132	__( 'There are no albums where you are allowed to upload photos to.', 'wp-photo-album-plus' ) .
133	+ '<br>' .
134	__( 'Ask your administrator to create at least one album that is accessible for you to upload to, or ask him to give you album admin rights.', 'wp-photo-album-plus' ) .
135	'</p>';
136	return;

156	__( 'If your request exceeds these limitations, it will fail, probably without an errormessage.' , 'wp-photo-album-plus' ) .
157	' ' .
158	__( 'Additionally your hosting provider may have set other limitations on uploading files.' , 'wp-photo-album-plus' ) .
159	+ '<br>' .
160	wppa_check_memory_limit() .
161	'</div>';
162	}

178	) . '
179	</h3>' .
180	( $multi ?
181	+ sprintf( __( 'You can select up to %s files in one selection and upload them.' , 'wp-photo-album-plus' ), $max_files_txt ) .'<br>' :
182	''
183	) .
184	__( 'Supported filetypes are', 'wp-photo-album-plus' ) . ': ' . implode( ', ', wppa_get_supported_extensions() ) . '
185	+ <br>' .
186	( $multi ?
187	'<small style="color:blue" >' .
188	__( 'You need a modern browser that supports HTML-5 to select multiple files' , 'wp-photo-album-plus') . '

wppa-utils.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	- * Version 8.1.02.~~003~~
7	*
8	*/
9
	@@ -1083,7 +1083,7 @@ function wppa_strip_tags($text, $key = '') {
1083	array ( ' ', ' ', ' ', ' ', ' '
1084	),
1085	$text );
1086	- $text = str_replace(array('<br/>', '<br />'), ' ', $text);
1087	$text = strip_tags($text);
1088	}
1089	elseif ( $key == 'script' ) {
	@@ -2475,10 +2475,10 @@ global $wpdb;
2475	}
2476	else {
2477	return __('There are no ratings between', 'wp-photo-album-plus') .
2478	- '<br />' .
2479	wppa_local_date( 'F j, Y, H:i s', $start ) .
2480	' ' . __('and', 'wp-photo-album-plus') .
2481	- '<br />' .
2482	wppa_local_date( 'F j, Y, H:i s', $end ) .
2483	'.';
2484	}
	@@ -3015,7 +3015,7 @@ static $wppa_cmt;
3015	// Do we already start with a <p> ?
3016	$start_p = ( strpos( $desc, '<p' ) === 0 );
3017
3018	- // remove newlines, glossary converts them to <br />
3019	$desc = str_replace( array( "\n", "\r", "\t" ), '', $desc );
3020	$desc = $wppa_cmt->cmtt_glossary_parse( $desc, true );
3021


3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	+ * Version 8.1.05.001
7	*
8	*/
9

1083	array ( ' ', ' ', ' ', ' ', ' '
1084	),
1085	$text );
1086	+ $text = str_replace(array('<br/>', '<br>'), ' ', $text);
1087	$text = strip_tags($text);
1088	}
1089	elseif ( $key == 'script' ) {

2475	}
2476	else {
2477	return __('There are no ratings between', 'wp-photo-album-plus') .
2478	+ '<br>' .
2479	wppa_local_date( 'F j, Y, H:i s', $start ) .
2480	' ' . __('and', 'wp-photo-album-plus') .
2481	+ '<br>' .
2482	wppa_local_date( 'F j, Y, H:i s', $end ) .
2483	'.';
2484	}

3015	// Do we already start with a <p> ?
3016	$start_p = ( strpos( $desc, '<p' ) === 0 );
3017
3018	+ // remove newlines, glossary converts them to <br>
3019	$desc = str_replace( array( "\n", "\r", "\t" ), '', $desc );
3020	$desc = $wppa_cmt->cmtt_glossary_parse( $desc, true );
3021

wppa-widget-functions.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-widget-functions.php
3	/* Package: wp-photo-album-plus
4	/*
5	- /* Version 8.1.00.~~008~~
6	/*
7	*/
8
	@@ -374,7 +374,7 @@ function wppa_widget_checkbox( $class, $item, $value, $label, $subtext = '', $di
374	' >' .
375	$label .
376	'</label>' .
377	- ( $subtext ? '<small ><br />' . $subtext . '</small>' : '' ) .
378	'</p>';
379
380	return $result;
	@@ -443,7 +443,7 @@ function wppa_widget_number( $class, $item, $value, $label, $min, $max, $subtext
443	' >' .
444	$label . ':' .
445	'</label>' .
446	- '<br />' .
447	'<input' .
448	' id="' . $class->get_field_id( $item ) . '"' .
449	' name="' . $class->get_field_name( $item ) . '"' .
	@@ -470,7 +470,7 @@ function wppa_widget_selection( $class, $item, $value, $label, $options, $values
470	' >' .
471	$label . ':' .
472	'</label>' .
473	- ( $cls ? '' : '<br />' ) .
474	'<select' .
475	' class="' . $cls . '"' .
476	' id="' . $class->get_field_id( $item ) . '"' .
	@@ -490,7 +490,7 @@ function wppa_widget_selection( $class, $item, $value, $label, $options, $values
490
491	$result .=
492	'</select>' .
493	- ( $subtext ? '<small>' . ( $cls ? '' : '<br />' ) .$subtext . '</small>' : '' ) .
494	'</p>';
495
496	return $result;


2	/* wppa-widget-functions.php
3	/* Package: wp-photo-album-plus
4	/*
5	+ /* Version 8.1.05.001
6	/*
7	*/
8

374	' >' .
375	$label .
376	'</label>' .
377	+ ( $subtext ? '<small ><br>' . $subtext . '</small>' : '' ) .
378	'</p>';
379
380	return $result;

443	' >' .
444	$label . ':' .
445	'</label>' .
446	+ '<br>' .
447	'<input' .
448	' id="' . $class->get_field_id( $item ) . '"' .
449	' name="' . $class->get_field_name( $item ) . '"' .

470	' >' .
471	$label . ':' .
472	'</label>' .
473	+ ( $cls ? '' : '<br>' ) .
474	'<select' .
475	' class="' . $cls . '"' .
476	' id="' . $class->get_field_id( $item ) . '"' .

490
491	$result .=
492	'</select>' .
493	+ ( $subtext ? '<small>' . ( $cls ? '' : '<br>' ) .$subtext . '</small>' : '' ) .
494	'</p>';
495
496	return $result;

wppa-wrappers.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	* Contains wrappers for standard php functions
6	* For security and bug reasons
7	*
8	- * Version 8.1.02.~~003~~
9	*
10	*/
11
	@@ -864,6 +864,15 @@ static $allowed_tags;
864	'src' => true,
865	'type' => true,
866	),









867	);
868	}
869


5	* Contains wrappers for standard php functions
6	* For security and bug reasons
7	*
8	+ * Version 8.1.05.001
9	*
10	*/
11

864	'src' => true,
865	'type' => true,
866	),
867	+ 'ul' => array(
868	+ 'style' => true,
869	+ ),
870	+ 'ol' => array(
871	+ 'style' => true,
872	+ ),
873	+ 'li' => array(
874	+ 'style' => true,
875	+ ),
876	);
877	}
878

wppa.php CHANGED Viewed

	@@ -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: 8.1.04.~~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/
	@@ -24,7 +24,7 @@ global $wp_version;
24
25	/* WPPA GLOBALS */
26	global $wppa_api_version;
27	- $wppa_api_version = '8.1.04.~~004~~'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30


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: 8.1.05.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/

24
25	/* WPPA GLOBALS */
26	global $wppa_api_version;
27	+ $wppa_api_version = '8.1.05.001'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30