WP Photo Album Plus - Version 6.5.02

Version Description

Release Info

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

Code changes from version 6.5.01 to 6.5.02

Files changed (26) hide show

js/wppa-admin-scripts.js +15 -8
js/wppa-slideshow.js +20 -3
js/wppa-slideshow.min.js +8 -4
js/wppa-tinymce-shortcodes.js +24 -8
readme.txt +18 -3
wppa-admin-functions.php +15 -1
wppa-admin.php +7 -2
wppa-ajax.php +1 -1
wppa-album-covers.php +24 -7
wppa-boxes-html.php +82 -14
wppa-common-functions.php +2 -1
wppa-date-time.php +34 -33
wppa-filter.php +3 -1
wppa-functions.php +114 -16
wppa-import.php +2640 -0
wppa-init.php +40 -1
wppa-mobile.php +89 -89
wppa-photo-admin-autosave.php +17 -2
wppa-settings-autosave.php +30 -1
wppa-setup.php +8 -1
wppa-source.php +3 -1
wppa-tinymce-shortcodes.php +5 -3
wppa-upload.php +412 -2376
wppa-users.php +1 -4
wppa-utils.php +2 -2
wppa.php +4 -4

js/wppa-admin-scripts.js CHANGED Viewed

	@@ -1515,7 +1515,7 @@ function wppaAjaxUpdateOptionCheckBox(slug, elem) {
1515	case 1:
1516	case 2:
1517	case 3:
1518	- ~~document.getElementById~~('img_'+slug).src = wppaImageDirectory+'clock.png';
1519	break;
1520	case 4:
1521	var str = wppaTrim(xmlhttp.responseText);
	@@ -1527,8 +1527,8 @@ function wppaAjaxUpdateOptionCheckBox(slug, elem) {
1527	if (xmlhttp.status!=404) {
1528	switch (ArrValues[1]) {
1529	case '0': // No error
1530	- ~~document.getElementById~~('img_'+slug).src = wppaImageDirectory+'tick.png';
1531	- ~~document.getElementById~~('img_'+slug).title = ArrValues[2];
1532	if ( ArrValues[3] != '' ) alert(ArrValues[3]);
1533	if ( _wppaRefreshAfter ) {
1534	_wppaRefreshAfter = false;
	@@ -1536,8 +1536,8 @@ function wppaAjaxUpdateOptionCheckBox(slug, elem) {
1536	}
1537	break;
1538	default:
1539	- ~~document.getElementById~~('img_'+slug).src = wppaImageDirectory+'cross.png';
1540	- ~~document.getElementById~~('img_'+slug).title = 'Error #'+ArrValues[1]+', message: '+ArrValues[2]+', status: '+xmlhttp.status;
1541	if ( ArrValues[3] != '' ) alert(ArrValues[3]);
1542	if ( _wppaRefreshAfter ) {
1543	_wppaRefreshAfter = false;
	@@ -1547,8 +1547,8 @@ function wppaAjaxUpdateOptionCheckBox(slug, elem) {
1547
1548	}
1549	else {
1550	- ~~document.getElementById~~('img_'+slug).src = wppaImageDirectory+'cross.png';
1551	- ~~document.getElementById~~('img_'+slug).title = 'Communication error, status = '+xmlhttp.status;
1552	}
1553	wppaCheckInconsistencies();
1554	}
	@@ -1835,7 +1835,7 @@ function wppaEncode(xtext) {
1835	function wppaCheckInconsistencies() {
1836
1837	// Uses thumb popup and thumb lightbox?
1838	- if ( ~~document.getElementById~~('use_thumb_popup').checked ~~== true~~ && ~~document.getElementById~~('thumb_linktype').~~value~~ == 'lightbox' ) {
1839	jQuery('.popup-lightbox-err').css('display', '');
1840	}
1841	else {
	@@ -2119,4 +2119,11 @@ function wppaExportDbTable( table ) {
2119	}
2120	} );
2121







2122	}


1515	case 1:
1516	case 2:
1517	case 3:
1518	+ jQuery('#img_'+slug).attr('src',wppaImageDirectory+'clock.png');
1519	break;
1520	case 4:
1521	var str = wppaTrim(xmlhttp.responseText);

1527	if (xmlhttp.status!=404) {
1528	switch (ArrValues[1]) {
1529	case '0': // No error
1530	+ jQuery('#img_'+slug).attr('src',wppaImageDirectory+'tick.png');
1531	+ jQuery('#img_'+slug).attr('title',ArrValues[2]);
1532	if ( ArrValues[3] != '' ) alert(ArrValues[3]);
1533	if ( _wppaRefreshAfter ) {
1534	_wppaRefreshAfter = false;

1536	}
1537	break;
1538	default:
1539	+ jQuery('#img_'+slug).attr('src',wppaImageDirectory+'cross.png');
1540	+ jQuery('#img_'+slug).attr('title','Error #'+ArrValues[1]+', message: '+ArrValues[2]+', status: '+xmlhttp.status);
1541	if ( ArrValues[3] != '' ) alert(ArrValues[3]);
1542	if ( _wppaRefreshAfter ) {
1543	_wppaRefreshAfter = false;

1547
1548	}
1549	else {
1550	+ jQuery('#img_'+slug).attr('src',wppaImageDirectory+'cross.png');
1551	+ jQuery('#img_'+slug).attr('title','Communication error, status = '+xmlhttp.status);
1552	}
1553	wppaCheckInconsistencies();
1554	}

1835	function wppaCheckInconsistencies() {
1836
1837	// Uses thumb popup and thumb lightbox?
1838	+ if ( jQuery('#use_thumb_popup').attr('checked') && jQuery('#thumb_linktype').val() == 'lightbox' ) {
1839	jQuery('.popup-lightbox-err').css('display', '');
1840	}
1841	else {

2119	}
2120	} );
2121
2122	+ }
2123	+
2124	+ function wppaDismissAdminNotice(notice, elm) {
2125	+
2126	+ wppaAjaxUpdateOptionCheckBox(notice, elm);
2127	+ jQuery('#wppa-wr-').css('display','none');
2128	+
2129	}

js/wppa-slideshow.js CHANGED Viewed

	@@ -3,7 +3,7 @@
3	// Contains slideshow modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	- var wppaJsSlideshowVersion = '6.5.00';
7
8	// This is an entrypoint to load the slide data
9	function wppaStoreSlideInfo(
	@@ -781,7 +781,7 @@ function _wppaNextSlide_5( mocc ) {
781
782	// If running: Wait for next slide
783	if ( _wppaSSRuns[mocc] ) {
784	- setTimeout( '_wppaNextSlide( '+mocc+', "auto" )', ~~_wppaTimeOut[~~mocc] );
785	}
786	}
787
	@@ -1281,7 +1281,7 @@ function _wppaGotoContinue( mocc ) {
1281	setTimeout( '_wppaGotoContinue( '+mocc+' )', 10 ); // Try again after 10 ms
1282	return;
1283	}
1284	- setTimeout( '_wppaNextSlide( '+mocc+', "reset" )', ~~_wppaTimeOut[~~mocc] + 10 ); //restart slideshow after new timeout
1285	}
1286
1287	function _wppaStart( mocc, idx ) {
	@@ -1333,6 +1333,9 @@ function _wppaStop( mocc ) {
1333
1334	function _wppaSpeed( mocc, faster ) {
1335



1336	if ( faster ) {
1337	if ( _wppaTimeOut[mocc] > 500 ) _wppaTimeOut[mocc] /= 1.5;
1338	}
	@@ -1786,4 +1789,18 @@ function _wppaShowMetaData( mocc, key ) {
1786	}
1787	}
1788














1789	wppaConsoleLog( 'wppa-slideshow.js version '+wppaJsSlideshowVersion+' loaded.', 'force' );


3	// Contains slideshow modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	+ var wppaJsSlideshowVersion = '6.5.02';
7
8	// This is an entrypoint to load the slide data
9	function wppaStoreSlideInfo(

781
782	// If running: Wait for next slide
783	if ( _wppaSSRuns[mocc] ) {
784	+ setTimeout( '_wppaNextSlide( '+mocc+', "auto" )', wppaGetSlideshowTimeout( mocc ) );
785	}
786	}
787

1281	setTimeout( '_wppaGotoContinue( '+mocc+' )', 10 ); // Try again after 10 ms
1282	return;
1283	}
1284	+ setTimeout( '_wppaNextSlide( '+mocc+', "reset" )', wppaGetSlideshowTimeout( mocc ) + 10 ); //restart slideshow after new timeout
1285	}
1286
1287	function _wppaStart( mocc, idx ) {

1333
1334	function _wppaSpeed( mocc, faster ) {
1335
1336	+ if ( _wppaTimeOut[mocc] == 'random' ) {
1337	+ return;
1338	+ }
1339	if ( faster ) {
1340	if ( _wppaTimeOut[mocc] > 500 ) _wppaTimeOut[mocc] /= 1.5;
1341	}

1789	}
1790	}
1791
1792	+ function wppaGetSlideshowTimeout( mocc ) {
1793	+
1794	+ var time;
1795	+ if ( _wppaTimeOut[mocc] == 'random' ) {
1796	+ var min = 2 * wppaAnimationSpeed;
1797	+ var max = 7 * wppaAnimationSpeed;
1798	+ time = Math.floor(Math.random() * (max - min + 1)) + min;
1799	+ }
1800	+ else {
1801	+ time = _wppaTimeOut[mocc];
1802	+ }
1803	+ return time;
1804	+ }
1805	+
1806	wppaConsoleLog( 'wppa-slideshow.js version '+wppaJsSlideshowVersion+' loaded.', 'force' );

js/wppa-slideshow.min.js CHANGED Viewed

	@@ -4,7 +4,7 @@
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	- var wppaJsSlideshowVersion='6.5.00';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml,waittext){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]\|\|'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;_wppaWaitTexts[mocc]=[];}
8	cursor='default';if(linkurl!=''){cursor='pointer';}
9	else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10	_wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+wppaTrimAlt(name)+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}}
	@@ -74,7 +74,7 @@ _wppaDoAutocol(mocc);wppaStartStop(mocc,index);return;}
74	else{wppaUpdateLightboxes();if(!wppaIsMini[mocc]){var visurl=wppaGetCurrentFullUrl(mocc,_wppaCurIdx[mocc]);if(''==visurl){visurl=_wppaShareUrl[mocc][_wppaCurIdx[mocc]];}
75	if(typeof(wppaQRUpdate)!='undefined'){wppaQRUpdate(_wppaShareUrl[mocc][_wppaCurIdx[mocc]]);}
76	if(!_wppaSSRuns[mocc]){if(_wppaSlides[mocc].length>1){wppaPushStateSlide(mocc,_wppaCurIdx[mocc],visurl);}}}
77	- if(_wppaSSRuns[mocc]){setTimeout('_wppaNextSlide( '+mocc+', "auto" )',~~_wppaTimeOut[~~mocc]);}}
78	jQuery(document).trigger('glossaryTooltipReady');_wppaDidGoto[mocc]=false;_wppaIsBusy[mocc]=false;if(!wppaIsMini[mocc]){_bumpViewCount(_wppaId[mocc][_wppaCurIdx[mocc]]);}
79	_wppaDoAutocol(mocc);wppaStopAudio();if(wppaSlideAudioStart){var elms=jQuery('.wppa-audio-'+_wppaId[mocc][_wppaCurIdx[mocc]]+'-'+mocc);if(elms.length>0){var audio=elms[elms.length-1];if(audio){if(!wppaAudioPlaying[mocc]){audio.play();}}}}}
80	function wppaFormatSlide(mocc){var imgid='theimg'+_wppaFg[mocc]+'-'+mocc;var slideid='theslide'+_wppaFg[mocc]+'-'+mocc;var frameid='slide_frame-'+mocc;var contw=wppaColWidth[mocc];var elm=document.getElementById(imgid);var audios=jQuery('.wppa-audio-'+mocc);if(!elm)return;if(typeof(contw)=='undefined'\|\|contw==0){contw=wppaGetContainerWidth(mocc);wppaColWidth[mocc]=contw;}
	@@ -136,13 +136,14 @@ function _wppaGoto(mocc,idx){_wppaToTheSame=(_wppaNxtIdx[mocc]==idx);_wppaNxtIdx
136	function _wppaGotoRunning(mocc,idx){if(_wppaIsBusy[mocc]){setTimeout('_wppaGotoRunning( '+mocc+','+idx+' )',10);return;}
137	wppaConsoleLog('GotoRunning '+mocc);_wppaSSRuns[mocc]=false;_wppaToTheSame=(_wppaNxtIdx[mocc]==idx);_wppaNxtIdx[mocc]=idx;__wppaOverruleRun=true;_wppaNextSlide(mocc,"manual");_wppaGotoContinue(mocc);}
138	function _wppaGotoContinue(mocc){if(_wppaIsBusy[mocc]){setTimeout('_wppaGotoContinue( '+mocc+' )',10);return;}
139	- setTimeout('_wppaNextSlide( '+mocc+', "reset" )',~~_wppaTimeOut[~~mocc]+10);}
140	function _wppaStart(mocc,idx){if(idx==-2){var i=0;idx=0;_wppaSkipRated[mocc]=true;if(_wppaMyr[mocc][i]!=0){while(i<_wppaSlides[mocc].length){if(idx==0&&_wppaMyr[mocc][i]==0)idx=i;i++;}}}
141	if(idx>-1){jQuery('#startstop-'+mocc).html(wppaStart+' '+wppaSlideShow);jQuery('#speed0-'+mocc).css('display','none');jQuery('#speed1-'+mocc).css('display','none');_wppaNxtIdx[mocc]=idx;_wppaCurIdx[mocc]=idx;_wppaNextSlide(mocc,0);_wppaShowMetaData(mocc,'show');}
142	else{_wppaSSRuns[mocc]=true;_wppaNextSlide(mocc,0);jQuery('#startstop-'+mocc).html(wppaStop);jQuery('#speed0-'+mocc).css('display','inline');jQuery('#speed1-'+mocc).css('display','inline');_wppaShowMetaData(mocc,'hide');jQuery('#bc-pname-'+mocc).html(wppaSlideShow);}
143	_wppaSetRatingDisplay(mocc);}
144	function _wppaStop(mocc){_wppaSSRuns[mocc]=false;jQuery('#startstop-'+mocc).html(wppaStart+' '+wppaSlideShow);jQuery('#speed0-'+mocc).css('display','none');jQuery('#speed1-'+mocc).css('display','none');_wppaShowMetaData(mocc,'show');jQuery('#bc-pname-'+mocc).html(_wppaNames[mocc][_wppaCurIdx[mocc]]);}
145	- function _wppaSpeed(mocc,faster){if(~~faster){if(~~_wppaTimeOut[mocc]~~>500~~)~~_wppaTimeOut[mocc]/=1.5~~;}

146	else{if(_wppaTimeOut[mocc]<60000)_wppaTimeOut[mocc]*=1.5;}}
147	function _wppaLoadSpinner(mocc){if(!document.getElementById('slide_frame-'+mocc))return;var top;var lft;var elm;var flag=true;if(document.getElementById('theimg0-'+mocc)){if(document.getElementById('theimg0-'+mocc).complete)flag=false;}
148	if(document.getElementById('theimg1-'+mocc)){if(document.getElementById('theimg1-'+mocc).complete)flag=false;}
	@@ -194,4 +195,7 @@ else{if(key=='show'){if(!wppaFotomotoHideWhenRunning)wppaFotomotoToolbar(mocc,_w
194	else{if(wppaShareHideWhenRunning){jQuery('#wppa-share-'+mocc).css('display','none');}}}
195	if(key=='show'){jQuery("#imagedesc-"+mocc).css('visibility','visible');jQuery("#imagetitle-"+mocc).css('visibility','visible');jQuery("#counter-"+mocc).css('visibility','visible');jQuery("#iptccontent-"+mocc).css('visibility','visible');jQuery("#exifcontent-"+mocc).css('visibility','visible');}
196	else{jQuery("#counter-"+mocc).css('visibility','hidden');jQuery('.wppa-prev-'+mocc).css('visibility','hidden');jQuery('.wppa-next-'+mocc).css('visibility','hidden');jQuery("#iptccontent-"+mocc).css('visibility','hidden');jQuery("#exifcontent-"+mocc).css('visibility','hidden');}}



197	wppaConsoleLog('wppa-slideshow.js version '+wppaJsSlideshowVersion+' loaded.','force');


4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	+ var wppaJsSlideshowVersion='6.5.02';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml,waittext){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]\|\|'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;_wppaWaitTexts[mocc]=[];}
8	cursor='default';if(linkurl!=''){cursor='pointer';}
9	else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10	_wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+wppaTrimAlt(name)+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}}

74	else{wppaUpdateLightboxes();if(!wppaIsMini[mocc]){var visurl=wppaGetCurrentFullUrl(mocc,_wppaCurIdx[mocc]);if(''==visurl){visurl=_wppaShareUrl[mocc][_wppaCurIdx[mocc]];}
75	if(typeof(wppaQRUpdate)!='undefined'){wppaQRUpdate(_wppaShareUrl[mocc][_wppaCurIdx[mocc]]);}
76	if(!_wppaSSRuns[mocc]){if(_wppaSlides[mocc].length>1){wppaPushStateSlide(mocc,_wppaCurIdx[mocc],visurl);}}}
77	+ if(_wppaSSRuns[mocc]){setTimeout('_wppaNextSlide( '+mocc+', "auto" )',wppaGetSlideshowTimeout(mocc));}}
78	jQuery(document).trigger('glossaryTooltipReady');_wppaDidGoto[mocc]=false;_wppaIsBusy[mocc]=false;if(!wppaIsMini[mocc]){_bumpViewCount(_wppaId[mocc][_wppaCurIdx[mocc]]);}
79	_wppaDoAutocol(mocc);wppaStopAudio();if(wppaSlideAudioStart){var elms=jQuery('.wppa-audio-'+_wppaId[mocc][_wppaCurIdx[mocc]]+'-'+mocc);if(elms.length>0){var audio=elms[elms.length-1];if(audio){if(!wppaAudioPlaying[mocc]){audio.play();}}}}}
80	function wppaFormatSlide(mocc){var imgid='theimg'+_wppaFg[mocc]+'-'+mocc;var slideid='theslide'+_wppaFg[mocc]+'-'+mocc;var frameid='slide_frame-'+mocc;var contw=wppaColWidth[mocc];var elm=document.getElementById(imgid);var audios=jQuery('.wppa-audio-'+mocc);if(!elm)return;if(typeof(contw)=='undefined'\|\|contw==0){contw=wppaGetContainerWidth(mocc);wppaColWidth[mocc]=contw;}

136	function _wppaGotoRunning(mocc,idx){if(_wppaIsBusy[mocc]){setTimeout('_wppaGotoRunning( '+mocc+','+idx+' )',10);return;}
137	wppaConsoleLog('GotoRunning '+mocc);_wppaSSRuns[mocc]=false;_wppaToTheSame=(_wppaNxtIdx[mocc]==idx);_wppaNxtIdx[mocc]=idx;__wppaOverruleRun=true;_wppaNextSlide(mocc,"manual");_wppaGotoContinue(mocc);}
138	function _wppaGotoContinue(mocc){if(_wppaIsBusy[mocc]){setTimeout('_wppaGotoContinue( '+mocc+' )',10);return;}
139	+ setTimeout('_wppaNextSlide( '+mocc+', "reset" )',wppaGetSlideshowTimeout(mocc)+10);}
140	function _wppaStart(mocc,idx){if(idx==-2){var i=0;idx=0;_wppaSkipRated[mocc]=true;if(_wppaMyr[mocc][i]!=0){while(i<_wppaSlides[mocc].length){if(idx==0&&_wppaMyr[mocc][i]==0)idx=i;i++;}}}
141	if(idx>-1){jQuery('#startstop-'+mocc).html(wppaStart+' '+wppaSlideShow);jQuery('#speed0-'+mocc).css('display','none');jQuery('#speed1-'+mocc).css('display','none');_wppaNxtIdx[mocc]=idx;_wppaCurIdx[mocc]=idx;_wppaNextSlide(mocc,0);_wppaShowMetaData(mocc,'show');}
142	else{_wppaSSRuns[mocc]=true;_wppaNextSlide(mocc,0);jQuery('#startstop-'+mocc).html(wppaStop);jQuery('#speed0-'+mocc).css('display','inline');jQuery('#speed1-'+mocc).css('display','inline');_wppaShowMetaData(mocc,'hide');jQuery('#bc-pname-'+mocc).html(wppaSlideShow);}
143	_wppaSetRatingDisplay(mocc);}
144	function _wppaStop(mocc){_wppaSSRuns[mocc]=false;jQuery('#startstop-'+mocc).html(wppaStart+' '+wppaSlideShow);jQuery('#speed0-'+mocc).css('display','none');jQuery('#speed1-'+mocc).css('display','none');_wppaShowMetaData(mocc,'show');jQuery('#bc-pname-'+mocc).html(_wppaNames[mocc][_wppaCurIdx[mocc]]);}
145	+ function _wppaSpeed(mocc,faster){if(_wppaTimeOut[mocc]=='random'){return;}
146	+ if(faster){if(_wppaTimeOut[mocc]>500)_wppaTimeOut[mocc]/=1.5;}
147	else{if(_wppaTimeOut[mocc]<60000)_wppaTimeOut[mocc]*=1.5;}}
148	function _wppaLoadSpinner(mocc){if(!document.getElementById('slide_frame-'+mocc))return;var top;var lft;var elm;var flag=true;if(document.getElementById('theimg0-'+mocc)){if(document.getElementById('theimg0-'+mocc).complete)flag=false;}
149	if(document.getElementById('theimg1-'+mocc)){if(document.getElementById('theimg1-'+mocc).complete)flag=false;}

195	else{if(wppaShareHideWhenRunning){jQuery('#wppa-share-'+mocc).css('display','none');}}}
196	if(key=='show'){jQuery("#imagedesc-"+mocc).css('visibility','visible');jQuery("#imagetitle-"+mocc).css('visibility','visible');jQuery("#counter-"+mocc).css('visibility','visible');jQuery("#iptccontent-"+mocc).css('visibility','visible');jQuery("#exifcontent-"+mocc).css('visibility','visible');}
197	else{jQuery("#counter-"+mocc).css('visibility','hidden');jQuery('.wppa-prev-'+mocc).css('visibility','hidden');jQuery('.wppa-next-'+mocc).css('visibility','hidden');jQuery("#iptccontent-"+mocc).css('visibility','hidden');jQuery("#exifcontent-"+mocc).css('visibility','hidden');}}
198	+ function wppaGetSlideshowTimeout(mocc){var time;if(_wppaTimeOut[mocc]=='random'){var min=2wppaAnimationSpeed;var max=7wppaAnimationSpeed;time=Math.floor(Math.random()*(max-min+1))+min;}
199	+ else{time=_wppaTimeOut[mocc];}
200	+ return time;}
201	wppaConsoleLog('wppa-slideshow.js version '+wppaJsSlideshowVersion+' loaded.','force');

js/wppa-tinymce-shortcodes.js CHANGED Viewed

	@@ -2,7 +2,7 @@
2	* Pachkage: wp-photo-album-plus
3	*
4	*
5	- * Version 6.4.17
6	*
7	*/
8
	@@ -492,16 +492,32 @@ function wppaGalleryEvaluate() {
492
493	// Size
494	var size = document.getElementById('wppagallery-size').value;
495	- if ( ~~size~~ ~~!= '' && size != 'auto' ) {~~
496	- if ( ~~parseInt(~~size) ~~!= size~~ ) {







497	size = 0;

498	}
499	}
500	- if ~~( size < 0 )~~ {
501	- size = -size;
502	- }
503	- ~~if (~~ size < ~~100 ) {~~
504	- size ~~= size / 100~~;








505	}
506	if ( size != 0 ) {
507	shortcode += ' size="'+size+'"';


2	* Pachkage: wp-photo-album-plus
3	*
4	*
5	+ * Version 6.5.02
6	*
7	*/
8

492
493	// Size
494	var size = document.getElementById('wppagallery-size').value;
495	+ // Assume valid imput
496	+ jQuery('#wppagallery-size').css('color', '#070');
497	+ // See if auto with fixed max
498	+ var temp = size.split(',');
499	+ if ( temp[1] ) {
500	+ if ( temp[0] == 'auto' && parseInt( temp[1] ) == temp[1] && temp[1] > 100 ) {
501	+ // its ok, auto with a static max of size temp[1]
502	+ }
503	+ else {
504	size = 0;
505	+ jQuery('#wppagallery-size').css('color', '#700');
506	}
507	}
508	+ else {
509	+ if ( size != '' && size != 'auto' ) {
510	+ if ( parseInt(size) != size ) {
511	+ size = 0;
512	+ jQuery('#wppagallery-size').css('color', '#700');
513	+ }
514	+ }
515	+ if ( size < 0 ) {
516	+ size = -size;
517	+ }
518	+ if ( size < 100 ) {
519	+ size = size / 100;
520	+ }
521	}
522	if ( size != 0 ) {
523	shortcode += ' size="'+size+'"';

readme.txt CHANGED Viewed

	@@ -2,12 +2,12 @@
2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5	- Version: 6.5.01
6	- Stable tag: 6.5.00
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9
10	- Tested up to: 4.5
11	License: GPLv2 or later
12	License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
	@@ -180,6 +180,21 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
180
181	See for additional information: http://www.wppa.nl/changelog/
182















183	= 6.5.01 =
184
185	= Bug Fixes =


2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5	+ Version: 6.5.02
6	+ Stable tag: 6.5.01
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9
10	+ Tested up to: 4.6
11	License: GPLv2 or later
12	License URI: http://www.gnu.org/licenses/gpl-2.0.html
13

180
181	See for additional information: http://www.wppa.nl/changelog/
182
183	+ = 6.5.02 =
184	+
185	+ = Bug Fixes =
186	+
187	+ = New Features =
188	+
189	+ * Shortcode attribute size"auto" can now be extended with a maximum value in pixels. Example: size="auto,550"
190	+ * Blog It!. If you enable it in Table II-H16,17, users with edit_post rigths can send a post with one or more photos and text directly from the upload widget/box.
191	+
192	+ = Other Changes =
193	+
194	+ * Viewlink div on imagefactory covers have class .wppa-viewlink-sym as opposed to .wppa-viewlink for other cover types.
195	+ * Potential security fixes by improved input data sanitizations.
196	+ * Captcha question for album create can now be switched off in Table VII-B3.
197	+
198	= 6.5.01 =
199
200	= Bug Fixes =

wppa-admin-functions.php CHANGED Viewed

	@@ -457,11 +457,25 @@ global $wppa_supported_audio_extensions;
457	if ( $files ) foreach ( $files as $file ) {
458	if ( is_file( $file ) ) {
459	$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
460	- if ( !in_array( $ext, $allowed_types ) ) {
461	unlink( $file );
462	wppa_error_message( sprintf( __( 'File %s is of an unsupported filetype and has been removed.' , 'wp-photo-album-plus'), basename( wppa_sanitize_file_name( $file ) ) ) );
463	$count++;
464	}














465	}
466	elseif ( is_dir( $file ) ) {
467	$entry = basename( $file );


457	if ( $files ) foreach ( $files as $file ) {
458	if ( is_file( $file ) ) {
459	$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
460	+ if ( ! in_array( $ext, $allowed_types ) ) {
461	unlink( $file );
462	wppa_error_message( sprintf( __( 'File %s is of an unsupported filetype and has been removed.' , 'wp-photo-album-plus'), basename( wppa_sanitize_file_name( $file ) ) ) );
463	$count++;
464	}
465	+
466	+ // Sanitize filename
467	+ $dirname = dirname( $file );
468	+ $filename = basename( $file );
469	+
470	+ // Can not use sanitize_file_name() because it removes spaces that are not illegal in most servers.
471	+ $filename = strip_tags( stripslashes( $filename ) ); //sanitize_text_field( $filename );
472	+ if ( ! seems_utf8( $filename ) ) {
473	+ $filename = utf8_encode( $filename );
474	+ }
475	+ $newname = $dirname . '/' . $filename;
476	+ if ( $newname != $file ) {
477	+ rename( $file, $newname );
478	+ }
479	}
480	elseif ( is_dir( $file ) ) {
481	$entry = basename( $file );

wppa-admin.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains the admin menu and startups the admin pages
6	- * Version 6.4.17
7	*
8	*/
9
	@@ -37,10 +37,12 @@ function wppa_add_admin() {
37	$com_pending = '';
38	$com_pending_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_COMMENTS."` WHERE `status` = 'pending'" );
39	if ( $com_pending_count ) $com_pending = '<span class="update-plugins"><span class="plugin-count">'.$com_pending_count.'</span></span>';

40	// See if there are uploads pending moderation
41	$upl_pending = '';
42	$upl_pending_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `status` = 'pending'" );
43	if ( $upl_pending_count ) $upl_pending = '<span class="update-plugins"><span class="plugin-count">'.$upl_pending_count.'</span></span>';

44	// Compute total pending moderation
45	$tot_pending = '';
46	$tot_pending_count = '0';
	@@ -118,7 +120,7 @@ function wppa_edit_photo() {
118	// Import admin page
119	function wppa_page_import() {
120	if ( wppa_is_user_blacklisted() ) wp_die(__( 'Importing is temporary diabled for you' , 'wp-photo-album-plus') );
121	- require_once 'wppa-~~upload~~.php';
122	echo '<script type="text/javascript">/* <![CDATA[ /wppa_import = "'.__('Import', 'wp-photo-album-plus').'"; wppa_update = "'.__('Update', 'wp-photo-album-plus').'";/ ]]> */</script>';
123	_wppa_page_import();
124	}
	@@ -199,6 +201,9 @@ add_action('admin_notices', 'wppa_verify_multisite_config');
199	/* Check for pending maintenance procs */
200	add_action('admin_notices', 'wppa_maintenance_messages');
201



202	// Check if tags system needs conversion
203	add_action( 'admin_init', 'wppa_check_tag_system' );
204


3	* Package: wp-photo-album-plus
4	*
5	* Contains the admin menu and startups the admin pages
6	+ * Version 6.5.02
7	*
8	*/
9

37	$com_pending = '';
38	$com_pending_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_COMMENTS."` WHERE `status` = 'pending'" );
39	if ( $com_pending_count ) $com_pending = '<span class="update-plugins"><span class="plugin-count">'.$com_pending_count.'</span></span>';
40	+
41	// See if there are uploads pending moderation
42	$upl_pending = '';
43	$upl_pending_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `status` = 'pending'" );
44	if ( $upl_pending_count ) $upl_pending = '<span class="update-plugins"><span class="plugin-count">'.$upl_pending_count.'</span></span>';
45	+
46	// Compute total pending moderation
47	$tot_pending = '';
48	$tot_pending_count = '0';

120	// Import admin page
121	function wppa_page_import() {
122	if ( wppa_is_user_blacklisted() ) wp_die(__( 'Importing is temporary diabled for you' , 'wp-photo-album-plus') );
123	+ require_once 'wppa-import.php';
124	echo '<script type="text/javascript">/* <![CDATA[ /wppa_import = "'.__('Import', 'wp-photo-album-plus').'"; wppa_update = "'.__('Update', 'wp-photo-album-plus').'";/ ]]> */</script>';
125	_wppa_page_import();
126	}

201	/* Check for pending maintenance procs */
202	add_action('admin_notices', 'wppa_maintenance_messages');
203
204	+ /* Check for old style scripting */
205	+ add_action('admin_notices', 'wppa_scripts_are_obssolete');
206	+
207	// Check if tags system needs conversion
208	add_action( 'admin_init', 'wppa_check_tag_system' );
209

wppa-ajax.php CHANGED Viewed

	@@ -272,7 +272,7 @@ global $wppa_log_file;
272	break;
273
274	case 'import':
275	- require_once 'wppa-~~upload~~.php';
276	_wppa_page_import();
277	wppa_exit();
278	break;


272	break;
273
274	case 'import':
275	+ require_once 'wppa-import.php';
276	_wppa_page_import();
277	wppa_exit();
278	break;

wppa-album-covers.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Functions for album covers
6	- * Version 6.5.00
7	*
8	*/
9
	@@ -1044,7 +1044,7 @@ global $wpdb;
1044	wppa_out(
1045	'<a' .
1046	' href="' . $link . '"' .
1047	- ' style="border:0;"' .
1048	( $is_video ? ' data-videohtml="' . esc_attr( wppa_get_video_body( $thumb['id'] ) ) . '"' .
1049	' data-videonatwidth="' . wppa_get_videox( $thumb['id'] ) . '"' .
1050	' data-videonatheight="' . wppa_get_videoy( $thumb['id'] ) . '"' : '' ) .
	@@ -1084,7 +1084,7 @@ global $wpdb;
1084	wppa_out(
1085	'<a ' .
1086	$href .
1087	- ' style="border:0;"' .
1088	' target="' . $photolink['target'] . '"' .
1089	' title="' . $photolink['title'] . '"' .
1090	' onclick="' . $photolink['onclick'] . '"' .
	@@ -1168,8 +1168,8 @@ static $cached_cover_photo_ids;
1168	// no album, no coverphoto
1169	if ( ! $alb ) return false;
1170
1171	- // Did we do this before?
1172	- if ( isset( $cached_cover_photo_ids[$alb] ) ) {
1173	return $cached_cover_photo_ids[$alb];
1174	}
1175
	@@ -1369,8 +1369,25 @@ function wppa_album_cover_view_link(
1369	$album = wppa_cache_album( $albumid );
1370
1371	if ( wppa_switch( 'show_viewlink' ) ) {
1372	- ~~wppa_out(~~
1373	- ~~'<div~~ ~~class="wppa-box-text~~ ~~wppa-black~~ ~~wppa-info~~ ~~wppa-viewlink~~ ~~wppa-album-~~cover~~-link">'~~ );

















1374	if ( $has_content ) {
1375
1376	// Fake photocount to prevent link to empty page


3	* Package: wp-photo-album-plus
4	*
5	* Functions for album covers
6	+ * Version 6.5.02
7	*
8	*/
9

1044	wppa_out(
1045	'<a' .
1046	' href="' . $link . '"' .
1047	+ ' style="border:0;color:transparent;"' .
1048	( $is_video ? ' data-videohtml="' . esc_attr( wppa_get_video_body( $thumb['id'] ) ) . '"' .
1049	' data-videonatwidth="' . wppa_get_videox( $thumb['id'] ) . '"' .
1050	' data-videonatheight="' . wppa_get_videoy( $thumb['id'] ) . '"' : '' ) .

1084	wppa_out(
1085	'<a ' .
1086	$href .
1087	+ ' style="border:0;color:transparent;"' .
1088	' target="' . $photolink['target'] . '"' .
1089	' title="' . $photolink['title'] . '"' .
1090	' onclick="' . $photolink['onclick'] . '"' .

1168	// no album, no coverphoto
1169	if ( ! $alb ) return false;
1170
1171	+ // Did we do this before? ( for non-imgfact only )
1172	+ if ( $count == '1' && isset( $cached_cover_photo_ids[$alb] ) ) {
1173	return $cached_cover_photo_ids[$alb];
1174	}
1175

1369	$album = wppa_cache_album( $albumid );
1370
1371	if ( wppa_switch( 'show_viewlink' ) ) {
1372	+
1373	+ // Find the album specific cover type
1374	+ $cover_type = wppa_get_album_item( $albumid, 'cover_type' );
1375	+
1376	+ // No type specified (0), use default
1377	+ if ( ! $cover_type ) {
1378	+ $cover_type = wppa_opt( 'cover_type' );
1379	+ }
1380	+
1381	+ // For imgfakt, class .wppa-viewlink-sym
1382	+ if ( $cover_type == 'imagefactory' \|\| $cover_type == 'imagefactory-mcr' ) {
1383	+ wppa_out( '<div class="wppa-box-text wppa-black wppa-info wppa-viewlink-sym wppa-album-cover-link">' );
1384	+ }
1385	+
1386	+ // Normal: class .wppa-viewlink
1387	+ else {
1388	+ wppa_out( '<div class="wppa-box-text wppa-black wppa-info wppa-viewlink wppa-album-cover-link">' );
1389	+ }
1390	+
1391	if ( $has_content ) {
1392
1393	// Fake photocount to prevent link to empty page

wppa-boxes-html.php CHANGED Viewed

@@ -1781,6 +1781,7 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
             				wppa_nonce_field( 'wppa-album-check' , 'wppa-nonce', false, false, $alb ) .
             				'<input type="hidden" name="wppa-album-parent" value="'.$parent.'" />' .
             				'<input type="hidden" name="wppa-fe-create" value="yes" />' .
             				// Name
             				'<div'.
             					' class="wppa-box-text wppa-td"' .
@@ -1803,6 +1804,7 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
             					' style="padding:0; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
             					' name="wppa-album-name"' .
             				' />' .
             				// Description
             				'<div' .
             					' class="wppa-box-text wppa-td"' .
@@ -1821,18 +1823,24 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
             					' class="wppa-user-textarea wppa-box-text"' .
             					' style="padding:0;height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
             					' name="wppa-album-desc" >' .
-            -
            				'</textarea>' .
-            -
            				'<div style="float:left; margin: 6px 0;" >' .
-            -
            					'<div style="float:left;">' .
-            -
            						wppa_make_captcha( wppa_get_randseed( 'session' ) ) .
-            -
            					'</div>' .
-            -
            					'<input' .
-            -
            						' type="text"' .
-            -
            						' id="wppa-captcha-'.$mocc.'"' .
-            -
            						' name="wppa-captcha"' .
-            -
            						' style="margin-left: 6px; width:50px; '.__wcs( 'wppa-box-text' ).__wcs( 'wppa-td' ).'"' .
-            -
            					' />' .
-            -
            				'</div>' .
             				'<input' .
             					' type="submit"' .
             					' class="wppa-user-submit"' .
@@ -2241,7 +2249,7 @@ static $seqno;
             				__( 'Photo description', 'wp-photo-album-plus' ) .
             			'</h6>' .
             			'<textarea' .
-            -
            				' class="wppa-user-textarea wppa-box-text "' .
             				' style="border:1 px solid '.wppa_opt( 'bcolor_upload' ).';clear:left; padding:0; height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
             				' name="wppa-user-desc"' .
             				' >' .
@@ -2345,6 +2353,65 @@ static $seqno;
             		// Close tag enter area
             		$result .= '</div>';
+            	}
             /* start submit section */
@@ -2359,6 +2426,7 @@ static $seqno;
             	// The submit button
             	$result .=
             		'<input' .
             			' type="submit"' .
             			' id="wppa-user-submit-' . $alb . '-' . $mocc . '"' .
@@ -2367,7 +2435,7 @@ static $seqno;
             			' class="wppa-user-submit"' .
             			' name="wppa-user-submit-'.$alb.'-'.$mocc.'" value="'.__( 'Upload photo', 'wp-photo-album-plus' ).'"' .
             		' />' .
-            -
            		'<div style="clear:both"></div>';
             	// if ajax: progression bar
             	if ( $ajax_upload ) {


1781	wppa_nonce_field( 'wppa-album-check' , 'wppa-nonce', false, false, $alb ) .
1782	'<input type="hidden" name="wppa-album-parent" value="'.$parent.'" />' .
1783	'<input type="hidden" name="wppa-fe-create" value="yes" />' .
1784	+
1785	// Name
1786	'<div'.
1787	' class="wppa-box-text wppa-td"' .

1804	' style="padding:0; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
1805	' name="wppa-album-name"' .
1806	' />' .
1807	+
1808	// Description
1809	'<div' .
1810	' class="wppa-box-text wppa-td"' .

1823	' class="wppa-user-textarea wppa-box-text"' .
1824	' style="padding:0;height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
1825	' name="wppa-album-desc" >' .
1826	+ '</textarea>';
1827	+
1828	+ if ( wppa_switch( 'user_create_captcha' ) ) {
1829	+ $result .=
1830	+ '<div style="float:left; margin: 6px 0;" >' .
1831	+ '<div style="float:left;">' .
1832	+ wppa_make_captcha( wppa_get_randseed( 'session' ) ) .
1833	+ '</div>' .
1834	+ '<input' .
1835	+ ' type="text"' .
1836	+ ' id="wppa-captcha-'.$mocc.'"' .
1837	+ ' name="wppa-captcha"' .
1838	+ ' style="margin-left: 6px; width:50px; '.__wcs( 'wppa-box-text' ).__wcs( 'wppa-td' ).'"' .
1839	+ ' />' .
1840	+ '</div>';
1841	+ }
1842	+
1843	+ $result .=
1844	'<input' .
1845	' type="submit"' .
1846	' class="wppa-user-submit"' .

2249	__( 'Photo description', 'wp-photo-album-plus' ) .
2250	'</h6>' .
2251	'<textarea' .
2252	+ ' class="wppa-user-textarea wppa-box-text"' .
2253	' style="border:1 px solid '.wppa_opt( 'bcolor_upload' ).';clear:left; padding:0; height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
2254	' name="wppa-user-desc"' .
2255	' >' .

2353	// Close tag enter area
2354	$result .= '</div>';
2355	}
2356	+
2357	+ /* The Blogit section */
2358	+
2359	+ if ( current_user_can( 'edit_posts' ) && wppa_switch( 'blog_it' ) ) {
2360	+ $result .=
2361	+ '<div>' .
2362	+ '<h6>' .
2363	+ __( 'Blog it?', 'wp-photo-album-plus' ) .
2364	+ ' <input' .
2365	+ ' type="checkbox"' .
2366	+ ' id="wppa-blogit-'.$alb.'-'.$mocc.'"' .
2367	+ ' name="wppa-blogit"' .
2368	+ ' onchange="if ( jQuery(this).attr(\'checked\') ) { ' .
2369	+ 'jQuery(\'#blog-div-'.$alb.'-'.$mocc.'\').css(\'display\',\'block\'); ' .
2370	+ '} ' .
2371	+ 'else { ' .
2372	+ 'jQuery(\'#blog-div-'.$alb.'-'.$mocc.'\').css(\'display\',\'none\'); ' .
2373	+ '} "' .
2374	+ ' />' .
2375	+ '</h6>' .
2376	+ '<div' .
2377	+ ' id="blog-div-'.$alb.'-'.$mocc.'"' .
2378	+ ' style="display:none;"' .
2379	+ ' />' .
2380	+ '<h6>' .
2381	+ __( 'Post title:', 'wp-photo-album-plus' ) .
2382	+ '</h6>' .
2383	+ '<input' .
2384	+ ' id="wppa-blogit-title-'.$alb.'-'.$mocc.'"' .
2385	+ ' type="text"' .
2386	+ ' class="wppa-box-text "' .
2387	+ ' style="padding:0; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
2388	+ ' name="wppa-post-title"' .
2389	+ ' />' .
2390	+ '<h6>' .
2391	+ __( 'Text BEFORE the image:', 'wp-photo-album-plus' ) .
2392	+ '</h6>' .
2393	+ '<textarea' .
2394	+ ' id="wppa-blogit-pretext-'.$alb.'-'.$mocc.'"' .
2395	+ ' name="wppa-blogit-pretext"' .
2396	+ ' class=wppa-user-textarea wppa-box-text"' .
2397	+ ' style="border:1 px solid '.wppa_opt( 'bcolor_upload' ).';clear:left; padding:0; height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
2398	+ ' >' .
2399	+ '</textarea>' .
2400	+ '<h6>' .
2401	+ __( 'Text AFTER the image:', 'wp-photo-album-plus' ) .
2402	+ '</h6>' .
2403	+ '<textarea' .
2404	+ ' id="wppa-blogit-posttext-'.$alb.'-'.$mocc.'"' .
2405	+ ' name="wppa-blogit-posttext"' .
2406	+ ' class=wppa-user-textarea wppa-box-text"' .
2407	+ ' style="border:1 px solid '.wppa_opt( 'bcolor_upload' ).';clear:left; padding:0; height:120px; width:100%; '.__wcs( 'wppa-box-text' ).'"' .
2408	+ '>' .
2409	+ '</textarea>' .
2410	+ '</div>' .
2411	+ '</div>';
2412	+
2413	+ }
2414	+
2415
2416	/* start submit section */
2417

2426
2427	// The submit button
2428	$result .=
2429	+ '<div style="height:6px;;clear:both;" ></div>' .
2430	'<input' .
2431	' type="submit"' .
2432	' id="wppa-user-submit-' . $alb . '-' . $mocc . '"' .

2435	' class="wppa-user-submit"' .
2436	' name="wppa-user-submit-'.$alb.'-'.$mocc.'" value="'.__( 'Upload photo', 'wp-photo-album-plus' ).'"' .
2437	' />' .
2438	+ '<div style="height:6px;clear:both;"></div>';
2439
2440	// if ajax: progression bar
2441	if ( $ajax_upload ) {

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 6.5.00
6	*
7	*/
8
	@@ -271,6 +271,7 @@ global $thumbs;
271	'is_admins_choice' => false,
272	'admins_choice_users' => '',
273	'for_sm' => false,

274
275	);
276	}


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

271	'is_admins_choice' => false,
272	'admins_choice_users' => '',
273	'for_sm' => false,
274	+ 'max_width' => false,
275
276	);
277	}

wppa-date-time.php CHANGED Viewed

	@@ -3,12 +3,12 @@
3	* Package: wp-photo-album-plus
4	*
5	* date and time related functions
6	- * Version 6.3.0
7	*
8	*/
9
10	function wppa_get_timestamp( $key = false ) {
11	-
12	$timnow = time();
13	$format = 'Y:z:n:j:W:w:G:i:s';
14	// 0 1 2 3 4 5 6 7 8
	@@ -17,37 +17,37 @@ function wppa_get_timestamp( $key = false ) {
17
18	$data = explode( ':', $local_date_time );
19	$data[4] = ltrim( '0', $data[4] );
20	-
21	$today_start = $timnow - $data[8] - 60 * $data[7] - 3600 * $data[6];
22	if ( $key == 'todaystart' ) return $today_start;
23	-
24	$daysec = 24 * 3600;
25	-
26	if ( ! $data[5] ) $data[5] = 7; // Sunday
27	$thisweek_start = $today_start - $daysec * ( $data[5] - 1 ); // Week starts on monday
28	if ( $key == 'thisweekstart' ) return $thisweek_start;
29	if ( $key == 'lastweekend' ) return $thisweek_start;
30	-
31	$thisweek_end = $thisweek_start + 7 * $daysec;
32	if ( $key == 'thisweekend' ) return $thisweek_end;
33	-
34	$lastweek_start = $thisweek_start - 7 * $daysec;
35	if ( $key == 'lastweekstart' ) return $lastweek_start;
36	-
37	$thismonth_start = $today_start - ( $data[3] - 1 ) * $daysec;
38	if ( $key == 'thismonthstart' ) return $thismonth_start;
39	if ( $key == 'lastmonthend' ) return $thismonth_start;
40	-
41	$monthdays = array ( '0', '31', '28', '31', '30', '31', '30', '31', '31', '30', '31', '30', '31' );
42	$monthdays[2] += wppa_local_date('L', $timnow ); // Leap year correction
43
44	$thismonth_end = $thismonth_start + $monthdays[$data[2]] * $daysec;
45	if ( $key == 'thismonthend' ) return $thismonth_end;
46	-
47	$lm = $data[2] > 1 ? $data[2] - 1 : 12;
48	$lastmonth_start = $thismonth_start - $monthdays[$lm] * $daysec;
49	if ( $key == 'lastmonthstart' ) return $lastmonth_start;
50	-
51	$thisyear_start = $thismonth_start;
52	$idx = $data[2];
53	while ( $idx > 1 ) {
	@@ -56,22 +56,22 @@ function wppa_get_timestamp( $key = false ) {
56	}
57	if ( $key == 'thisyearstart' ) return $thisyear_start;
58	if ( $key == 'lastyearend' ) return $thisyear_start;
59	-
60	$thisyear_end = $thisyear_start;
61	foreach ( $monthdays as $month ) $thisyear_end += $month * $daysec;
62	if ( $key == 'thisyearend' ) return $thisyear_end;
63	-
64	$lastyear_start = $thisyear_start - 365 * $daysec;
65	if ( wppa_local_date('L', $thisyear_start - $daysec) ) $lastyear_start -= $daysec; // Last year was a leap year
66	if ( $key == 'lastyearstart' ) return $lastyear_start;
67	-
68	return $timnow;
69	}
70
71	function wppa_get_date_time_select_html( $type, $id, $selectable = true ) {
72
73	$type = strtoupper( substr( $type, 0, 1 ) ).strtolower( substr( $type, 1 ) );
74	-
75	if ( $type == 'Photo' ) {
76	$thumb = wppa_cache_thumb( $id );
77	}
	@@ -81,7 +81,7 @@ function wppa_get_date_time_select_html( $type, $id, $selectable = true ) {
81	else {
82	wppa_error_message('Uniplemented type: '.$type.' in wppa_get_date_time_select_html()');
83	}
84	-
85	$opt_months = array( '1' => __('Jan', 'wp-photo-album-plus'), '2' => __('Feb', 'wp-photo-album-plus'), '3' => __('Mar', 'wp-photo-album-plus'), '4' => __('Apr', 'wp-photo-album-plus'), '5' => __('May', 'wp-photo-album-plus'), '6' => __('Jun', 'wp-photo-album-plus'), '7' => __('Jul', 'wp-photo-album-plus'), '8' =>__('Aug', 'wp-photo-album-plus'), '9' => __('Sep', 'wp-photo-album-plus'), '10' => __('Oct', 'wp-photo-album-plus'), '11' => __('Nov', 'wp-photo-album-plus'), '12' => __('Dec', 'wp-photo-album-plus') );
86	$val_months = array( '1' => '01', '2' => '02', '3' => '03', '4' => '04', '5' => '05', '6' => '06', '7' => '07', '8' => '08', '9' => '09', '10' => '10', '11' => '11', '12' =>'12' );
87	$opt_years = array( '2014', '2015', '2016', '2017', '2018', '2019', '2020' );
	@@ -90,27 +90,27 @@ function wppa_get_date_time_select_html( $type, $id, $selectable = true ) {
90	$val_days = $opt_days;
91	$opt_hours = array( '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23' );
92	$val_hours = $opt_hours;
93	- $opt_mins = array( '00', '01', '02', '03', '04', '05', '06', '07', '08', '09',
94	'10', '11', '12', '13', '14', '15', '16', '17', '18', '19',
95	'20', '21', '22', '23', '24', '25', '26', '27', '28', '29',
96	'30', '31', '32', '33', '34', '35', '36', '37', '38', '39',
97	'40', '41', '42', '43', '44', '45', '46', '47', '48', '49',
98	'50', '51', '52', '53', '54', '55', '56', '57', '58', '59' );
99	$val_mins = $opt_mins;
100	-
101	$curval = $type == 'Photo' ? $thumb['scheduledtm'] : $album['scheduledtm'];
102
103	if ( ! $curval ) $curval = wppa_get_default_scheduledtm();
104	-
105	$temp = explode( ',', $curval );
106	$cur_day = $temp[2];
107	$cur_month = $temp[1];
108	$cur_year = $temp[0];
109	$cur_hour = $temp[3];
110	$cur_min = $temp[4];
111	-
112	$result = '';
113	-
114	if ( $selectable ) {
115
116	$result .= '<select name="wppa-day" id="wppa-day-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'day\', this);" >';
	@@ -119,51 +119,51 @@ function wppa_get_date_time_select_html( $type, $id, $selectable = true ) {
119	$result .= '<option value="'.$val_days[$key].'" '.$sel.' >'.$opt_days[$key].'</option>';
120	}
121	$result .= '</select >';
122	-
123	$result .= '<select name="wppa-month" id="wppa-month-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'month\', this);" >';
124	foreach ( array_keys( $opt_months ) as $key ) {
125	$sel = $val_months[$key] == $cur_month ? 'selected="selected"' : '';
126	$result .= '<option value="'.$val_months[$key].'" '.$sel.' >'.$opt_months[$key].'</option>';
127	}
128	$result .= '</select >';
129	-
130	$result .= '<select name="wppa-year" id="wppa-year-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'year\', this);" >';
131	foreach ( array_keys( $opt_years ) as $key ) {
132	$sel = $val_years[$key] == $cur_year ? 'selected="selected"' : '';
133	$result .= '<option value="'.$val_years[$key].'" '.$sel.' >'.$opt_years[$key].'</option>';
134	}
135	$result .= '</select >@';
136	-
137	$result .= '<select name="wppa-hour" id="wppa-hour-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'hour\', this);" >';
138	foreach ( array_keys( $opt_hours ) as $key ) {
139	$sel = $val_hours[$key] == $cur_hour ? 'selected="selected"' : '';
140	$result .= '<option value="'.$val_hours[$key].'" '.$sel.' >'.$opt_hours[$key].'</option>';
141	}
142	$result .= '</select >:';
143	-
144	$result .= '<select name="wppa-min" id="wppa-min-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'min\', this);">';
145	foreach ( array_keys( $opt_mins ) as $key ) {
146	$sel = $val_mins[$key] == $cur_min ? 'selected="selected"' : '';
147	$result .= '<option value="'.$val_mins[$key].'" '.$sel.' >'.$opt_mins[$key].'</option>';
148	}
149	$result .= '</select >';
150	-
151	}
152	else {
153	$result .= '<span class="wppa-datetime-'.$id.'" >'.$cur_day.' '.$opt_months[strval(intval($cur_month))].' '.$cur_year.'@'.$cur_hour.':'.$cur_min.'</span>';
154	}
155	-
156	return $result;
157	}
158
159	// Exactly like php's date(), but corrected for wp's timezone
160	function wppa_local_date( $format, $timestamp = false ) {
161	-
162	// Fill in default format if not supplied
163	if ( ! $format ) {
164	$format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
165	}
166	-
167	// Fill in default timestamp if not suplied
168	if ( $timestamp ) {
169	$time = $timestamp;
	@@ -177,8 +177,9 @@ function wppa_local_date( $format, $timestamp = false ) {
177	if ( empty( $tzstring ) ) {
178
179	// Create a UTC+- zone if no timezone string exists

180	if ( 0 == $current_offset ) {
181	- $tzstring = 'UTC+0';
182	}
183	elseif ($current_offset < 0 ) {
184	$tzstring = 'UTC' . $current_offset;
	@@ -200,7 +201,7 @@ function wppa_local_date( $format, $timestamp = false ) {
200	function wppa_get_default_scheduledtm() {
201
202	$result = wppa_local_date( 'Y,m,d,H,i' );
203	-
204	return $result;
205	}
206
	@@ -214,8 +215,8 @@ function wppa_format_scheduledtm( $sdtm ) {
214	$cur_year = $temp[0];
215	$cur_hour = $temp[3];
216	$cur_min = $temp[4];
217	-
218	$result = $cur_day.' '.$opt_months[strval(intval($cur_month))].' '.$cur_year.'@'.$cur_hour.':'.$cur_min;
219	-
220	return $result;
221	}


3	* Package: wp-photo-album-plus
4	*
5	* date and time related functions
6	+ * Version 6.5.02
7	*
8	*/
9
10	function wppa_get_timestamp( $key = false ) {
11	+
12	$timnow = time();
13	$format = 'Y:z:n:j:W:w:G:i:s';
14	// 0 1 2 3 4 5 6 7 8

17
18	$data = explode( ':', $local_date_time );
19	$data[4] = ltrim( '0', $data[4] );
20	+
21	$today_start = $timnow - $data[8] - 60 * $data[7] - 3600 * $data[6];
22	if ( $key == 'todaystart' ) return $today_start;
23	+
24	$daysec = 24 * 3600;
25	+
26	if ( ! $data[5] ) $data[5] = 7; // Sunday
27	$thisweek_start = $today_start - $daysec * ( $data[5] - 1 ); // Week starts on monday
28	if ( $key == 'thisweekstart' ) return $thisweek_start;
29	if ( $key == 'lastweekend' ) return $thisweek_start;
30	+
31	$thisweek_end = $thisweek_start + 7 * $daysec;
32	if ( $key == 'thisweekend' ) return $thisweek_end;
33	+
34	$lastweek_start = $thisweek_start - 7 * $daysec;
35	if ( $key == 'lastweekstart' ) return $lastweek_start;
36	+
37	$thismonth_start = $today_start - ( $data[3] - 1 ) * $daysec;
38	if ( $key == 'thismonthstart' ) return $thismonth_start;
39	if ( $key == 'lastmonthend' ) return $thismonth_start;
40	+
41	$monthdays = array ( '0', '31', '28', '31', '30', '31', '30', '31', '31', '30', '31', '30', '31' );
42	$monthdays[2] += wppa_local_date('L', $timnow ); // Leap year correction
43
44	$thismonth_end = $thismonth_start + $monthdays[$data[2]] * $daysec;
45	if ( $key == 'thismonthend' ) return $thismonth_end;
46	+
47	$lm = $data[2] > 1 ? $data[2] - 1 : 12;
48	$lastmonth_start = $thismonth_start - $monthdays[$lm] * $daysec;
49	if ( $key == 'lastmonthstart' ) return $lastmonth_start;
50	+
51	$thisyear_start = $thismonth_start;
52	$idx = $data[2];
53	while ( $idx > 1 ) {

56	}
57	if ( $key == 'thisyearstart' ) return $thisyear_start;
58	if ( $key == 'lastyearend' ) return $thisyear_start;
59	+
60	$thisyear_end = $thisyear_start;
61	foreach ( $monthdays as $month ) $thisyear_end += $month * $daysec;
62	if ( $key == 'thisyearend' ) return $thisyear_end;
63	+
64	$lastyear_start = $thisyear_start - 365 * $daysec;
65	if ( wppa_local_date('L', $thisyear_start - $daysec) ) $lastyear_start -= $daysec; // Last year was a leap year
66	if ( $key == 'lastyearstart' ) return $lastyear_start;
67	+
68	return $timnow;
69	}
70
71	function wppa_get_date_time_select_html( $type, $id, $selectable = true ) {
72
73	$type = strtoupper( substr( $type, 0, 1 ) ).strtolower( substr( $type, 1 ) );
74	+
75	if ( $type == 'Photo' ) {
76	$thumb = wppa_cache_thumb( $id );
77	}

81	else {
82	wppa_error_message('Uniplemented type: '.$type.' in wppa_get_date_time_select_html()');
83	}
84	+
85	$opt_months = array( '1' => __('Jan', 'wp-photo-album-plus'), '2' => __('Feb', 'wp-photo-album-plus'), '3' => __('Mar', 'wp-photo-album-plus'), '4' => __('Apr', 'wp-photo-album-plus'), '5' => __('May', 'wp-photo-album-plus'), '6' => __('Jun', 'wp-photo-album-plus'), '7' => __('Jul', 'wp-photo-album-plus'), '8' =>__('Aug', 'wp-photo-album-plus'), '9' => __('Sep', 'wp-photo-album-plus'), '10' => __('Oct', 'wp-photo-album-plus'), '11' => __('Nov', 'wp-photo-album-plus'), '12' => __('Dec', 'wp-photo-album-plus') );
86	$val_months = array( '1' => '01', '2' => '02', '3' => '03', '4' => '04', '5' => '05', '6' => '06', '7' => '07', '8' => '08', '9' => '09', '10' => '10', '11' => '11', '12' =>'12' );
87	$opt_years = array( '2014', '2015', '2016', '2017', '2018', '2019', '2020' );

90	$val_days = $opt_days;
91	$opt_hours = array( '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23' );
92	$val_hours = $opt_hours;
93	+ $opt_mins = array( '00', '01', '02', '03', '04', '05', '06', '07', '08', '09',
94	'10', '11', '12', '13', '14', '15', '16', '17', '18', '19',
95	'20', '21', '22', '23', '24', '25', '26', '27', '28', '29',
96	'30', '31', '32', '33', '34', '35', '36', '37', '38', '39',
97	'40', '41', '42', '43', '44', '45', '46', '47', '48', '49',
98	'50', '51', '52', '53', '54', '55', '56', '57', '58', '59' );
99	$val_mins = $opt_mins;
100	+
101	$curval = $type == 'Photo' ? $thumb['scheduledtm'] : $album['scheduledtm'];
102
103	if ( ! $curval ) $curval = wppa_get_default_scheduledtm();
104	+
105	$temp = explode( ',', $curval );
106	$cur_day = $temp[2];
107	$cur_month = $temp[1];
108	$cur_year = $temp[0];
109	$cur_hour = $temp[3];
110	$cur_min = $temp[4];
111	+
112	$result = '';
113	+
114	if ( $selectable ) {
115
116	$result .= '<select name="wppa-day" id="wppa-day-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'day\', this);" >';

119	$result .= '<option value="'.$val_days[$key].'" '.$sel.' >'.$opt_days[$key].'</option>';
120	}
121	$result .= '</select >';
122	+
123	$result .= '<select name="wppa-month" id="wppa-month-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'month\', this);" >';
124	foreach ( array_keys( $opt_months ) as $key ) {
125	$sel = $val_months[$key] == $cur_month ? 'selected="selected"' : '';
126	$result .= '<option value="'.$val_months[$key].'" '.$sel.' >'.$opt_months[$key].'</option>';
127	}
128	$result .= '</select >';
129	+
130	$result .= '<select name="wppa-year" id="wppa-year-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'year\', this);" >';
131	foreach ( array_keys( $opt_years ) as $key ) {
132	$sel = $val_years[$key] == $cur_year ? 'selected="selected"' : '';
133	$result .= '<option value="'.$val_years[$key].'" '.$sel.' >'.$opt_years[$key].'</option>';
134	}
135	$result .= '</select >@';
136	+
137	$result .= '<select name="wppa-hour" id="wppa-hour-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'hour\', this);" >';
138	foreach ( array_keys( $opt_hours ) as $key ) {
139	$sel = $val_hours[$key] == $cur_hour ? 'selected="selected"' : '';
140	$result .= '<option value="'.$val_hours[$key].'" '.$sel.' >'.$opt_hours[$key].'</option>';
141	}
142	$result .= '</select >:';
143	+
144	$result .= '<select name="wppa-min" id="wppa-min-'.$id.'" class="wppa-datetime-'.$id.'" onchange="wppaAjaxUpdate'.$type.'('.$id.', \'min\', this);">';
145	foreach ( array_keys( $opt_mins ) as $key ) {
146	$sel = $val_mins[$key] == $cur_min ? 'selected="selected"' : '';
147	$result .= '<option value="'.$val_mins[$key].'" '.$sel.' >'.$opt_mins[$key].'</option>';
148	}
149	$result .= '</select >';
150	+
151	}
152	else {
153	$result .= '<span class="wppa-datetime-'.$id.'" >'.$cur_day.' '.$opt_months[strval(intval($cur_month))].' '.$cur_year.'@'.$cur_hour.':'.$cur_min.'</span>';
154	}
155	+
156	return $result;
157	}
158
159	// Exactly like php's date(), but corrected for wp's timezone
160	function wppa_local_date( $format, $timestamp = false ) {
161	+
162	// Fill in default format if not supplied
163	if ( ! $format ) {
164	$format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
165	}
166	+
167	// Fill in default timestamp if not suplied
168	if ( $timestamp ) {
169	$time = $timestamp;

177	if ( empty( $tzstring ) ) {
178
179	// Create a UTC+- zone if no timezone string exists
180	+ $current_offset = get_option( 'gmt_offset', 0 );
181	if ( 0 == $current_offset ) {
182	+ $tzstring = 'UTC';
183	}
184	elseif ($current_offset < 0 ) {
185	$tzstring = 'UTC' . $current_offset;

201	function wppa_get_default_scheduledtm() {
202
203	$result = wppa_local_date( 'Y,m,d,H,i' );
204	+
205	return $result;
206	}
207

215	$cur_year = $temp[0];
216	$cur_hour = $temp[3];
217	$cur_min = $temp[4];
218	+
219	$result = $cur_day.' '.$opt_months[strval(intval($cur_month))].' '.$cur_year.'@'.$cur_hour.':'.$cur_min;
220	+
221	return $result;
222	}

wppa-filter.php CHANGED Viewed

	@@ -301,6 +301,7 @@ global $wppa_revno;
301	$wppa['is_admins_choice'] = false;
302	$wppa['admins_choice_users'] = '';
303	$wppa['albums_only'] = false;

304
305	// Find type
306	switch ( $atts['type'] ) {
	@@ -444,9 +445,10 @@ global $wppa_revno;
444	// Count (internally to wppa_albums)
445
446	// Find size
447	- if ( $atts['size'] == 'auto' ) {
448	$wppa['auto_colwidth'] = true;
449	$wppa['fullsize'] = '';

450	}
451	else {
452	$wppa['auto_colwidth'] = false;


301	$wppa['is_admins_choice'] = false;
302	$wppa['admins_choice_users'] = '';
303	$wppa['albums_only'] = false;
304	+ $wppa['max_width'] = false;
305
306	// Find type
307	switch ( $atts['type'] ) {

445	// Count (internally to wppa_albums)
446
447	// Find size
448	+ if ( substr( $atts['size'], 0, 4 ) == 'auto' ) {
449	$wppa['auto_colwidth'] = true;
450	$wppa['fullsize'] = '';
451	+ $wppa['max_width'] = substr( $atts['size'], 5 );
452	}
453	else {
454	$wppa['auto_colwidth'] = false;

wppa-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	- * Version 6.5.00
7	*
8	*/
9
	@@ -2948,6 +2948,9 @@ global $blog_id;
2948	// if ( wppa( 'shortcode_content' ) ) {
2949	// wppa( 'out' ) .= '<!-- ' . wppa( 'shortcode_content' ) . ' -->';
2950	// }



2951	wppa_out( '<div' .
2952	' id="wppa-container-'.wppa( 'mocc' ).'"' .
2953	' style="'.wppa_get_container_style().'"' .
	@@ -2960,7 +2963,7 @@ global $blog_id;
2960	'wppa-api-' . wppa( 'api_version' ) .
2961	'"' .
2962	' >'
2963	- );
2964	}
2965
2966	// Spinner for Ajax
	@@ -3183,6 +3186,9 @@ global $blog_id;
3183	if ( ! wppa( 'ajax' ) ) {
3184	wppa_out( '<div id="wppa-container-' . wppa( 'mocc' ) . '-end" ></div>' );
3185	wppa_out( '</div>' );



3186	}
3187
3188	if ( wppa( 'debug' ) ) {
	@@ -3199,6 +3205,43 @@ global $blog_id;
3199	}
3200	}
3201





































3202	function wppa_album_list( $action ) {
3203	global $cover_count;
3204	global $cover_count_key;
	@@ -3605,6 +3648,9 @@ function wppa_mphoto() {
3605	$contwidth = $width;
3606	}
3607



3608	// Open the pseudo container
3609	$captwidth = $contwidth + '10';
3610	wppa_out( '<div id="wppa-container-'.wppa( 'mocc' ).'" class="wppa-mphoto-'.wppa( 'mocc' ).' wp-caption' );
	@@ -3742,6 +3788,9 @@ function wppa_mphoto() {
3742	}
3743
3744	wppa_out( '</div>' );



3745	}
3746
3747	// Like mphoto but without the caption and with the fullsize background/border
	@@ -3774,6 +3823,9 @@ function wppa_sphoto() {
3774	$contwidth = $width;
3775	}
3776



3777	// Open the pseudo container
3778	wppa_out( '<div' .
3779	' id="wppa-container-' . wppa( 'mocc' ) . '"' .
	@@ -3917,6 +3969,9 @@ function wppa_sphoto() {
3917
3918	// The pseudo container
3919	wppa_out( '</div>' );



3920	}
3921
3922	// returns aspect ratio ( w/h ), or 1 on error
	@@ -4184,12 +4239,18 @@ static $done;
4184	}
4185	$ok = wp_verify_nonce( $nonce, 'wppa-album-check' );
4186	if ( ! $ok ) die( '<b>' . __( 'ERROR: Illegal attempt to create an album.' , 'wp-photo-album-plus') . '</b>' );

4187	// Check captcha
4188	- ~~$captkey~~ = ~~wppa_get_randseed~~( '~~session~~' );
4189	- ~~if ( ! wppa_check_captcha( $captkey ) ) {~~
4190	- ~~wppa_alert(~~ __( '~~Wrong captcha, please try again~~' ~~, 'wp-photo-album-plus'~~) );
4191	- ~~return;~~




4192	}

4193	$parent = strval( intval( wppa_get_post( 'wppa-album-parent' ) ) );
4194	if ( ! wppa_user_is( 'administrator' ) && wppa_switch( 'default_parent_always' ) ) {
4195	$parent = wppa_opt( 'default_parent' );
	@@ -4222,29 +4283,36 @@ static $done;
4222	}
4223
4224	$alb = wppa_get_post( 'wppa-upload-album' );

4225
4226	if ( is_array( $_FILES ) ) {
4227	- $~~bret~~ = true;
4228	$filecount = '1';
4229	$done = '0';
4230	$fail = '0';
4231	foreach ( $_FILES as $file ) {
4232	if ( ! is_array( $file['error'] ) ) {
4233	- $~~bret~~ = wppa_do_frontend_file_upload( $file, $alb ); // this should no longer happen since the name is incl []
4234	- if ( $~~bret~~ ) ~~$done++;~~



4235	else $fail++;
4236	}
4237	else {
4238	$filecount = count( $file['error'] );
4239	for ( $i = '0'; $i < $filecount; $i++ ) {
4240	- if ( $~~bret~~ ) {
4241	$f['error'] = $file['error'][$i];
4242	$f['tmp_name'] = $file['tmp_name'][$i];
4243	$f['name'] = $file['name'][$i];
4244	$f['type'] = $file['type'][$i];
4245	$f['size'] = $file['size'][$i];
4246	- $~~bret~~ = wppa_do_frontend_file_upload( $f, $alb );
4247	- if ( $~~bret~~ ) ~~$done++;~~



4248	else $fail++;
4249	}
4250	}
	@@ -4256,7 +4324,30 @@ static $done;
4256
4257	if ( $done ) {
4258
4259	- //SUCCESSFUL UPLOAD, ~~ADD~~ ~~POINTS~~























4260	$points = wppa_opt( 'cp_points_upload' ) * $done;
4261	$bret = wppa_add_credit_points( $points, __( 'Photo upload' ,'wp-photo-album-plus' ) );
4262	$alert .= sprintf( _n( '%d photo successfully uploaded', '%d photos successfully uploaded', $done, 'wp-photo-album-plus' ), $done );
	@@ -4438,7 +4529,7 @@ global $wppa_supported_audio_extensions;
4438	wppa_fe_add_custom( $id );
4439
4440	// Done!
4441	- return ~~true~~;
4442
4443	}
4444
	@@ -4502,9 +4593,16 @@ global $wppa_supported_audio_extensions;
4502	$name = $file['name'];
4503	}
4504
4505	- // Sanitize input ~~and find status~~
4506	$name = wppa_sanitize_photo_name( $name );
4507	$desc = balanceTags( wppa_get_post( 'user-desc' ), true );







4508	$linktarget = '_self';
4509	$status = ( wppa_switch( 'upload_moderate' ) && ! current_user_can( 'wppa_admin' ) ) ? 'pending' : 'publish';
4510	$filename = wppa_sanitize_file_name( $file['name'] );
	@@ -4564,7 +4662,7 @@ global $wppa_supported_audio_extensions;
4564	}
4565	wppa_send_mail( $to, $subj, $cont, $id );
4566	}
4567	- return ~~true~~;
4568	}
4569
4570	return false;


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

2948	// if ( wppa( 'shortcode_content' ) ) {
2949	// wppa( 'out' ) .= '<!-- ' . wppa( 'shortcode_content' ) . ' -->';
2950	// }
2951	+ // If static maximum in responsive theme, add wrapper
2952	+ wppa_container_wrapper( 'open' );
2953	+
2954	wppa_out( '<div' .
2955	' id="wppa-container-'.wppa( 'mocc' ).'"' .
2956	' style="'.wppa_get_container_style().'"' .

2963	'wppa-api-' . wppa( 'api_version' ) .
2964	'"' .
2965	' >'
2966	+ );
2967	}
2968
2969	// Spinner for Ajax

3186	if ( ! wppa( 'ajax' ) ) {
3187	wppa_out( '<div id="wppa-container-' . wppa( 'mocc' ) . '-end" ></div>' );
3188	wppa_out( '</div>' );
3189	+
3190	+ // Static max in responsive? close wrapper
3191	+ wppa_container_wrapper( 'close' );
3192	}
3193
3194	if ( wppa( 'debug' ) ) {

3205	}
3206	}
3207
3208	+ function wppa_container_wrapper( $key ) {
3209	+ switch( $key ) {
3210	+ case 'open':
3211	+ if ( wppa( 'max_width' ) ) {
3212	+ wppa_out( '<div' .
3213	+ ' id="wppa-container-wrapper-' . wppa( 'mocc' ) . '"' .
3214	+ ' style="' .
3215	+ 'max-width:' . wppa( 'max_width' ) . 'px;'
3216	+ );
3217	+ switch( wppa( 'align' ) ) {
3218	+ case '':
3219	+ case 'center':
3220	+ wppa_out( 'clear:both;margin:auto;' );
3221	+ break;
3222	+ case 'left':
3223	+ wppa_out( 'clear:left;float:left;' );
3224	+ break;
3225	+ case 'right':
3226	+ wppa_out( 'clear:right;float:right;' );
3227	+ break;
3228	+ }
3229	+
3230	+ wppa_out( '"' .
3231	+ ' >'
3232	+ );
3233	+ }
3234	+ break;
3235	+ case 'close':
3236	+ if ( wppa( 'max_width' ) ) {
3237	+ wppa_out( '</div>' );
3238	+ }
3239	+ break;
3240	+ default:
3241	+ wppa_dbg_msg( 'Missing or wrong arg in wppa_container_wrapper()', 'red', 'force' );
3242	+ }
3243	+ }
3244	+
3245	function wppa_album_list( $action ) {
3246	global $cover_count;
3247	global $cover_count_key;

3648	$contwidth = $width;
3649	}
3650
3651	+ // Auto with fixed max?
3652	+ wppa_container_wrapper( 'open' );
3653	+
3654	// Open the pseudo container
3655	$captwidth = $contwidth + '10';
3656	wppa_out( '<div id="wppa-container-'.wppa( 'mocc' ).'" class="wppa-mphoto-'.wppa( 'mocc' ).' wp-caption' );

3788	}
3789
3790	wppa_out( '</div>' );
3791	+
3792	+ // Maximized auto
3793	+ wppa_container_wrapper( 'close' );
3794	}
3795
3796	// Like mphoto but without the caption and with the fullsize background/border

3823	$contwidth = $width;
3824	}
3825
3826	+ // wrapper for maximized auto
3827	+ wppa_container_wrapper( 'open' );
3828	+
3829	// Open the pseudo container
3830	wppa_out( '<div' .
3831	' id="wppa-container-' . wppa( 'mocc' ) . '"' .

3969
3970	// The pseudo container
3971	wppa_out( '</div>' );
3972	+
3973	+ // Wrapper for maximized auto
3974	+ wppa_container_wrapper( 'close' );
3975	}
3976
3977	// returns aspect ratio ( w/h ), or 1 on error

4239	}
4240	$ok = wp_verify_nonce( $nonce, 'wppa-album-check' );
4241	if ( ! $ok ) die( '<b>' . __( 'ERROR: Illegal attempt to create an album.' , 'wp-photo-album-plus') . '</b>' );
4242	+
4243	// Check captcha
4244	+ if ( wppa_switch( 'user_create_captcha' ) ) {
4245	+
4246	+ $captkey = wppa_get_randseed( 'session' );
4247	+
4248	+ if ( ! wppa_check_captcha( $captkey ) ) {
4249	+ wppa_alert( __( 'Wrong captcha, please try again' , 'wp-photo-album-plus') );
4250	+ return;
4251	+ }
4252	}
4253	+
4254	$parent = strval( intval( wppa_get_post( 'wppa-album-parent' ) ) );
4255	if ( ! wppa_user_is( 'administrator' ) && wppa_switch( 'default_parent_always' ) ) {
4256	$parent = wppa_opt( 'default_parent' );

4283	}
4284
4285	$alb = wppa_get_post( 'wppa-upload-album' );
4286	+ $uploaded_ids = array();
4287
4288	if ( is_array( $_FILES ) ) {
4289	+ $iret = true;
4290	$filecount = '1';
4291	$done = '0';
4292	$fail = '0';
4293	foreach ( $_FILES as $file ) {
4294	if ( ! is_array( $file['error'] ) ) {
4295	+ $iret = wppa_do_frontend_file_upload( $file, $alb ); // this should no longer happen since the name is incl []
4296	+ if ( $iret ) {
4297	+ $uploaded_ids[] = $iret;
4298	+ $done++;
4299	+ }
4300	else $fail++;
4301	}
4302	else {
4303	$filecount = count( $file['error'] );
4304	for ( $i = '0'; $i < $filecount; $i++ ) {
4305	+ if ( $iret ) {
4306	$f['error'] = $file['error'][$i];
4307	$f['tmp_name'] = $file['tmp_name'][$i];
4308	$f['name'] = $file['name'][$i];
4309	$f['type'] = $file['type'][$i];
4310	$f['size'] = $file['size'][$i];
4311	+ $iret = wppa_do_frontend_file_upload( $f, $alb );
4312	+ if ( $iret ) {
4313	+ $uploaded_ids[] = $iret;
4314	+ $done++;
4315	+ }
4316	else $fail++;
4317	}
4318	}

4324
4325	if ( $done ) {
4326
4327	+ // SUCCESSFUL UPLOAD, Blog It?
4328	+ if ( current_user_can( 'edit_posts' ) && isset( $_POST['wppa-blogit'] ) ) {
4329	+
4330	+ $title = $_POST['wppa-post-title'];
4331	+ if ( ! $title ) {
4332	+ $title = wppa_local_date();
4333	+ }
4334	+ $pretxt = $_POST['wppa-blogit-pretext'];
4335	+ $posttxt = $_POST['wppa-blogit-posttext'];
4336	+ $status = wppa_switch( 'blog_it_moderate' ) ? 'pending' : 'publish';
4337	+
4338	+ $post_content = $pretxt;
4339	+ foreach( $uploaded_ids as $id ) {
4340	+ $post_content .= '[wppa type="mphoto" photo="' . $id . '"][/wppa]';
4341	+ }
4342	+ $post_content .= $posttxt;
4343	+
4344	+ $post = array( 'post_title' => $title, 'post_content' => $post_content, 'post_status' => $status );
4345	+ $post = sanitize_post( $post, 'db' );
4346	+
4347	+ $iret = wp_insert_post( $post );
4348	+ }
4349	+
4350	+ // ADD POINTS
4351	$points = wppa_opt( 'cp_points_upload' ) * $done;
4352	$bret = wppa_add_credit_points( $points, __( 'Photo upload' ,'wp-photo-album-plus' ) );
4353	$alert .= sprintf( _n( '%d photo successfully uploaded', '%d photos successfully uploaded', $done, 'wp-photo-album-plus' ), $done );

4529	wppa_fe_add_custom( $id );
4530
4531	// Done!
4532	+ return $id;
4533
4534	}
4535

4593	$name = $file['name'];
4594	}
4595
4596	+ // Sanitize input
4597	$name = wppa_sanitize_photo_name( $name );
4598	$desc = balanceTags( wppa_get_post( 'user-desc' ), true );
4599	+
4600	+ // If BlogIt! and no descrption given, use name field - this is for the shortcode used: typ"mphoto"
4601	+ if ( ! $desc && isset( $_POST['wppa-blogit'] ) ) {
4602	+ $desc = 'w#name';
4603	+ }
4604	+
4605	+ // Find status and other needed data
4606	$linktarget = '_self';
4607	$status = ( wppa_switch( 'upload_moderate' ) && ! current_user_can( 'wppa_admin' ) ) ? 'pending' : 'publish';
4608	$filename = wppa_sanitize_file_name( $file['name'] );

4662	}
4663	wppa_send_mail( $to, $subj, $cont, $id );
4664	}
4665	+ return $id;
4666	}
4667
4668	return false;

wppa-import.php ADDED Viewed

	@@ -0,0 +1,2640 @@


1	+ <?php
2	+ /* wppa-upload.php
3	+ * Package: wp-photo-album-plus
4	+ *
5	+ * Contains all the import pages and functions
6	+ * Version 6.5.02
7	+ *
8	+ */
9	+
10	+ if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
11	+
12	+ // import images admin page
13	+ function _wppa_page_import() {
14	+ global $wppa_revno;
15	+ global $wpdb;
16	+ global $wppa_supported_photo_extensions;
17	+ global $wppa_supported_video_extensions;
18	+ global $wppa_supported_audio_extensions;
19	+ global $wppa_session;
20	+
21	+ if ( wppa( 'ajax' ) ) ob_start(); // Suppress output if ajax operation
22	+
23	+ // Init
24	+ $ngg_opts = get_option( 'ngg_options', false );
25	+ $user = wppa_get_user();
26	+
27	+ // Check database
28	+ wppa_check_database( true );
29	+
30	+ // Update watermark settings for the user if new values supplied
31	+ if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) \|\| current_user_can( 'wppa_settings' ) ) ) {
32	+
33	+ // File
34	+ if ( isset( $_POST['wppa-watermark-file'] ) ) {
35	+
36	+ // Sanitize input
37	+ $watermark_file = $_POST['wppa-watermark-file'];
38	+ if ( stripos( $watermark_file, '.png' ) !== false ) {
39	+ $watermark_file = sanitize_file_name( $watermark_file );
40	+ }
41	+ else {
42	+ if ( ! in_array( $watermark_file, array( '--- none ---', '---name---', '---filename---', '---description---', '---predef---' ) ) ) {
43	+ $watermark_file = 'nil';
44	+ }
45	+ }
46	+
47	+ // Update setting
48	+ update_option( 'wppa_watermark_file_'.$user, $watermark_file );
49	+ }
50	+
51	+ // Position
52	+ if ( isset( $_POST['wppa-watermark-pos'] ) ) {
53	+
54	+ // Sanitize input
55	+ $watermark_pos = $_POST['wppa-watermark-pos'];
56	+ if ( ! in_array( $watermark_pos, array( 'toplft', 'topcen', 'toprht', 'cenlft', 'cencen', 'cenrht', 'botlft', 'botcen', 'botrht' ) ) ) {
57	+ $watermark_pos = 'nil';
58	+ }
59	+
60	+ // Update setting
61	+ update_option( 'wppa_watermark_pos_'.$user, $watermark_pos );
62	+ }
63	+ }
64	+
65	+ // Update last used albums
66	+ if ( isset( $_POST['wppa-photo-album'] ) ) {
67	+ update_option( 'wppa-photo-album-import-'.wppa_get_user(), strval( intval( $_POST['wppa-photo-album'] ) ) );
68	+ }
69	+ if ( isset( $_POST['wppa-video-album'] ) ) {
70	+ update_option( 'wppa-video-album-import-'.wppa_get_user(), strval( intval( $_POST['wppa-video-album'] ) ) );
71	+ }
72	+ if ( isset( $_POST['wppa-audio-album'] ) ) {
73	+ update_option( 'wppa-audio-album-import-'.wppa_get_user(), strval( intval( $_POST['wppa-audio-album'] ) ) );
74	+ }
75	+
76	+ // Verify last albums still exist
77	+ $alb = get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' );
78	+ if ( $alb ) {
79	+ $exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
80	+ if ( ! $exists ) update_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' );
81	+ }
82	+ $alb = get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' );
83	+ if ( $alb ) {
84	+ $exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
85	+ if ( ! $exists ) update_option( 'wppa-video-album-import-'.wppa_get_user(), '0' );
86	+ }
87	+ $alb = get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' );
88	+ if ( $alb ) {
89	+ $exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
90	+ if ( ! $exists ) update_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' );
91	+ }
92	+
93	+ // Extract zip
94	+ if ( isset( $_GET['zip'] ) ) {
95	+ wppa_extract( $_GET['zip'], true );
96	+ }
97	+
98	+ // Set local / remote
99	+ if ( isset( $_POST['wppa-local-remote'] ) && in_array( $_POST['wppa-local-remote'], array( 'local', 'remote' ) ) ) {
100	+ check_admin_referer( '$wppa_nonce', WPPA_NONCE );
101	+ update_option( 'wppa_import_source_type_'.$user, $_POST['wppa-local-remote'] );
102	+ }
103	+
104	+ // Set import source dir ( when local )
105	+ if ( isset( $_POST['wppa-import-set-source-dir'] ) && is_dir( $_POST['wppa-source'] ) ) {
106	+ check_admin_referer( '$wppa_nonce', WPPA_NONCE );
107	+ if ( isset( $_POST['wppa-source'] ) ) {
108	+ update_option( 'wppa_import_source_'.$user, $_POST['wppa-source'] );
109	+ }
110	+ }
111	+
112	+ // Set import source url ( when remote )
113	+ if ( isset( $_POST['wppa-import-set-source-url'] ) ) {
114	+ check_admin_referer( '$wppa_nonce', WPPA_NONCE );
115	+ if ( isset( $_POST['wppa-source-remote'] ) ) {
116	+ update_option( 'wppa_import_source_url_'.$user, esc_url( $_POST['wppa-source-remote'] ) );
117	+ update_option( 'wppa_import_source_url_found_'.$user, false );
118	+ update_option( 'wppa_import_remote_max_'.$user, strval( intval( $_POST['wppa-import-remote-max'] ) ) );
119	+ }
120	+ }
121	+
122	+ // Hit the submit button
123	+ if ( isset( $_POST['wppa-import-submit'] ) ) {
124	+ if ( wppa( 'ajax' ) ) {
125	+ if ( ! wp_verify_nonce( $_POST['wppa-update-check'], '$wppa_nonce' ) ) {
126	+ echo $_POST['wppa-update-check'].' Security check failure';
127	+ wppa_exit();
128	+ }
129	+ }
130	+ else {
131	+ check_admin_referer( '$wppa_nonce', WPPA_NONCE );
132	+ }
133	+ $delp = isset( $_POST['del-after-p'] );
134	+ $delf = isset( $_POST['del-after-f'] );
135	+ $dela = isset( $_POST['del-after-a'] );
136	+ $delz = isset( $_POST['del-after-z'] );
137	+ $delv = isset( $_POST['del-after-v'] );
138	+ $delu = isset( $_POST['del-after-u'] );
139	+ $delc = isset( $_POST['del-after-c'] );
140	+
141	+ wppa_import_photos( $delp, $dela, $delz, $delv, $delu, $delc, $delf );
142	+ }
143	+
144	+ // Continue dirimport after timeout
145	+ elseif ( isset( $_GET['continue'] ) ) {
146	+ if ( wp_verify_nonce( $_GET['nonce'], 'dirimport' ) ) wppa_import_photos();
147	+ }
148	+
149	+ // If we did this by ajax, setup reporting results for it
150	+ if ( wppa( 'ajax' ) ) {
151	+ ob_end_clean();
152	+ if ( wppa( 'ajax_import_files_done' ) ) {
153	+ echo '<span style="color:green" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Done!', 'wp-photo-album-plus' ) . '</span>';
154	+ }
155	+ elseif ( wppa( 'ajax_import_files_error' ) ) {
156	+ echo '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . wppa( 'ajax_import_files_error' ) . '</span>';
157	+ }
158	+ else {
159	+ echo '<span style="color:red" >' . wppa( 'ajax_import_files' ) . ' ' . __( 'Failed!', 'wp-photo-album-plus' ) . '</span>';
160	+ }
161	+ wppa_exit();
162	+ }
163	+
164	+ // Open the Form
165	+ echo
166	+ '<div class="wrap">' .
167	+ '<h2>' .
168	+ __( 'Import Photos', 'wp-photo-album-plus') .
169	+ '</h2>';
170	+
171	+ // See if remote is possible
172	+ $can_remote = ini_get( 'allow_url_fopen' ) && function_exists( 'curl_init' );
173	+ if ( ! $can_remote ) {
174	+ update_option( 'wppa_import_source_type_'.$user, 'local' );
175	+ }
176	+
177	+ // Get this users current source type setting ( local/remote )
178	+ $source_type = get_option( 'wppa_import_source_type_'.$user, 'local' );
179	+
180	+ // Local. Find data we will going to need
181	+ if ( $source_type == 'local' ) {
182	+
183	+ // Get curren local dir setting
184	+ $source = get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
185	+ if ( ! $source \|\| ! is_dir( $source ) ) {
186	+ $source = WPPA_DEPOT_PATH;
187	+ update_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
188	+ }
189	+
190	+ // See if the current source is the 'home' directory
191	+ $is_depot = ( $source == WPPA_DEPOT_PATH );
192	+
193	+ // See if the current source is a subdir of my depot
194	+ $is_sub_depot = ( substr( $source, 0, strlen( WPPA_DEPOT_PATH ) ) == WPPA_DEPOT_PATH );
195	+
196	+ // Sanitize system, removes illegal files
197	+ if ( $is_sub_depot ) {
198	+ wppa_sanitize_files();
199	+ }
200	+
201	+ // See what's in there
202	+ $files = wppa_get_import_files();
203	+ $zipcount = wppa_get_zipcount( $files );
204	+ $albumcount = wppa_get_albumcount( $files );
205	+ $photocount = wppa_get_photocount( $files );
206	+ $videocount = wppa_get_video_count( $files );
207	+ $audiocount = wppa_get_audio_count( $files );
208	+ $dircount = $is_depot ? wppa_get_dircount( $files ) : '0';
209	+ $csvcount = $is_depot ? wppa_get_csvcount( $files ) : '0';
210	+
211	+ if ( $ngg_opts ) {
212	+ $is_ngg = strpos( $source, $ngg_opts['gallerypath'] ) !== false; // this is false for the ngg root !!
213	+ }
214	+ else $is_ngg = false;
215	+ }
216	+
217	+ // Remote. Find data we will going to need
218	+ if ( $source_type == 'remote' ) {
219	+ wppa( 'is_remote', true );
220	+ $source = get_option( 'wppa_import_source_url_' . $user, 'http://' );
221	+ $source_path = $source;
222	+ $source_url = $source;
223	+ $is_depot = false;
224	+ $is_sub_depot = false;
225	+ $files = wppa_get_import_files();
226	+ $zipcount = '0';
227	+ $albumcount = '0';
228	+ $photocount = $files ? count( $files ) : '0';
229	+ $videocount = '0';
230	+ $audiocount = '0';
231	+ $dircount = '0';
232	+ $csvcount = '0';
233	+ $is_ngg = false;
234	+ $remote_max = get_option( 'wppa_import_remote_max_'.$user, '10' );
235	+ }
236	+
237	+ // The form
238	+ echo
239	+ '<form' .
240	+ ' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"' .
241	+ ' method="post"' .
242	+ ' >';
243	+
244	+ // Admin and superuser can change import source, other users only if change source not is restricted
245	+ if ( wppa_user_is( 'administrator' ) \|\| ! wppa_switch( 'chgsrc_is_restricted' ) ) {
246	+
247	+ // Local / Remote
248	+ echo
249	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
250	+ wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
251	+ __( 'Select Local or Remote', 'wp-photo-album-plus' ) .
252	+ ( $disabled = $can_remote ? '' : 'disabled="disabled"' ) .
253	+ '<select name="wppa-local-remote" >' .
254	+ '<option value="local" ' . ( $source_type == 'local' ? 'selected="selected"' : '' ) . '>' . __( 'Local', 'wp-photo-album-plus') . '</option>' .
255	+ '<option value="remote" ' . $disabled . ( $source_type == 'remote' ? 'selected="selected"' : '' ) . '>' . __( 'Remote' ,'wp-photo-album-plus' ) . '</option>' .
256	+ '</select>';
257	+ if ( $can_remote ) {
258	+ echo
259	+ '<input' .
260	+ ' type="submit"' .
261	+ ' class="button-secundary"' .
262	+ ' name="wppa-import-set-source"' .
263	+ ' value="' . __( 'Set Local/Remote' ,'wp-photo-album-plus') . '"' .
264	+ '/>';
265	+ }
266	+ else {
267	+ if ( ! ini_get( 'allow_url_fopen' ) ) {
268	+ _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' );
269	+ }
270	+ if ( ! function_exists( 'curl_init' ) ) {
271	+ _e( 'The server does not allow you to import from remote locations. ( The curl functions are not set up )', 'wp-photo-album-plus' );
272	+ }
273	+ }
274	+ echo
275	+ '</div>';
276	+
277	+ // Source dir / url
278	+ echo
279	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
280	+ wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
281	+ __( 'Import photos from:' ,'wp-photo-album-plus');
282	+
283	+ // Local: dir
284	+ if ( $source_type == 'local' ) {
285	+ echo
286	+ '<select name="wppa-source" >' .
287	+ wppa_abs_walktree( wppa_opt( 'import_root'), $source ) .
288	+ '</select>' .
289	+ '<input' .
290	+ ' type="submit"' .
291	+ ' class="button-secundary"' .
292	+ ' name="wppa-import-set-source-dir"' .
293	+ ' value="' . __( 'Set source directory', 'wp-photo-album-plus') . '"' .
294	+ ' />';
295	+ }
296	+
297	+ // Remote: url
298	+ else {
299	+ echo
300	+ '<input' .
301	+ ' type="text"' .
302	+ ' style="width:50%"' .
303	+ ' name="wppa-source-remote"' .
304	+ ' value="' . $source . '"' .
305	+ ' />' .
306	+ __( 'Max:', 'wp-photo-album-plus' ) .
307	+ '<input' .
308	+ ' type="text"' .
309	+ ' style="width:50px;"' .
310	+ ' name="wppa-import-remote-max"' .
311	+ ' value="' . $remote_max . '"' .
312	+ ' />' .
313	+ '<input' .
314	+ ' type="submit"' .
315	+ ' onclick="jQuery( \'#rem-rem\' ).css( \'display\',\'inline\' ); return true;"' .
316	+ ' class="button-secundary"' .
317	+ ' name="wppa-import-set-source-url"' .
318	+ ' value="' . __( 'Find remote photos', 'wp-photo-album-plus' ) . '"' .
319	+ ' />' .
320	+ '<span id="rem-rem" style="display:none;" >' .
321	+ __( 'Working, please wait...', 'wp-photo-album-plus') .
322	+ '</span>' .
323	+ '<br />' .
324	+ __( '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' );
325	+ }
326	+ echo
327	+ '</div>';
328	+ }
329	+ echo
330	+ '</form>';
331	+
332	+ // check if albums exist or will be made before allowing upload
333	+ if ( ! wppa_has_albums() && ! $albumcount && ! $dircount ) {
334	+ $url = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu' );
335	+ echo
336	+ '<p>' .
337	+ __( 'No albums exist. You must', 'wp-photo-album-plus' ) . ' ' .
338	+ '<a href="' . $url . '" >' .
339	+ __( 'create one', 'wp-photo-album-plus' ) . ' ' .
340	+ '</a> ' .
341	+ __( 'beofre you can upload your photos.', 'wp-photo-album-plus' ) .
342	+ '</p>';
343	+ return;
344	+ }
345	+
346	+ // Something to import?
347	+ if ( $photocount \|\| $albumcount \|\| $zipcount \|\| $dircount \|\| $videocount \|\| $audiocount \|\| $csvcount ) {
348	+
349	+ // Open the form
350	+ echo
351	+ '<form' .
352	+ ' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_import_photos' ) . '"' .
353	+ ' method="post"' .
354	+ ' >' .
355	+ wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false );
356	+
357	+ // Display the zips
358	+ if ( PHP_VERSION_ID >= 50207 && $zipcount > '0' ) {
359	+ echo
360	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
361	+ '<p><b>' .
362	+ sprintf( _n( 'There is %d zipfile in the depot', 'There are %d zipfiles in the depot', $zipcount, 'wp-photo-album-plus' ), $zipcount ) .
363	+ '</b></p>' .
364	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
365	+ '<thead>' .
366	+ '<tr>' .
367	+ '<td>' .
368	+ '<input' .
369	+ ' type="checkbox"' .
370	+ ' id="all-zip"' .
371	+ ' checked="checked"' .
372	+ ' onchange="checkAll( \'all-zip\', \'.wppa-zip\' )"' .
373	+ ' />' .
374	+ '<b>  ' .
375	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) .
376	+ '</b>' .
377	+ '</td>';
378	+ if ( $is_sub_depot ) {
379	+ echo
380	+ '<td>' .
381	+ '<input' .
382	+ ' type="checkbox"' .
383	+ ' id="del-after-z"' .
384	+ ' name="del-after-z"' .
385	+ ' checked="checked"' .
386	+ ' />' .
387	+ '<b>  ' .
388	+ __( 'Delete after successful extraction.', 'wp-photo-album-plus' ) .
389	+ '</b>' .
390	+ '</td>';
391	+ }
392	+ echo
393	+ '</tr>' .
394	+ '</thead>' .
395	+ '</table>' .
396	+ '<table' .
397	+ ' class="form-table wppa-table widefat"' .
398	+ ' style="margin-top:0;"' .
399	+ ' >' .
400	+ '<tr>';
401	+ $ct = 0;
402	+ $idx = '0';
403	+ foreach ( $files as $file ) {
404	+
405	+ $ext = wppa_get_ext( $file );
406	+ if ( $ext == 'zip' ) {
407	+ echo
408	+ '<td>' .
409	+ '<input' .
410	+ ' type="checkbox"' .
411	+ ' id="file-' . $idx . '"' .
412	+ ' name="file-' . $idx . '"' .
413	+ ' class="wppa-zip"' .
414	+ ' checked="checked"' .
415	+ ' />  ' .
416	+ wppa_sanitize_file_name( basename( $file ) ) .
417	+ '</td>';
418	+ if ( $ct == 3 ) {
419	+ echo( '</tr><tr>' );
420	+ $ct = 0;
421	+ }
422	+ else {
423	+ $ct++;
424	+ }
425	+ }
426	+ $idx++;
427	+ }
428	+ echo
429	+ '</tr>' .
430	+ '</table>' .
431	+ '</div>';
432	+ }
433	+
434	+ // Dispay the albums ( .amf files )
435	+ if ( $albumcount ) {
436	+ echo
437	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >' .
438	+ '<p><b>' .
439	+ sprintf( _n( 'There is %d albumdefinition in the depot', 'There are %d albumdefinitions in the depot', $albumcount, 'wp-photo-album-plus' ), $albumcount ) .
440	+ '</b></p>' .
441	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
442	+ '<thead>' .
443	+ '<tr>' .
444	+ '<td>' .
445	+ '<input' .
446	+ ' type="checkbox"' .
447	+ ' id="all-amf"' .
448	+ ' checked="checked"' .
449	+ ' onchange="checkAll( \'all-amf\', \'.wppa-amf\' )"' .
450	+ ' />' .
451	+ '<b>  ' .
452	+ __( 'Check/uncheck all', 'wp-photo-album-plus' ) .
453	+ '</b>' .
454	+ '</td>';
455	+ if ( $is_sub_depot ) {
456	+ echo
457	+ '<td>' .
458	+ '<input' .
459	+ ' type="checkbox"' .
460	+ ' id="del-after-a"' .
461	+ ' name="del-after-a"' .
462	+ ' checked="checked"' .
463	+ ' />' .
464	+ '<b>  ' .
465	+ __( 'Remove from depot after successful import, or if the album already exists.', 'wp-photo-album-plus' ) .
466	+ '</b>' .
467	+ '</td>';
468	+ }
469	+ echo
470	+ '</tr>' .
471	+ '</thead>' .
472	+ '</table>' .
473	+ '<table' .
474	+ ' class="form-table wppa-table widefat"' .
475	+ ' style="margin-top:0;"' .
476	+ ' >' .
477	+ '<tr>';
478	+ $ct = 0;
479	+ $idx = '0';
480	+ foreach ( $files as $file ) {
481	+ $ext = wppa_get_ext( $file );
482	+ if ( $ext == 'amf' ) {
483	+ echo
484	+ '<td>' .
485	+ '<input' .
486	+ ' type="checkbox"' .
487	+ ' id="file-' . $idx . '"' .
488	+ ' name="file-' . $idx . '"' .
489	+ ' class="wppa-amf"' .
490	+ ' checked="checked"' .
491	+ ' />' .
492	+ '  ' .
493	+ basename( $file ) . ' ' . stripslashes( wppa_get_meta_name( $file, '( ' ) ) .
494	+ '</td>';
495	+ if ( $ct == 3 ) {
496	+ echo( '</tr><tr>' );
497	+ $ct = 0;
498	+ }
499	+ else {
500	+ $ct++;
501	+ }
502	+ }
503	+ $idx++;
504	+ }
505	+ echo
506	+ '</tr>' .
507	+ '</table>' .
508	+ '</div>';
509	+ }
510	+
511	+ // Display the single photos
512	+ if ( $photocount ) {
513	+ echo
514	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
515	+
516	+ // Display the number of photos
517	+ '<p><b>';
518	+
519	+ // Local
520	+ if ( $source_type == 'local' ) {
521	+ if ( $is_ngg ) {
522	+ printf( _n( 'There is %d photo in the ngg gallery', 'There are %d photos in the ngg gallery', $photocount, 'wp-photo-album-plus' ), $photocount );
523	+ }
524	+ else {
525	+ printf( _n( 'There is %d photo in the depot', 'There are %d photos in the depot', $photocount, 'wp-photo-album-plus' ), $photocount );
526	+ }
527	+ }
528	+
529	+ // Remote
530	+ else {
531	+ printf( _n( 'There is %d possible photo found remote', 'There are %d possible photos found remote', $photocount, 'wp-photo-album-plus' ), $photocount );
532	+ }
533	+
534	+ // Tell if downsize on
535	+ if ( wppa_switch( 'resize_on_upload' ) ) {
536	+ echo ' ' . __( 'Photos will be downsized during import.', 'wp-photo-album-plus' );
537	+ }
538	+
539	+ echo
540	+ '</b></p>';
541	+
542	+ // The album selection
543	+ echo
544	+ '<p class="hideifupdate" >' .
545	+ __( 'Default album for import:', 'wp-photo-album-plus') .
546	+ '<select name="wppa-photo-album" id="wppa-photo-album" >' .
547	+ wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ),
548	+ 'selected' => get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' ),
549	+ 'addpleaseselect' => true,
550	+ 'checkowner' => true,
551	+ 'checkupload' => true
552	+ ) ) .
553	+ '</select>' .
554	+ __( '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') .
555	+ '</p>';
556	+
557	+ // Watermark
558	+ if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) \|\| current_user_can( 'wppa_settings' ) ) ) {
559	+ echo
560	+ '<p>' .
561	+ __( 'Apply watermark file:', 'wp-photo-album-plus') .
562	+ '<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
563	+ wppa_watermark_file_select() .
564	+ '</select>' .
565	+ __( 'Position:', 'wp-photo-album-plus') .
566	+ '<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
567	+ wppa_watermark_pos_select() .
568	+ '</select>' .
569	+ '</p>';
570	+ }
571	+
572	+ // Header of photo list
573	+ echo
574	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
575	+ '<thead>' .
576	+ '<tr>' .
577	+ '<td>' .
578	+ '<input' .
579	+ ' type="checkbox"' .
580	+ ' id="all-pho"' .
581	+ ( $is_sub_depot ? 'checked="checked"' : '' ) .
582	+ ' onchange="checkAll( \'all-pho\', \'.wppa-pho\' )"' .
583	+ ' />' .
584	+ '<b>' .
585	+ '  ' .
586	+ __( 'Check/uncheck all', 'wp-photo-album-plus') .
587	+ '</b>' .
588	+ '</td>';
589	+
590	+ // Depot specific switches
591	+ if ( $is_sub_depot ) {
592	+ echo
593	+ '<td>' .
594	+ '<input' .
595	+ ' type="checkbox"' .
596	+ ' id="del-after-p"' .
597	+ ' name="del-after-p"' .
598	+ ' checked="checked"' .
599	+ ' />' .
600	+ '<b>' .
601	+ '  ' .
602	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
603	+ '</b>' .
604	+ '</td>' .
605	+ '<td>' .
606	+ '<input' .
607	+ ' type="checkbox"' .
608	+ ' id="del-after-f"' .
609	+ ' name="del-after-f"' .
610	+ ' />' .
611	+ '<b>' .
612	+ '  ' .
613	+ __( 'Remove from depot after failed import.', 'wp-photo-album-plus' ) .
614	+ '</b>' .
615	+ '</td>';
616	+ }
617	+
618	+ // Nextgen import specific switches
619	+ if ( $is_ngg ) {
620	+ echo
621	+ '<td>' .
622	+ '<input' .
623	+ ' type="checkbox"' .
624	+ ' id="cre-album"' .
625	+ ' name="cre-album"' .
626	+ ' checked="checked"' .
627	+ ' value="' . esc_attr( basename( $source ) ) .'"' .
628	+ ' />' .
629	+ '<b>' .
630	+ '  ' .
631	+ __( 'Import into album', 'wp-photo-album-plus' ) . ' ' . basename( $source ) .
632	+ '</b>' .
633	+ '<small>' .
634	+ __( 'The album will be created if it does not exist', 'wp-photo-album-plus') .
635	+ '</small>' .
636	+ '</td>' .
637	+ '<td>' .
638	+ '<input' .
639	+ ' type="checkbox"' .
640	+ ' id="use-backup"' .
641	+ ' name="use-backup"' .
642	+ ' checked="checked"' .
643	+ ' />' .
644	+ '<b>' .
645	+ '  ' .
646	+ __( 'Use backup if available', 'wp-photo-album-plus') .
647	+ '</b>' .
648	+ '</td>';
649	+ }
650	+
651	+ // Update existing switch
652	+ echo
653	+ '<td>' .
654	+ '<input' .
655	+ ' type="checkbox"' .
656	+ ' id="wppa-update"' .
657	+ ' onchange="impUpd( this, \'#submit\' )"' .
658	+ ' name="wppa-update"' .
659	+ ' />' .
660	+ '<b>' .
661	+ '  ' .
662	+ __( 'Update existing photos', 'wp-photo-album-plus') .
663	+ '</b>' .
664	+ '</td>';
665	+
666	+ // Void dups switch
667	+ echo '<td>';
668	+ if ( wppa_switch( 'void_dups' ) ) {
669	+ echo
670	+ '<input' .
671	+ ' type="hidden"' .
672	+ ' id="wppa-nodups"' .
673	+ ' name="wppa-nodups"' .
674	+ ' value="true"' .
675	+ ' />';
676	+ }
677	+ else {
678	+ echo
679	+ '<input' .
680	+ ' type="checkbox"' .
681	+ ' id="wppa-nodups"' .
682	+ ' name="wppa-nodups"' .
683	+ ' checked="checked"' .
684	+ ' />' .
685	+ '<b>' .
686	+ '  ' .
687	+ __( 'Do not create duplicates', 'wp-photo-album-plus' ) .
688	+ '</b>';
689	+ }
690	+ echo '</td>';
691	+
692	+ // Import preview zoomable switch
693	+ if ( wppa_switch( 'import_preview' ) ) {
694	+ echo
695	+ '<td>' .
696	+ '<input' .
697	+ ' type="checkbox"' .
698	+ ' id="wppa-zoom"' .
699	+ ' onclick="wppa_setCookie(\'zoompreview\', this.checked, \'365\')"' .
700	+ ' />' .
701	+ '<b>' .
702	+ '  ' .
703	+ __( 'Zoom previews', 'wp-photo-album-plus' ) .
704	+ '</b>' .
705	+ '<script type="text/javascript">if ( wppa_getCookie(\'zoompreview\') == true ) { jQuery(\'#wppa-zoom\').attr(\'checked\', \'checked\') }</script>' .
706	+ '</td>';
707	+ }
708	+ echo
709	+ '</tr>' .
710	+ '</thead>' .
711	+ '</table>';
712	+
713	+ // Photo list
714	+ echo
715	+ '<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
716	+ '<tr>';
717	+ $ct = 0;
718	+ $idx = '0';
719	+ if ( is_array( $files ) ) foreach ( $files as $file ) {
720	+ $ext = wppa_get_ext( $file );
721	+ $meta = wppa_strip_ext( $file ).'.PMF';
722	+ if ( ! is_file( $meta ) ) {
723	+ $meta = wppa_strip_ext( $file ).'.pmf';
724	+ }
725	+ if ( ! is_file( $meta ) ) {
726	+ $meta = false;
727	+ }
728	+ if ( in_array( strtolower($ext), $wppa_supported_photo_extensions ) ) {
729	+ echo
730	+ '<td id="td-file-' . $idx . '" >' .
731	+ '<input' .
732	+ ' type="checkbox"' .
733	+ ' id="file-' . $idx . '"' .
734	+ ' name="file-' . $idx . '"' .
735	+ ' title="' . esc_attr( $file ) . '"' .
736	+ ' class="wppa-pho"' .
737	+ ( $is_sub_depot ? 'checked="checked"' : '' ) .
738	+ '/ >' .
739	+ '<span' .
740	+ ' id="name-file-' . $idx . '"' .
741	+ ' >' .
742	+ '  ';
743	+
744	+ if ( wppa( 'is_wppa_tree' ) ) {
745	+ $t = explode( 'uploads/wppa/', $file );
746	+ echo $t[1];
747	+ }
748	+ else {
749	+ echo( wppa_sanitize_file_name( basename( $file ) ) );
750	+ }
751	+
752	+ if ( $meta ) {
753	+ echo
754	+ ' ' .
755	+ stripslashes( wppa_get_meta_name( $meta, '( ' ) ) .
756	+ stripslashes( wppa_get_meta_album( $meta, '[' ) );
757	+ }
758	+ echo
759	+ '</span>';
760	+
761	+ if ( wppa_switch( 'import_preview' ) ) {
762	+ if ( wppa( 'is_remote' ) ) {
763	+ if ( strpos( $file, '//res.cloudinary.com/' ) !== false ) {
764	+ $img_url = dirname( $file ) . '/h_144/' . basename( $file );
765	+ }
766	+ else {
767	+ $img_url = $file;
768	+ }
769	+ }
770	+ else {
771	+ $img_url = str_replace( ABSPATH, home_url().'/', $file );
772	+ }
773	+ echo
774	+ '<img src="' . $img_url . '"' .
775	+ ' alt="N.A."' .
776	+ ' style="max-height:48px;"' .
777	+ ' onmouseover="if (jQuery(\'#wppa-zoom\').attr(\'checked\')) jQuery(this).css(\'max-height\', \'144px\')"' .
778	+ ' onmouseout="if (jQuery(\'#wppa-zoom\').attr(\'checked\')) jQuery(this).css(\'max-height\', \'48px\')"' .
779	+ ' />';
780	+ }
781	+
782	+ echo
783	+ '</td>';
784	+
785	+ if ( $ct == 3 ) {
786	+ echo( '</tr><tr>' );
787	+ $ct = 0;
788	+ }
789	+ else {
790	+ $ct++;
791	+ }
792	+ }
793	+ $idx++;
794	+ }
795	+ echo
796	+ '</tr>' .
797	+ '</table>' .
798	+ '</div>';
799	+ }
800	+
801	+ // Display the videos
802	+ if ( $videocount && wppa_switch( 'enable_video' ) ) {
803	+ echo
804	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
805	+
806	+ // Display available files
807	+ echo
808	+ '<p><b>' .
809	+ sprintf( _n( 'There is %d video in the depot', 'There are %d videos in the depot', $videocount, 'wp-photo-album-plus' ), $videocount ) .
810	+ '</b></p>';
811	+
812	+ // Album to import to
813	+ echo
814	+ '<p class="hideifupdate" >' .
815	+ __( 'Album to import to:', 'wp-photo-album-plus') .
816	+ '<select name="wppa-video-album" id="wppa-video-album">' .
817	+ wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ),
818	+ 'selected' => get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' ),
819	+ 'addpleaseselect' => true,
820	+ 'checkowner' => true,
821	+ 'checkupload' => true
822	+ ) ) .
823	+ '</select>' .
824	+ '</p>';
825	+
826	+ // Header of video list
827	+ echo
828	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
829	+ '<thead>' .
830	+ '<tr>' .
831	+ '<td>' .
832	+ '<input' .
833	+ ' type="checkbox"' .
834	+ ' id="all-video"' .
835	+ ' checked="checked"' .
836	+ ' onchange="checkAll( \'all-video\', \'.wppa-video\' )"' .
837	+ ' />' .
838	+ '<b>' .
839	+ '  ' .
840	+ __( 'Check/uncheck all', 'wp-photo-album-plus') .
841	+ '</b>' .
842	+ '</td>';
843	+ if ( $is_sub_depot ) {
844	+ echo
845	+ '<td>' .
846	+ '<input' .
847	+ ' type="checkbox"' .
848	+ ' id="del-after-v"' .
849	+ ' name="del-after-v"' .
850	+ ' checked="checked"' .
851	+ ' />' .
852	+ '<b>' .
853	+ '  ' .
854	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
855	+ '</b>' .
856	+ '</td>';
857	+ }
858	+ echo
859	+ '</tr>' .
860	+ '</thead>' .
861	+ '</table>';
862	+
863	+ // Video list
864	+ echo
865	+ '<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
866	+ '<tr>';
867	+ $ct = 0;
868	+ $idx = '0';
869	+ if ( is_array( $files ) ) foreach ( $files as $file ) {
870	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
871	+ if ( in_array( strtolower($ext), $wppa_supported_video_extensions ) ) {
872	+ echo
873	+ '<td>' .
874	+ '<input' .
875	+ ' type="checkbox"' .
876	+ ' id="file-' . $idx . '"' .
877	+ ' name="file-' . $idx . '"' .
878	+ ' title="' . $file . '"' .
879	+ ' class="wppa-video"' .
880	+ ' checked="checked"' .
881	+ ' />' .
882	+ '<span' .
883	+ ' id="name-file-' . $idx . '"' .
884	+ ' >' .
885	+ '  ' .
886	+ wppa_sanitize_file_name( basename( $file ) ) .
887	+ '</span>' .
888	+ '</td>';
889	+ if ( $ct == 3 ) {
890	+ echo( '</tr><tr>' );
891	+ $ct = 0;
892	+ }
893	+ else {
894	+ $ct++;
895	+ }
896	+ }
897	+ $idx++;
898	+ }
899	+ echo
900	+ '</tr>' .
901	+ '</table>' .
902	+ '</div>';
903	+ }
904	+
905	+ // Display the audios
906	+ if ( $audiocount && wppa_switch( 'enable_audio' ) ) {
907	+ echo
908	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
909	+
910	+ // Display available files
911	+ echo
912	+ '<p><b>' .
913	+ sprintf( _n( 'There is %d audio in the depot', 'There are %d audios in the depot', $audiocount, 'wp-photo-album-plus' ), $audiocount ) .
914	+ '</b></p>';
915	+
916	+ // Album to import to
917	+ echo
918	+ '<p class="hideifupdate" >' .
919	+ __( 'Album to import to:', 'wp-photo-album-plus') .
920	+ '<select name="wppa-audio-album" id="wppa-audio-album" >' .
921	+ wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ),
922	+ 'selected' => get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' ),
923	+ 'addpleaseselect' => true,
924	+ 'checkowner' => true,
925	+ 'checkupload' => true
926	+ ) ) .
927	+ '</select>' .
928	+ '</p>';
929	+
930	+ // Header of audio list
931	+ echo
932	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
933	+ '<thead>' .
934	+ '<tr>' .
935	+ '<td>' .
936	+ '<input' .
937	+ ' type="checkbox"' .
938	+ ' id="all-audio"' .
939	+ ' checked="checked"' .
940	+ ' onchange="checkAll( \'all-audio\', \'.wppa-audio\' )"' .
941	+ ' />' .
942	+ '<b>' .
943	+ '  ' .
944	+ __( 'Check/uncheck all', 'wp-photo-album-plus') .
945	+ '</b>' .
946	+ '</td>';
947	+
948	+ // The remove box
949	+ if ( $is_sub_depot ) {
950	+ echo
951	+ '<td>' .
952	+ '<input' .
953	+ ' type="checkbox"' .
954	+ ' id="del-after-u"' .
955	+ ' name="del-after-u"' .
956	+ ' checked="checked"' .
957	+ ' />' .
958	+ '<b>' .
959	+ '  ' .
960	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
961	+ '</b>' .
962	+ '</td>';
963	+ }
964	+ echo
965	+ '</tr>' .
966	+ '</thead>' .
967	+ '</table>';
968	+
969	+ // Audio list
970	+ echo
971	+ '<table class="form-table wppa-table widefat" style="margin-top:0;" >' .
972	+ '<tr>';
973	+ $ct = 0;
974	+ $idx = '0';
975	+ if ( is_array( $files ) ) foreach ( $files as $file ) {
976	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
977	+ if ( in_array( strtolower($ext), $wppa_supported_audio_extensions ) ) {
978	+ echo
979	+ '<td>' .
980	+ '<input' .
981	+ ' type="checkbox"' .
982	+ ' id="file-' . $idx . '"' .
983	+ ' name="file-' . $idx . '"' .
984	+ ' title="' . $file . '"' .
985	+ ' class="wppa-audio"' .
986	+ ' checked="checked"' .
987	+ ' />' .
988	+ '<span' .
989	+ ' id="name-file-' . $idx . '"' .
990	+ ' >' .
991	+ '  ' .
992	+ wppa_sanitize_file_name( basename( $file ) ) .
993	+ '</span>' .
994	+ '</td>';
995	+ if ( $ct == 3 ) {
996	+ echo '</tr><tr>';
997	+ $ct = 0;
998	+ }
999	+ else {
1000	+ $ct++;
1001	+ }
1002	+ }
1003	+ $idx++;
1004	+ }
1005	+ echo
1006	+ '</tr>' .
1007	+ '</table>' .
1008	+ '</div>';
1009	+ }
1010	+
1011	+ // Display the directories to be imported as albums. Do this in the depot only!!
1012	+ if ( $is_depot && $dircount ) {
1013	+ echo
1014	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
1015	+
1016	+ // Display number of dirs
1017	+ echo
1018	+ '<p><b>' .
1019	+ sprintf( _n( 'There is %d albumdirectory in the depot', 'There are %d albumdirectories in the depot', $dircount, 'wp-photo-album-plus' ), $dircount ) .
1020	+ '</b></p>';
1021	+
1022	+ // Header of dirlist
1023	+ echo
1024	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
1025	+ '<thead>' .
1026	+ '<tr>' .
1027	+ '<td>' .
1028	+ '<input' .
1029	+ ' type="checkbox"' .
1030	+ ' id="all-dir"' .
1031	+ ' checked="checked"' .
1032	+ ' onchange="checkAll( \'all-dir\', \'.wppa-dir\' )"' .
1033	+ ' />' .
1034	+ '<b>' .
1035	+ '  ' .
1036	+ __( 'Check/uncheck all', 'wp-photo-album-plus') .
1037	+ '</b>' .
1038	+ '</td>' .
1039	+ '</tr>' .
1040	+ '</thead>' .
1041	+ '</table>';
1042	+
1043	+ // Dirlist
1044	+ echo
1045	+ '<table class="form-table wppa-table widefat" style="margin-top:0;" >';
1046	+ $ct = 0;
1047	+ $idx = '0';
1048	+ foreach( $files as $dir ) {
1049	+ if ( basename( $dir ) == '.' ) {}
1050	+ elseif ( basename( $dir ) == '..' ) {}
1051	+ elseif ( is_dir( $dir ) ) {
1052	+ echo
1053	+ '<tr>' .
1054	+ '<td>' .
1055	+ '<input' .
1056	+ ' type="checkbox"' .
1057	+ ' id="file-' . $idx . '"' .
1058	+ ' name="file-' . $idx .'"' .
1059	+ ' class= "wppa-dir"' .
1060	+ ' checked="checked"' .
1061	+ ' />' .
1062	+ '  ' .
1063	+ '<b>' .
1064	+ wppa_sanitize_file_name( basename( $dir ) ) .
1065	+ '</b>';
1066	+ $subfiles = glob( $dir.'/*' );
1067	+ $subdircount = '0';
1068	+ if ( $subfiles ) {
1069	+ foreach ( $subfiles as $subfile ) {
1070	+ if ( is_dir( $subfile ) && basename( $subfile ) != '.' && basename( $subfile ) != '..' ) {
1071	+ $subdircount++;
1072	+ }
1073	+ }
1074	+ }
1075	+ $sfcount = empty( $subfiles ) ? '0' : wppa_get_photocount( $subfiles );
1076	+ echo ' ' .
1077	+ sprintf( _n( 'Contains %d file', 'Contains %d files', $sfcount, 'wp-photo-album-plus' ), $sfcount );
1078	+ if ( $subdircount ) {
1079	+ echo ' ' .
1080	+ sprintf( _n( 'and %d subdirectory', 'and %d subdirectories', $subdircount, 'wp-photo-album-plus' ), $subdircount );
1081	+ }
1082	+ '</td>' .
1083	+ '</tr>';
1084	+ }
1085	+ $idx++;
1086	+ }
1087	+ echo
1088	+ '</table>' .
1089	+ '</div>';
1090	+ }
1091	+
1092	+ // Display the csv files
1093	+ if ( $is_depot && $csvcount ) {
1094	+ echo
1095	+ '<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >';
1096	+
1097	+ // Display number of files
1098	+ echo
1099	+ '<p><b>' .
1100	+ sprintf( _n( 'There is %d .csv file in the depot', 'There are %d .csv files in the depot', $csvcount, 'wp-photo-album-plus' ), $csvcount ) .
1101	+ '</b></p>';
1102	+
1103	+ // Header of .csv file list
1104	+ echo
1105	+ '<table class="form-table wppa-table widefat" style="margin-bottom:0;" >' .
1106	+ '<thead>' .
1107	+ '<tr>' .
1108	+ '<td>' .
1109	+ '<input' .
1110	+ ' type="checkbox"' .
1111	+ ' id="all-csv"' .
1112	+ ' checked="checked"' .
1113	+ ' onchange="checkAll( \'all-csv\', \'.wppa-csv\' )"' .
1114	+ ' />' .
1115	+ '<b>' .
1116	+ '  ' .
1117	+ __( 'Check/uncheck all', 'wp-photo-album-plus') .
1118	+ '</b>' .
1119	+ '</td>' .
1120	+ '<td>' .
1121	+ '<input' .
1122	+ ' type="checkbox"' .
1123	+ ' id="del-after-c"' .
1124	+ ' name="del-after-c"' .
1125	+ ' checked="checked"' .
1126	+ ' disabled="disabled"' .
1127	+ ' />' .
1128	+ '<b>' .
1129	+ '  ' .
1130	+ __( 'Remove from depot after successful import.', 'wp-photo-album-plus' ) .
1131	+ '</b>' .
1132	+ '</td>' .
1133	+ '</tr>' .
1134	+ '</thead>' .
1135	+ '</table>';
1136	+
1137	+ // CSV file list
1138	+ echo
1139	+ '<table class="form-table wppa-table widefat" style="margin-top:0;" >';
1140	+ $ct = 0;
1141	+ $idx = '0';
1142	+ foreach( $files as $csv ) {
1143	+ if ( is_file( $csv ) && strtolower( wppa_get_ext( $csv ) ) == 'csv' ) {
1144	+ echo
1145	+ '<tr>' .
1146	+ '<td>' .
1147	+ '<input' .
1148	+ ' type="checkbox"' .
1149	+ ' id="file-' . $idx . '"' .
1150	+ ' name="file-' . $idx . '"' .
1151	+ ' class="wppa-csv"' .
1152	+ ' checked="checked"' .
1153	+ ' />' .
1154	+ '  ' .
1155	+ '<b>' .
1156	+ wppa_sanitize_file_name( basename( $csv ) ) .
1157	+ ' (' . sprintf( '%5.1f', filesize( $csv ) / 1024 ) . ' kb)' .
1158	+ '</b>' .
1159	+ '</td>' .
1160	+ '</tr>';
1161	+ }
1162	+ $idx++;
1163	+ }
1164	+ echo
1165	+ '</table>' .
1166	+ '</div>';
1167	+ }
1168	+
1169	+ // The submit button
1170	+ ?>
1171	+ <p>
1172	+ <script type="text/javascript">
1173	+ function wppaVfyAlbum() {
1174	+ var csvs = jQuery( '.wppa-csv' );
1175	+ if ( jQuery( '#wppa-update' ).attr( 'checked' ) != 'checked' ) {
1176	+ if ( ! parseInt( jQuery( '#wppa-photo-album' ).attr( 'value' ) ) &&
1177	+ ! parseInt( jQuery( '#wppa-video-album' ).attr( 'value' ) ) &&
1178	+ ! parseInt( jQuery( '#wppa-audio-album' ).attr( 'value' ) ) &&
1179	+ csvs.length == 0
1180	+ ) {
1181	+ alert( 'Please select an album first' );
1182	+ return false;
1183	+ }
1184	+ }
1185	+ return true;
1186	+ }
1187	+ function wppaCheckInputVars() {
1188	+ var checks = jQuery( ':checked' );
1189	+ var nChecks = checks.length;
1190	+ var nMax = <?php echo ini_get( 'max_input_vars' ) ?>;
1191	+ if ( nMax == 0 ) nMax = 100;
1192	+ if ( nChecks > nMax ) {
1193	+ alert ( 'There are '+nChecks+' boxes checked or selected, that is more than the maximum allowed number of '+nMax );
1194	+ return false;
1195	+ }
1196	+ var dirs = jQuery( '.wppa-dir' );
1197	+ var nDirsChecked = 0;
1198	+ if ( dirs.length > 0 ) {
1199	+ var i = 0;
1200	+ while ( i < dirs.length ) {
1201	+ if ( jQuery( dirs[i] ).attr( 'checked' ) == 'checked' ) {
1202	+ nDirsChecked++;
1203	+ }
1204	+ i++;
1205	+ }
1206	+ }
1207	+ var zips = jQuery( '.wppa-zip' );
1208	+ var nZipsChecked = 0;
1209	+ if ( zips.length > 0 ) {
1210	+ var i = 0;
1211	+ while ( i < zips.length ) {
1212	+ if ( jQuery( zips[i] ).attr( 'checked' ) == 'checked' ) {
1213	+ nZipsChecked++;
1214	+ }
1215	+ i++;
1216	+ }
1217	+ }
1218	+ // If no dirs to import checked, there must be an album selected
1219	+ if ( 0 == nDirsChecked && 0 == nZipsChecked && ! wppaVfyAlbum() ) return false;
1220	+ return true;
1221	+ }
1222	+ </script>
1223	+ <input type="submit" onclick="return wppaCheckInputVars()" class="button-primary" id="submit" name="wppa-import-submit" value="<?php _e( 'Import', 'wp-photo-album-plus' ); ?>" />
1224	+ <script type="text/javascript" >
1225	+ var wppaImportRuns = false;
1226	+ function wppaDoAjaxImport() {
1227	+ wppaImportRuns = true;
1228	+ var data = '';
1229	+ data += 'wppa-update-check='+jQuery( '#wppa-update-check' ).attr( 'value' );
1230	+ data += '&wppa-photo-album='+jQuery( '#wppa-photo-album' ).attr( 'value' );
1231	+ data += '&wppa-video-album='+jQuery( '#wppa-video-album' ).attr( 'value' );
1232	+ data += '&wppa-audio-album='+jQuery( '#wppa-audio-album' ).attr( 'value' );
1233	+ data += '&wppa-watermark-file='+jQuery( '#wppa-watermark-file' ).attr( 'value' );
1234	+ data += '&wppa-watermark-pos='+jQuery( '#wppa-watermark-pos' ).attr( 'value' );
1235	+ if ( jQuery( '#cre-album' ).attr( 'checked' ) ) data += '&cre-album='+jQuery( '#cre-album' ).attr( 'value' );
1236	+ if ( jQuery( '#use-backup' ).attr( 'checked' ) ) data += '&use-backup=on'; //+jQuery( '#use-backup' ).attr( 'value' );
1237	+ if ( jQuery( '#wppa-update' ).attr( 'checked' ) ) data += '&wppa-update=on'; //+jQuery( '#wppa-update' ).attr( 'value' );
1238	+ if ( jQuery( '#wppa-nodups' ).attr( 'checked' ) ) data += '&wppa-nodups=on'; //+jQuery( '#wppa-nudups' ).attr( 'value' );
1239	+ if ( jQuery( '#del-after-p' ).attr( 'checked' ) ) data += '&del-after-p=on';
1240	+ if ( jQuery( '#del-after-f' ).attr( 'checked' ) ) data += '&del-after-f=on';
1241	+ if ( jQuery( '#del-after-v' ).attr( 'checked' ) ) data += '&del-after-v=on';
1242	+ if ( jQuery( '#del-after-u' ).attr( 'checked' ) ) data += '&del-after-u=on';
1243	+ data += '&wppa-import-submit=ajax';
1244	+
1245	+ var files = jQuery( ':checked' );
1246	+ var found = false;
1247	+ var i=0;
1248	+ var elm;
1249	+ var fulldata;
1250	+ for ( i=0; i<files.length; i++ ) {
1251	+ found = false; // assume done
1252	+ elm = files[i];
1253	+ // Is it a file checkbox?
1254	+ var temp = elm.id.split( '-' );
1255	+ if ( temp[0] != 'file' ) continue; // no
1256	+ fulldata = data+'&import-ajax-file='+elm.title;
1257	+ found = true;
1258	+ break;
1259	+ }
1260	+ // alert( data );
1261	+ if ( ! found ) {
1262	+ wppaStopAjaxImport();
1263	+ return; // nothing left
1264	+ }
1265	+ // found one, do it
1266	+ var oldhtml=jQuery( '#name-'+elm.id ).html();
1267	+ var xmlhttp = wppaGetXmlHttp();
1268	+ xmlhttp.onreadystatechange = function() {
1269	+ if ( xmlhttp.readyState == 4 ) {
1270	+ if ( xmlhttp.status!=404 ) {
1271	+ var resp = xmlhttp.responseText;
1272	+ //
1273	+ if ( resp.length == 0 ) {
1274	+ jQuery( '#name-'+elm.id ).html('<span style="color:red" >Timeout</span>' );
1275	+ wppaStopAjaxImport();
1276	+ return;
1277	+ }
1278	+ //
1279	+ if ( resp.indexOf( 'Server' ) != -1 && resp.indexOf( 'Error' ) != -1 ) {
1280	+ resp = '<span style="color:red" >Server error</span>';
1281	+ }
1282	+ jQuery( '#name-'+elm.id ).html( '  <b>'+resp+'</b>' );
1283	+ elm.checked = '';
1284	+ if ( jQuery( '#del-after-p' ).attr( 'checked' ) \|\|
1285	+ jQuery( '#del-after-f' ).attr( 'checked' ) ) {
1286	+ elm.disabled = 'disabled';
1287	+ elm.title = '';
1288	+ }
1289	+ if ( wppaImportRuns ) {
1290	+ setTimeout( 'wppaDoAjaxImport()', 100 );
1291	+ }
1292	+ }
1293	+ else {
1294	+ jQuery( '#name-'+elm.id ).html( '  <b>Not found</b>' );
1295	+ }
1296	+ }
1297	+ }
1298	+ var url = wppaAjaxUrl+'?action=wppa&wppa-action=import';
1299	+ xmlhttp.open( 'POST',url,true );
1300	+ xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
1301	+ xmlhttp.send( fulldata );
1302	+ jQuery( '#name-'+elm.id ).html( '  <b style="color:blue" >' + '<?php _e( 'Working...', 'wp-photo-album-plus' ) ?>' + '</b>' );
1303	+ jQuery( '#wppa-start-ajax' ).css( 'display', 'none' );
1304	+ jQuery( '#wppa-stop-ajax' ).css( 'display', 'inline' );
1305	+ }
1306	+ function wppaStopAjaxImport() {
1307	+ wppaImportRuns = false;
1308	+ jQuery( '#wppa-start-ajax' ).css( 'display', 'inline' );
1309	+ jQuery( '#wppa-stop-ajax' ).css( 'display', 'none' );
1310	+ }
1311	+ </script>
1312	+ <?php if ( ( $photocount \|\| $videocount \|\| $audiocount ) && ! $albumcount && ! $dircount && ! $zipcount ) { ?>
1313	+ <input id="wppa-start-ajax" type="button" onclick="if ( wppaVfyAlbum() ) { wppaDoAjaxImport() }" class="button-secundary" value="<?php esc_attr( _e( 'Start Ajax Import', 'wp-photo-album-plus' ) ) ?>" />
1314	+ <input id="wppa-stop-ajax" style="display:none;" type="button" onclick="wppaStopAjaxImport()" class="button-secundary" value="<?php esc_attr( _e( 'Stop Ajax Import', 'wp-photo-album-plus' ) ) ?>" />
1315	+ <?php } ?>
1316	+ </p>
1317	+ </form>
1318	+
1319	+ <?php }
1320	+ else {
1321	+ if ( $source_type == 'local' ) {
1322	+ wppa_ok_message( __( 'There are no importable files found in directory:', 'wp-photo-album-plus').' '.$source );
1323	+ }
1324	+ else {
1325	+ wppa_ok_message( __( 'There are no photos found or left to process at url:', 'wp-photo-album-plus').' '.$source_url );
1326	+ }
1327	+ }
1328	+ echo '<br /><b>';
1329	+ _e( 'You can import the following file types:', 'wp-photo-album-plus' );
1330	+ echo '</b><br />';
1331	+ if ( PHP_VERSION_ID >= 50207 ) {
1332	+ echo '<br />';
1333	+ _e( 'Compressed file types: .zip', 'wp-photo-album-plus' );
1334	+ }
1335	+ if ( true ) {
1336	+ echo '<br />';
1337	+ _e( 'Photo file types:', 'wp-photo-album-plus' );
1338	+ foreach ( $wppa_supported_photo_extensions as $ext ) {
1339	+ echo ' .'.$ext;
1340	+ }
1341	+ }
1342	+ if ( wppa_switch( 'enable_video' ) ) {
1343	+ echo '<br />';
1344	+ _e( 'Video file types:', 'wp-photo-album-plus' );
1345	+ foreach ( $wppa_supported_video_extensions as $ext ) {
1346	+ echo ' .'.$ext;
1347	+ }
1348	+ }
1349	+ if ( wppa_switch( 'enable_audio' ) ) {
1350	+ echo '<br />';
1351	+ _e( 'Audio file types:', 'wp-photo-album-plus' );
1352	+ foreach ( $wppa_supported_audio_extensions as $ext ) {
1353	+ echo ' .'.$ext;
1354	+ }
1355	+ }
1356	+ echo '<br />';
1357	+ _e( 'WPPA+ file types: .amf .pmf', 'wp-photo-album-plus' );
1358	+ echo '<br />';
1359	+ _e( 'Directories with optional subdirs containig photos', 'wp-photo-album-plus' );
1360	+ echo '<br />';
1361	+ _e( 'Custom data files of type .csv', 'wp-photo-album-plus' );
1362	+ echo '<br /><br />';
1363	+ _e( 'Your depot directory is:', 'wp-photo-album-plus' );
1364	+ echo '<b> .../' . WPPA_DEPOT . '/</b>';
1365	+
1366	+ if ( wppa( 'continue' ) ) {
1367	+ wppa_warning_message( __( 'Trying to continue...', 'wp-photo-album-plus') );
1368	+ echo '<script type="text/javascript">document.location=\''.get_admin_url().'admin.php?page=wppa_import_photos&continue&nonce='.wp_create_nonce( 'dirimport' ).'\';</script>';
1369	+ }
1370	+
1371	+ echo
1372	+ '</div><!-- .wrap -->';
1373	+ }
1374	+
1375	+ // get array of files to import
1376	+ function wppa_get_import_files() {
1377	+
1378	+ // Init
1379	+ $user = wppa_get_user();
1380	+ $source_type = get_option( 'wppa_import_source_type_'.$user, 'local' );
1381	+ $files = array();
1382	+
1383	+ // Ajax? one file
1384	+ if ( isset ( $_POST['import-ajax-file'] ) ) {
1385	+ $files = array( $_POST['import-ajax-file'] );
1386	+ }
1387	+
1388	+ // Dispatch on source type local/remote
1389	+ elseif ( $source_type == 'local' ) {
1390	+ $source = get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
1391	+ $source_path = $source; // Filesystem
1392	+ $files = glob( $source_path . '/*' );
1393	+ }
1394	+ else { // remote
1395	+ $max_tries = get_option( 'wppa_import_remote_max_'.$user, '10' );
1396	+ $setting = get_option( 'wppa_import_source_url_'.$user, 'http://' );
1397	+ $pattern = '/src=".*?"/';
1398	+
1399	+ // Is it a photofile in a wppa tree filestructure?
1400	+ $old_setting = $setting;
1401	+
1402	+ // assume not
1403	+ if ( is_array( @ getimagesize( $setting ) ) ) {
1404	+ wppa( 'is_wppa_tree', false );
1405	+ }
1406	+
1407	+ // though?
1408	+ else {
1409	+ $setting = wppa_expand_tree_path( $old_setting );
1410	+ if ( is_array( @ getimagesize( $setting ) ) ) {
1411	+ wppa( 'is_wppa_tree', true );
1412	+ }
1413	+ }
1414	+
1415	+ // Is it a photofile?
1416	+ if ( is_array( @ getimagesize( $setting ) ) ) { // image uri
1417	+ $files = array( $setting );
1418	+ $pid = wppa_strip_ext( basename( $old_setting ) );
1419	+ if ( is_numeric( $pid ) ) {
1420	+ $tries = 1;
1421	+ $before = substr( $old_setting, 0, strpos( $old_setting, $pid) );
1422	+ while ( $tries < $max_tries ) {
1423	+ $tries++;
1424	+ $pid++;
1425	+ if ( wppa( 'is_wppa_tree' ) ) {
1426	+ $files[] = $before . wppa_expand_id($pid) . '.jpg';
1427	+ }
1428	+ else {
1429	+ $files[] = $before . $pid . '.jpg';
1430	+ }
1431	+ }
1432	+ }
1433	+ }
1434	+
1435	+ // is it a page url
1436	+ else {
1437	+ $files = get_option( 'wppa_import_source_url_found_'.$user, false );
1438	+ if ( $files === false ) {
1439	+
1440	+ // Init
1441	+ $files = array();
1442	+
1443	+ // Get page content
1444	+ $curl = curl_init();
1445	+ curl_setopt( $curl, CURLOPT_RETURNTRANSFER, 1 );
1446	+ curl_setopt( $curl, CURLOPT_URL, $setting );
1447	+ $contents = curl_exec( $curl );
1448	+ curl_close( $curl );
1449	+
1450	+ // Process result
1451	+ if ( $contents ) {
1452	+
1453	+ // Preprocess
1454	+ $contents = str_replace( '\'', '"', $contents );
1455	+
1456	+ // Find matches
1457	+ preg_match_all( $pattern, $contents, $matches, PREG_PATTERN_ORDER );
1458	+ if ( is_array( $matches[0] ) ) {
1459	+
1460	+ // Sort
1461	+ sort( $matches[0] );
1462	+
1463	+ // Copy to $files, skipping dups
1464	+ $val = '';
1465	+ $count = 0;
1466	+ $sfxs = array( 'jpg', 'jpeg', 'gif', 'png', 'JPG', 'JPEG', 'GIF', 'PNG' );
1467	+ foreach ( array_keys( $matches[0] ) as $idx ) {
1468	+ if ( $matches[0][$idx] != $val ) {
1469	+ $val = $matches[0][$idx];
1470	+ // Post process found item
1471	+ $match = substr( $matches[0][$idx], 5 );
1472	+ $matchpos = strpos( $contents, $match );
1473	+ $match = trim( $match, '"' );
1474	+ if ( strpos( $match, '?' ) ) $match = substr( $match, 0, strpos( $match, '?' ) );
1475	+ $match = str_replace( '/uploads/wppa/thumbs/', '/uploads/wppa/', $match );
1476	+ $sfx = wppa_get_ext( $match );
1477	+ if ( in_array( $sfx, $sfxs ) ) {
1478	+ // Save it
1479	+ $count++;
1480	+ if ( $count <= $max_tries ) {
1481	+ $files[] = $match;
1482	+ }
1483	+ }
1484	+ }
1485	+ }
1486	+ }
1487	+ }
1488	+ update_option( 'wppa_import_source_url_found_'.$user, $files );
1489	+ }
1490	+ }
1491	+ }
1492	+
1493	+ // Remove non originals
1494	+ if ( is_array( $files ) ) foreach ( array_keys( $files ) as $key ) {
1495	+ if ( ! wppa_is_orig( $files[$key] ) ) {
1496	+ unset ( $files[$key] );
1497	+ }
1498	+ }
1499	+
1500	+ // Sort to keep synchronicity when doing ajax import
1501	+ if ( is_array( $files ) ) sort( $files );
1502	+
1503	+ // Done, return result
1504	+ return $files;
1505	+ }
1506	+
1507	+
1508	+
1509	+ // Send emails after backend upload
1510	+ function wppa_backend_upload_mail( $id, $alb, $name ) {
1511	+
1512	+ $owner = wppa_get_user();
1513	+ if ( $owner == 'admin' ) return; // Admin does not send mails to himself
1514	+
1515	+ if ( wppa_switch( 'upload_backend_notify' ) ) {
1516	+ $to = get_bloginfo( 'admin_email' );
1517	+ $subj = sprintf( __( 'New photo uploaded: %s', 'wp-photo-album-plus'), wppa_sanitize_file_name( $name ) );
1518	+ $cont['0'] = sprintf( __( 'User %1$s uploaded photo %2$s into album %3$s', 'wp-photo-album-plus'), $owner, $id, wppa_get_album_name( $alb ) );
1519	+ if ( wppa_switch( 'upload_moderate' ) && !current_user_can( 'wppa_admin' ) ) {
1520	+ $cont['1'] = __( 'This upload requires moderation', 'wp-photo-album-plus' );
1521	+ $cont['2'] = '<a href="'.get_admin_url().'admin.php?page=wppa_admin_menu&tab=pmod&photo='.$id.'" >'.__( 'Moderate manage photo', 'wp-photo-album-plus').'</a>';
1522	+ }
1523	+ else {
1524	+ $cont['1'] = __( 'Details:', 'wp-photo-album-plus' );
1525	+ $cont['1'] .= ' <a href="'.get_admin_url().'admin.php?page=wppa_admin_menu&tab=pmod&photo='.$id.'" >'.__( 'Manage photo', 'wp-photo-album-plus').'</a>';
1526	+ }
1527	+ wppa_send_mail( $to, $subj, $cont, $id );
1528	+ }
1529	+ }
1530	+
1531	+ // Do the import photos
1532	+ function wppa_import_photos( $delp = false, $dela = false, $delz = false, $delv = false, $delu = false, $delc = false, $delf = false ) {
1533	+ global $wpdb;
1534	+ global $warning_given;
1535	+ global $wppa_supported_photo_extensions;
1536	+ global $wppa_supported_video_extensions;
1537	+ global $wppa_supported_audio_extensions;
1538	+
1539	+ $warning_given = false;
1540	+
1541	+ // Get this users current source directory setting
1542	+ $user = wppa_get_user();
1543	+ $source_type = get_option( 'wppa_import_source_type_'.$user, 'local' );
1544	+ if ( $source_type == 'remote' ) wppa( 'is_remote', true );
1545	+ $source = get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
1546	+
1547	+ $depot = WPPA_ABSPATH . $source; // Filesystem
1548	+ $depoturl = get_bloginfo( 'wpurl' ).'/'.$source; // url
1549	+
1550	+ // See what's in there
1551	+ $files = wppa_get_import_files();
1552	+
1553	+ // First extract zips if our php version is ok
1554	+ $idx='0';
1555	+ $zcount = 0;
1556	+ if ( PHP_VERSION_ID >= 50207 ) {
1557	+ foreach( $files as $zipfile ) {
1558	+ if ( isset( $_POST['file-'.$idx] ) ) {
1559	+ $ext = strtolower( substr( strrchr( $zipfile, "." ), 1 ) );
1560	+
1561	+ if ( $ext == 'zip' ) {
1562	+ $err = wppa_extract( $zipfile, $delz );
1563	+ if ( $err == '0' ) $zcount++;
1564	+ } // if ext = zip
1565	+ } // if isset
1566	+ $idx++;
1567	+ } // foreach
1568	+ }
1569	+
1570	+ // Now see if albums must be created
1571	+ $idx='0';
1572	+ $acount = 0;
1573	+ foreach( $files as $album ) {
1574	+ if ( isset( $_POST['file-'.$idx] ) ) {
1575	+ $ext = strtolower( substr( strrchr( $album, "." ), 1 ) );
1576	+ if ( $ext == 'amf' ) {
1577	+ $name = '';
1578	+ $desc = '';
1579	+ $aord = '0';
1580	+ $parent = '0';
1581	+ $porder = '0';
1582	+ $owner = '';
1583	+ $handle = fopen( $album, "r" );
1584	+ if ( $handle ) {
1585	+ $buffer = fgets( $handle, 4096 );
1586	+ while ( !feof( $handle ) ) {
1587	+ $tag = substr( $buffer, 0, 5 );
1588	+ $len = strlen( $buffer ) - 6; // substract 5 for label and one for eol
1589	+ $data = substr( $buffer, 5, $len );
1590	+ switch( $tag ) {
1591	+ case 'name=':
1592	+ $name = $data;
1593	+ break;
1594	+ case 'desc=':
1595	+ $desc = wppa_txt_to_nl( $data );
1596	+ break;
1597	+ case 'aord=':
1598	+ if ( is_numeric( $data ) ) $aord = $data;
1599	+ break;
1600	+ case 'prnt=':
1601	+ if ( $data == __( '--- none ---', 'wp-photo-album-plus') ) $parent = '0';
1602	+ elseif ( $data == __( '--- separate ---', 'wp-photo-album-plus') ) $parent = '-1';
1603	+ else {
1604	+ $prnt = wppa_get_album_id( $data );
1605	+ if ( $prnt != '' ) {
1606	+ $parent = $prnt;
1607	+ }
1608	+ else {
1609	+ $parent = '0';
1610	+ wppa_warning_message( __( 'Unknown parent album:', 'wp-photo-album-plus').' '.$data.' '.__( '--- none --- used.', 'wp-photo-album-plus') );
1611	+ }
1612	+ }
1613	+ break;
1614	+ case 'pord=':
1615	+ if ( is_numeric( $data ) ) $porder = $data;
1616	+ break;
1617	+ case 'ownr=':
1618	+ $owner = $data;
1619	+ break;
1620	+ }
1621	+ $buffer = fgets( $handle, 4096 );
1622	+ } // while !foef
1623	+ fclose( $handle );
1624	+ if ( wppa_get_album_id( $name ) != '' ) {
1625	+ wppa_warning_message( 'Album already exists '.stripslashes( $name ) );
1626	+ if ( $dela ) unlink( $album );
1627	+ }
1628	+ else {
1629	+ $id = basename( $album );
1630	+ $id = substr( $id, 0, strpos( $id, '.' ) );
1631	+ $id = wppa_create_album_entry( array ( 'id' => $id,
1632	+ 'name' => stripslashes( $name ),
1633	+ 'description' => stripslashes( $desc ),
1634	+ 'a_order' => $aord,
1635	+ 'a_parent' => $parent,
1636	+ 'p_order_by' => $porder,
1637	+ 'owner' => $owner
1638	+ ) );
1639	+
1640	+ if ( $id === false ) {
1641	+ wppa_error_message( __( 'Could not create album.', 'wp-photo-album-plus') );
1642	+ }
1643	+ else {
1644	+ //$id = wppa_get_album_id( $name );
1645	+ wppa_set_last_album( $id );
1646	+ wppa_index_add( 'album', $id );
1647	+ wppa_ok_message( __( 'Album #', 'wp-photo-album-plus') . ' ' . $id . ': '.stripslashes( $name ).' ' . __( 'Added.', 'wp-photo-album-plus') );
1648	+ if ( $dela ) unlink( $album );
1649	+ $acount++;
1650	+ wppa_clear_cache();
1651	+ wppa_flush_treecounts( $id );
1652	+ } // album added
1653	+ } // album did not exist
1654	+ } // if handle ( file open )
1655	+ } // if its an album
1656	+ } // if isset
1657	+ $idx++;
1658	+ } // foreach file
1659	+
1660	+ // Now the photos
1661	+ $idx = '0';
1662	+ $pcount = '0';
1663	+ $totpcount = '0';
1664	+
1665	+ // find album id
1666	+ if ( isset( $_POST['cre-album'] ) ) { // use album ngg gallery name for ngg conversion
1667	+ $album = wppa_get_album_id( strip_tags( $_POST['cre-album'] ) );
1668	+ if ( ! $album ) { // the album does not exist yet, create it
1669	+ $name = strip_tags( $_POST['cre-album'] );
1670	+ $desc = sprintf( __( 'This album has been converted from ngg gallery %s', 'wp-photo-album-plus'), $name );
1671	+ $uplim = '0/0'; // Unlimited not to destroy the conversion process!!
1672	+ $album = wppa_create_album_entry( array ( 'name' => $name,
1673	+ 'description' => $desc,
1674	+ 'upload_limit' => $uplim
1675	+ ) );
1676	+ if ( $album === false ) {
1677	+ wppa_error_message( __( 'Could not create album.', 'wp-photo-album-plus').'<br/>Query = '.$query );
1678	+ wp_die( 'Sorry, cannot continue' );
1679	+ }
1680	+ }
1681	+ }
1682	+ elseif ( isset( $_POST['wppa-photo-album'] ) ) {
1683	+ $album = $_POST['wppa-photo-album'];
1684	+ }
1685	+ else $album = '0';
1686	+
1687	+ // Report starting process
1688	+ wppa_ok_message( __( 'Processing files, please wait...', 'wp-photo-album-plus').' '.__( 'If the line of dots stops growing or your browser reports Ready, your server has given up. In that case: try again', 'wp-photo-album-plus').' <a href="'.wppa_dbg_url( get_admin_url().'admin.php?page=wppa_import_photos' ).'">'.__( 'here.', 'wp-photo-album-plus').'</a>' );
1689	+
1690	+ // Do them all
1691	+ foreach ( array_keys( $files ) as $file_idx ) {
1692	+ $unsanitized_path_name = $files[$file_idx];
1693	+ $file = $files[$file_idx];
1694	+ wppa_is_wppa_tree( $file ); // Sets wppa( 'is_wppa_tree' )
1695	+ if ( isset( $_POST['use-backup'] ) && is_file( $file.'_backup' ) ) {
1696	+ $file = $file.'_backup';
1697	+ }
1698	+ $file = wppa_sanitize_file_name( $file );
1699	+ if ( isset( $_POST['file-'.$idx] ) \|\| wppa( 'ajax' ) ) {
1700	+ if ( wppa( 'is_wppa_tree' ) ) {
1701	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', basename( wppa_compress_tree_path( $file ) ) );
1702	+ }
1703	+ else {
1704	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', basename( $file ) );
1705	+ }
1706	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
1707	+ $ext = str_replace( '_backup', '', $ext );
1708	+ if ( in_array( $ext, $wppa_supported_photo_extensions ) ) {
1709	+
1710	+ // See if a metafile exists
1711	+ //$meta = substr( $file, 0, strlen( $file ) - 3 ).'pmf';
1712	+ $meta = wppa_strip_ext( $unsanitized_path_name ) . '.PMF';
1713	+ if ( ! is_file( $meta ) ) {
1714	+ $meta = wppa_strip_ext( $unsanitized_path_name ) . '.pmf';
1715	+ }
1716	+
1717	+ // find all data: name, desc, porder form metafile
1718	+ if ( is_file( $meta ) ) {
1719	+ $alb = wppa_get_album_id( wppa_get_meta_album( $meta ) );
1720	+ $name = wppa_get_meta_name( $meta );
1721	+ $desc = wppa_txt_to_nl( wppa_get_meta_desc( $meta ) );
1722	+ $porder = wppa_get_meta_porder( $meta );
1723	+ $linkurl = wppa_get_meta_linkurl( $meta );
1724	+ $linktitle = wppa_get_meta_linktitle( $meta );
1725	+ }
1726	+ else {
1727	+ $alb = $album; // default album
1728	+ $name = ''; // default name
1729	+ $desc = ''; // default description
1730	+ $porder = '0'; // default p_order
1731	+ $linkurl = '';
1732	+ $linktitle = '';
1733	+ }
1734	+
1735	+ // If there is a video or audio with the same name, this is the poster.
1736	+ $is_poster = wppa_file_is_in_album( wppa_strip_ext( basename( $file ) ) . '.xxx', $alb );
1737	+ if ( $is_poster ) {
1738	+
1739	+ // Delete possible poster sourcefile
1740	+ wppa_delete_source( basename( $file ), $alb );
1741	+
1742	+ // Remove possible existing posters, the file-extension may be different as before
1743	+ $old_photo = wppa_strip_ext( wppa_get_photo_path( $is_poster ) );
1744	+ $old_thumb = wppa_strip_ext( wppa_get_thumb_path( $is_poster ) );
1745	+ foreach ( $wppa_supported_photo_extensions as $pext ) {
1746	+ @ unlink( $old_photo . '.' . $pext );
1747	+ @ unlink( $old_thumb . '.' . $pext );
1748	+ }
1749	+
1750	+ // Clear sizes on db
1751	+ wppa_update_photo( array( 'thumbx' => '0',
1752	+ 'thumby' => '0',
1753	+ 'photox' => '0',
1754	+ 'photoy' => '0'
1755	+ ));
1756	+
1757	+ // Make new files
1758	+ $bret = wppa_make_the_photo_files( $file, $is_poster, strtolower( wppa_get_ext( basename( $file ) ) ) );
1759	+ if ( $bret ) { // Success
1760	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files_done', true );
1761	+ wppa_save_source( $file, basename( $file ), $alb );
1762	+ wppa_make_o1_source( $is_poster );
1763	+ $pcount++;
1764	+ $totpcount += $bret;
1765	+ if ( $delp ) {
1766	+ unlink( $file );
1767	+ }
1768	+ }
1769	+ else { // Failed
1770	+ if ( ! wppa( 'ajax' ) ) {
1771	+ wppa_error_message('Failed to add poster for item '.$is_poster);
1772	+ }
1773	+ if ( $delf ) {
1774	+ unlink( $file );
1775	+ }
1776	+ }
1777	+ }
1778	+
1779	+ // Update the photo ?
1780	+ elseif ( isset( $_POST['wppa-update'] ) ) {
1781	+
1782	+ if ( wppa( 'is_wppa_tree' ) ) {
1783	+ $tmp = explode( '/wppa/', $file );
1784	+ $name = str_replace( '/', '', $tmp[1] );
1785	+ }
1786	+
1787	+ $iret = wppa_update_photo_files( $unsanitized_path_name, $name );
1788	+ if ( $iret ) {
1789	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files_done', true );
1790	+ $pcount++;
1791	+ $totpcount += $iret;
1792	+ if ( $delp ) {
1793	+ unlink( $unsanitized_path_name );
1794	+ }
1795	+ }
1796	+ else {
1797	+ if ( $delf ) {
1798	+ unlink( $unsanitized_path_name );
1799	+ }
1800	+ }
1801	+ }
1802	+
1803	+ // Insert the photo
1804	+ else {
1805	+ if ( is_numeric( $alb ) && $alb != '0' ) {
1806	+ if ( wppa( 'is_wppa_tree' ) ) {
1807	+ $tmp = explode( '/wppa/', $file );
1808	+ $id = str_replace( '/', '', $tmp[1] );
1809	+ $name = $id;
1810	+ }
1811	+ else {
1812	+ $id = basename( $file );
1813	+ }
1814	+ if ( wppa_switch( 'void_dups' ) && wppa_file_is_in_album( $id, $alb ) ) {
1815	+ wppa_warning_message( sprintf( __( 'Photo %s already exists in album %s. (1)', 'wp-photo-album-plus'), $id, $alb ) );
1816	+ wppa( 'ajax_import_files_error', __( 'Duplicate', 'wp-photo-album-plus') );
1817	+ if ( $delf ) {
1818	+ unlink( $file );
1819	+ }
1820	+ }
1821	+ else {
1822	+ $id = substr( $id, 0, strpos( $id, '.' ) );
1823	+ if ( !is_numeric( $id ) \|\| ! wppa_is_id_free( 'photo', $id ) ) $id = 0;
1824	+ if ( wppa_insert_photo( $unsanitized_path_name, $alb, stripslashes( $name ), stripslashes( $desc ), $porder, $id, stripslashes( $linkurl ), stripslashes( $linktitle ) ) ) {
1825	+ if ( wppa( 'ajax' ) ) {
1826	+ wppa( 'ajax_import_files_done', true );
1827	+ }
1828	+ $pcount++;
1829	+ if ( $delp ) {
1830	+ unlink( $unsanitized_path_name );
1831	+ if ( is_file( $meta ) ) unlink( $meta );
1832	+ }
1833	+ }
1834	+ else {
1835	+ wppa_error_message( __( 'Error inserting photo', 'wp-photo-album-plus') . ' ' . basename( $file ) . '.' );
1836	+ if ( $delf ) {
1837	+ unlink( $unsanitized_path_name );
1838	+ }
1839	+ }
1840	+ }
1841	+ }
1842	+ else {
1843	+ wppa_error_message( sprintf( __( 'Error inserting photo %s, unknown or non existent album.', 'wp-photo-album-plus'), basename( $file ) ) );
1844	+ }
1845	+ } // Insert
1846	+ }
1847	+ }
1848	+ $idx++;
1849	+ if ( $source_type == 'remote' ) unset( $files[$file_idx] );
1850	+ if ( wppa_is_time_up() ) {
1851	+ wppa_warning_message( sprintf( __( 'Time out. %s photos imported. Please restart this operation.', 'wp-photo-album-plus'), $pcount ) );
1852	+ wppa_set_last_album( $album );
1853	+ if ( $source_type == 'remote' ) update_option( 'wppa_import_source_url_found_'.$user, $files );
1854	+ return;
1855	+ }
1856	+ } // foreach $files
1857	+ if ( $source_type == 'remote' ) update_option( 'wppa_import_source_url_found_'.$user, $files );
1858	+
1859	+ // Now the dirs to album imports
1860	+
1861	+ $idx = '0';
1862	+ $dircount = '0';
1863	+ global $photocount;
1864	+ $photocount = '0';
1865	+ $iret = true;
1866	+
1867	+ foreach ( $files as $file ) {
1868	+ if ( basename( $file ) != '.' && basename( $file ) != '..' && ( isset( $_POST['file-'.$idx] ) \|\| isset( $_GET['continue'] ) ) ) {
1869	+ if ( is_dir( $file ) ) {
1870	+ $iret = wppa_import_dir_to_album( $file, '0' );
1871	+ if ( wppa_is_time_up() && wppa_switch( 'auto_continue' ) ) {
1872	+ wppa( 'continue', 'continue' );
1873	+ }
1874	+ $dircount++;
1875	+ }
1876	+ }
1877	+ $idx++;
1878	+ if ( $iret == false ) break; // Time out
1879	+ }
1880	+
1881	+ // Now the video files
1882	+ $videocount = '0';
1883	+ $alb = isset( $_POST['wppa-video-album'] ) ? $_POST['wppa-video-album'] : '0';
1884	+ if ( wppa( 'ajax' ) && ! $alb ) {
1885	+ wppa( 'ajax_import_files_error', __( 'Unknown album', 'wp-photo-album-plus' ) );
1886	+ }
1887	+ else foreach ( array_keys( $files ) as $idx ) {
1888	+ $file = $files[$idx];
1889	+ if ( isset( $_POST['file-'.$idx] ) \|\| wppa( 'ajax' ) ) {
1890	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', wppa_sanitize_file_name( basename( $file ) ) ); /* */
1891	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
1892	+ if ( in_array( $ext, $wppa_supported_video_extensions ) ) {
1893	+ if ( is_numeric( $alb ) && $alb != '0' ) {
1894	+
1895	+ // Do we have this filename with ext xxx in this album?
1896	+ $filename = wppa_strip_ext( basename( $file ) ).'.xxx';
1897	+ $id = wppa_file_is_in_album( $filename, $alb );
1898	+
1899	+ // Or maybe the poster is already there
1900	+ foreach ( $wppa_supported_photo_extensions as $pext ) {
1901	+ if ( ! $id ) {
1902	+ $id = wppa_file_is_in_album( str_replace( 'xxx', $pext, $filename ), $alb );
1903	+ }
1904	+ }
1905	+
1906	+ // This filename already exists: is the poster. Fix the filename in the photo info
1907	+ if ( $id ) {
1908	+ $fname = wppa_get_photo_item( $id, 'filename' );
1909	+ $fname = wppa_strip_ext( $fname ) . '.xxx';
1910	+
1911	+ // Fix filename and ext in photo info
1912	+ wppa_update_photo( array( 'id' => $id, 'filename' => $fname, 'ext' => 'xxx' ) );
1913	+ }
1914	+
1915	+ // Add new entry
1916	+ if ( ! $id ) {
1917	+ $id = wppa_create_photo_entry( array( 'album' => $alb, 'filename' => $filename, 'ext' => 'xxx', 'name' => wppa_strip_ext( $filename ) ) );
1918	+ wppa_flush_treecounts( $alb );
1919	+ }
1920	+
1921	+ // Add video filetype
1922	+ $newpath = wppa_strip_ext( wppa_get_photo_path( $id ) ).'.'.$ext;
1923	+ copy( $file, $newpath );
1924	+ if ( $delv ) unlink( $file );
1925	+ if ( wppa( 'ajax' ) ) {
1926	+ wppa( 'ajax_import_files_done', true );
1927	+ }
1928	+
1929	+ // Make sure ext is set to xxx after adding video to an existing poster
1930	+ wppa_update_photo( array( 'id' => $id, 'ext' => 'xxx' ) );
1931	+
1932	+ // Book keeping
1933	+ $videocount++;
1934	+ }
1935	+ else {
1936	+ wppa_error_message( sprintf( __( 'Error inserting video %s, unknown or non existent album.', 'wp-photo-album-plus'), basename( $file ) ) );
1937	+ }
1938	+ }
1939	+ }
1940	+ }
1941	+
1942	+ // Now the audio files
1943	+ $audiocount = '0';
1944	+ $alb = isset( $_POST['wppa-audio-album'] ) ? $_POST['wppa-audio-album'] : '0';
1945	+ if ( wppa( 'ajax' ) && ! $alb ) {
1946	+ wppa( 'ajax_import_files_error', __( 'Unknown album', 'wp-photo-album-plus' ) );
1947	+ }
1948	+ else foreach ( array_keys( $files ) as $idx ) {
1949	+ $file = $files[$idx];
1950	+ if ( isset( $_POST['file-'.$idx] ) \|\| wppa( 'ajax' ) ) {
1951	+ if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', wppa_sanitize_file_name( basename( $file ) ) );
1952	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
1953	+ if ( in_array( $ext, $wppa_supported_audio_extensions ) ) {
1954	+ if ( is_numeric( $alb ) && $alb != '0' ) {
1955	+
1956	+ // Do we have this filename with ext xxx in this album?
1957	+ $filename = wppa_strip_ext( basename( $file ) ).'.xxx';
1958	+ $id = wppa_file_is_in_album( $filename, $alb );
1959	+
1960	+ // Or maybe the poster is already there
1961	+ foreach ( $wppa_supported_photo_extensions as $pext ) {
1962	+ if ( ! $id ) {
1963	+ $id = wppa_file_is_in_album( str_replace( 'xxx', $pext, $filename ), $alb );
1964	+ }
1965	+ }
1966	+
1967	+ // This filename already exists: is the poster. Fix the filename in the photo info
1968	+ if ( $id ) {
1969	+ $fname = wppa_get_photo_item( $id, 'filename' );
1970	+ $fname = wppa_strip_ext( $fname ) . '.xxx';
1971	+
1972	+ // Fix filename and ext in photo info
1973	+ wppa_update_photo( array( 'id' => $id, 'filename' => $fname, 'ext' => 'xxx' ) );
1974	+ }
1975	+
1976	+ // Add new entry
1977	+ if ( ! $id ) {
1978	+ $id = wppa_create_photo_entry( array( 'album' => $alb, 'filename' => $filename, 'ext' => 'xxx', 'name' => wppa_strip_ext( $filename ) ) );
1979	+ wppa_flush_treecounts( $alb );
1980	+ }
1981	+
1982	+ // Add audio filetype
1983	+ $newpath = wppa_strip_ext( wppa_get_photo_path( $id ) ).'.'.$ext;
1984	+ copy( $file, $newpath );
1985	+ if ( $delu ) unlink( $file );
1986	+ if ( wppa( 'ajax' ) ) {
1987	+ wppa( 'ajax_import_files_done', true );
1988	+ }
1989	+
1990	+ // Make sure ext is set to xxx after adding audio to an existing poster
1991	+ wppa_update_photo( array( 'id' => $id, 'ext' => 'xxx' ) );
1992	+
1993	+ // Book keeping
1994	+ $audiocount++;
1995	+ }
1996	+ else {
1997	+ wppa_error_message( sprintf( __( 'Error inserting audio %s, unknown or non existent album.', 'wp-photo-album-plus'), basename( $file ) ) );
1998	+ }
1999	+ }
2000	+ }
2001	+ }
2002	+
2003	+ // The csv files. NOT with ajax
2004	+ $csvcount = wppa_get_csvcount( $files );
2005	+ if ( $csvcount ) {
2006	+ $csvcount = '0';
2007	+ if ( ! wppa( 'ajax' ) ) {
2008	+ if ( is_array( $files ) ) {
2009	+
2010	+ // Make sure the feature is on
2011	+ if ( ! wppa_switch( 'custom_fields' ) ) {
2012	+ wppa_update_option( 'wppa_custom_fields', 'yes' );
2013	+ echo '<b>' . __( 'Custom datafields enabled', 'wp-photo-album-plus').'</b><br />';
2014	+ }
2015	+
2016	+ // Get the captions we already have
2017	+ $cust_labels = array();
2018	+ for ( $i = '0'; $i < '10'; $i++ ) {
2019	+ $cust_labels[$i] = wppa_opt( 'custom_caption_' . $i );
2020	+ }
2021	+ /*
2022	+ // Display the captions we have
2023	+ echo __( 'Captions are:' ) . ' ';
2024	+ for ( $i = 0; $i < '10'; $i++ ) {
2025	+ echo '[' . $i . '] -> ';
2026	+ if ( $cust_labels[$i] ) {
2027	+ echo $cust_labels[$i] . ' ';
2028	+ }
2029	+ else {
2030	+ echo __( '--- not used ---' ) . ' ';
2031	+ }
2032	+ }
2033	+ echo '<br />';
2034	+ */
2035	+ // Process the files
2036	+ $photos_processed_csv = '0';
2037	+ $photos_skipped_csv = '0';
2038	+ foreach ( array_keys( $files ) as $idx ) {
2039	+ $this_skipped = '0';
2040	+ $file = $files[$idx];
2041	+ if ( isset( $_POST['file-'.$idx] ) \|\| isset( $_GET['continue'] ) ) {
2042	+ $ext = strtolower( wppa_get_ext( $file ) );
2043	+ if ( $ext == 'csv' ) {
2044	+ echo '<b>' . __( 'Processing', 'wp-photo-album-plus') . ' ' . basename( $file ) . '</b><br />';
2045	+ wppa_log( 'dbg', __( 'Processing', 'wp-photo-album-plus') . ' ' . basename( $file ) );
2046	+
2047	+ // Copy the file to a temp file
2048	+ $tempfile = dirname( $file ) . '/temp.csv';
2049	+ copy ( $file, $tempfile );
2050	+
2051	+ // Open file
2052	+ $handle = fopen( $tempfile, "rt" );
2053	+ if ( ! $handle ) {
2054	+ wppa_error_message( __( 'Can not open file. Can not continue. (1)', 'wp-photo-album-plus') );
2055	+ return;
2056	+ }
2057	+ $write_handle = fopen( $file, "wt" );
2058	+ if ( ! $write_handle ) {
2059	+ wppa_error_message( __( 'Can not open file. Can not continue. (2)', 'wp-photo-album-plus') );
2060	+ return;
2061	+ }
2062	+
2063	+ // Read header
2064	+ $header = fgets( $handle, 4096 );
2065	+ if ( ! $header ) {
2066	+ wppa_error_message( __( 'Can not read header. Can not continue.', 'wp-photo-album-plus') );
2067	+ fclose( $handle );
2068	+ return;
2069	+ }
2070	+ fputs( $write_handle, $header );
2071	+ echo __( 'Read header:', 'wp-photo-album-plus') . ' ' . $header . '<br />';
2072	+
2073	+ // Interprete header
2074	+ $captions = wppa_explode_csv( $header );
2075	+ if ( ! is_array( $captions ) \|\| count( $captions ) < '2' ) {
2076	+ wppa_error_message( __( 'Invalid header. Can not continue.', 'wp-photo-album-plus') );
2077	+ fclose( $handle );
2078	+ return;
2079	+ }
2080	+ foreach ( array_keys( $captions ) as $key ) {
2081	+ if ( $key == '0' ) {
2082	+ if ( ! in_array( strtolower( trim( $captions['0'] ) ), array( 'name', 'photoname', 'filename' ) ) ) {
2083	+ wppa_error_message( __( 'Invalid header. First item must be \'name\', \'photoname\' or \'filename\'', 'wp-photo-album-plus') );
2084	+ fclose( $handle );
2085	+ return;
2086	+ }
2087	+ }
2088	+ elseif ( ! in_array( $captions[$key], $cust_labels ) ) {
2089	+ if ( ! in_array( '', $cust_labels ) ) {
2090	+ wppa_error_message( __( 'All available custom data fields are in use. There is no space for', 'wp-photo-album-plus') . ' ' . $captions[$key] );
2091	+ fclose( $handle );
2092	+ return;
2093	+ }
2094	+
2095	+ // Add a new caption
2096	+ $i = '0';
2097	+ while ( $cust_labels[$i] ) $i++;
2098	+ $cust_labels[$i] = $captions[$key];
2099	+ wppa_update_option( 'wppa_custom_caption_' . $i, $cust_labels[$i] );
2100	+ wppa_update_option( 'wppa_custom_visible_' . $i, 'yes' );
2101	+ wppa_log( 'dbg', sprintf( __( 'New caption %s added.', 'wp-photo-album-plus'), $cust_labels[$i] ) );
2102	+ }
2103	+ }
2104	+
2105	+ // Find the correlation between caption index and custom data index.
2106	+ $pointers = array();
2107	+ for ( $i = '1'; $i < count( $captions ); $i++ ) {
2108	+ for ( $j = '0'; $j < '10'; $j++ ) {
2109	+ if ( $captions[$i] == $cust_labels[$j] ) {
2110	+ $pointers[$j] = $i;
2111	+ }
2112	+ }
2113	+ }
2114	+
2115	+ // Now process the lines
2116	+ while ( ! feof( $handle ) ) {
2117	+ $dataline = fgets( $handle, 4096 );
2118	+ if ( $dataline ) {
2119	+ wppa_log( 'dbg', __( 'Read data:', 'wp-photo-album-plus') . ' ' . trim( $dataline ) );
2120	+ $data_arr = wppa_explode_csv( $dataline );
2121	+ $search = $data_arr[0];
2122	+ switch ( strtolower($captions[0]) ) {
2123	+ case 'photoname':
2124	+ $photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `name` = %s", $data_arr[0] ), ARRAY_A );
2125	+ break;
2126	+ case 'filename':
2127	+ $photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `filename` = %s", $data_arr[0] ), ARRAY_A );
2128	+ break;
2129	+ case 'name':
2130	+ $photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `name` = %s OR `filename` = %s", $data_arr[0], $data_arr[0] ), ARRAY_A );
2131	+ break;
2132	+ }
2133	+ if ( $photos ) {
2134	+ foreach( $photos as $photo ) {
2135	+ $cust_data = $photo['custom'] ? unserialize( $photo['custom'] ) : array( '', '', '', '', '', '', '', '', '', '' );
2136	+ foreach( array_keys( $pointers ) as $p ) {
2137	+ $cust_data[$p] = wppa_sanitize_custom_field( $data_arr[$pointers[$p]] );
2138	+ }
2139	+ wppa_update_photo( array( 'id' => $photo['id'], 'custom' => serialize( $cust_data ) ) );
2140	+ $photos_processed_csv ++;
2141	+ }
2142	+ wppa_log( 'dbg', 'Processed: ' . $data_arr[0] );
2143	+ }
2144	+
2145	+ // This line could not be processed
2146	+ else {
2147	+ wppa_log( 'dbg', 'Could not find: ' . $data_arr[0] );
2148	+
2149	+ // Write back to original file
2150	+ fputs( $write_handle, $dataline );
2151	+ $photos_skipped_csv++;
2152	+ $this_skipped++;
2153	+ }
2154	+ echo '.';
2155	+ }
2156	+
2157	+ // Time up?
2158	+ if ( wppa_is_time_up() && wppa_switch( 'auto_continue' ) ) {
2159	+ wppa( 'continue', 'continue' );
2160	+
2161	+ // Copy rest of file back to original
2162	+ while ( ! feof( $handle ) ) {
2163	+ $temp = fgets( $handle, 4096 );
2164	+ fputs( $write_handle, $temp );
2165	+ }
2166	+ }
2167	+ }
2168	+
2169	+ fclose( $handle );
2170	+ fclose( $write_handle );
2171	+
2172	+ $csvcount++;
2173	+
2174	+ // Remove tempfile
2175	+ unlink( $tempfile );
2176	+
2177	+ // Remove orig file
2178	+ if ( ! $this_skipped && ! wppa_is_time_up() ) {
2179	+ unlink( $file );
2180	+ }
2181	+ }
2182	+ }
2183	+ }
2184	+ }
2185	+ }
2186	+ }
2187	+
2188	+ wppa_ok_message( __( 'Done processing files.', 'wp-photo-album-plus') );
2189	+
2190	+ if ( $pcount == '0' && $acount == '0' && $zcount == '0' && $dircount == '0' && $photocount == '0' && $videocount == '0' && $audiocount == '0' && $csvcount == '0' ) {
2191	+ wppa_warning_message( __( 'No files to import.', 'wp-photo-album-plus') );
2192	+ }
2193	+ else {
2194	+ $msg = '';
2195	+ if ( $zcount ) $msg .= $zcount.' '.__( 'Zipfiles extracted.', 'wp-photo-album-plus').' ';
2196	+ if ( $acount ) $msg .= $acount.' '.__( 'Albums created.', 'wp-photo-album-plus').' ';
2197	+ if ( $dircount ) $msg .= $dircount.' '.__( 'Directory to album imports.', 'wp-photo-album-plus').' ';
2198	+ if ( $photocount ) $msg .= ' '.sprintf( __( 'With total %s photos.','wppa', 'wp-photo-album-plus'), $photocount ).' ';
2199	+ if ( $pcount ) {
2200	+ if ( isset( $_POST['wppa-update'] ) ) {
2201	+ $msg .= $pcount.' '.__( 'Photos updated', 'wp-photo-album-plus' );
2202	+ if ( $totpcount != $pcount ) {
2203	+ $msg .= ' '.sprintf( __( 'to %s locations', 'wp-photo-album-plus'), $totpcount );
2204	+ }
2205	+ $msg .= '.';
2206	+ }
2207	+ else $msg .= $pcount.' '.__( 'single photos imported.', 'wp-photo-album-plus').' ';
2208	+ }
2209	+ if ( $videocount ) {
2210	+ $msg .= $videocount.' '.__( 'Videos imported.', 'wp-photo-album-plus' );
2211	+ }
2212	+ if ( $audiocount ) {
2213	+ $msg .= $audiocount.' '.__( 'Audios imported.', 'wp-photo-album-plus' );
2214	+ }
2215	+ if ( $csvcount ) {
2216	+ $msg .= $csvcount . ' ' . __( 'CSVs imported,', 'wp-photo-album-plus') . ' ' .
2217	+ $photos_processed_csv .' '. __( 'photos processed.', 'wp-photo-album-plus') . ' ' .
2218	+ $photos_skipped_csv . ' ' . __('photos skipped.', 'wp-photo-album-plus' );
2219	+ }
2220	+ wppa_ok_message( $msg );
2221	+ wppa_set_last_album( $album );
2222	+ }
2223	+ }
2224	+
2225	+ function wppa_get_zipcount( $files ) {
2226	+ $result = 0;
2227	+ if ( $files ) {
2228	+ foreach ( $files as $file ) {
2229	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
2230	+ if ( $ext == 'zip' ) $result++;
2231	+ }
2232	+ }
2233	+ return $result;
2234	+ }
2235	+
2236	+ function wppa_get_albumcount( $files ) {
2237	+ $result = 0;
2238	+ if ( $files ) {
2239	+ foreach ( $files as $file ) {
2240	+ $ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
2241	+ if ( $ext == 'amf' ) $result++;
2242	+ }
2243	+ }
2244	+ return $result;
2245	+ }
2246	+
2247	+ function wppa_get_photocount( $files ) {
2248	+ global $wppa_supported_photo_extensions;
2249	+
2250	+ $result = 0;
2251	+ if ( $files ) {
2252	+ foreach ( $files as $file ) {
2253	+ $ext = strtolower( wppa_get_ext( $file ) );
2254	+ if ( in_array( $ext, $wppa_supported_photo_extensions ) ) $result++;
2255	+ }
2256	+ }
2257	+ return $result;
2258	+ }
2259	+
2260	+ function wppa_get_video_count( $files ) {
2261	+ global $wppa_supported_video_extensions;
2262	+
2263	+ $result = 0;
2264	+ if ( $files ) {
2265	+ foreach ( $files as $file ) {
2266	+ $ext = strtolower( wppa_get_ext( $file ) );
2267	+ if ( in_array( $ext, $wppa_supported_video_extensions ) ) $result++;
2268	+ }
2269	+ }
2270	+ return $result;
2271	+ }
2272	+
2273	+ function wppa_get_audio_count( $files ) {
2274	+ global $wppa_supported_audio_extensions;
2275	+
2276	+ $result = 0;
2277	+ if ( $files ) {
2278	+ foreach ( $files as $file ) {
2279	+ $ext = strtolower( wppa_get_ext( $file ) );
2280	+ if ( in_array( $ext, $wppa_supported_audio_extensions ) ) $result++;
2281	+ }
2282	+ }
2283	+ return $result;
2284	+ }
2285	+
2286	+
2287	+ // Find dir is new album candidates
2288	+ function wppa_get_dircount( $files ) {
2289	+ $result = 0;
2290	+ if ( $files ) {
2291	+ foreach ( $files as $file ) {
2292	+ if ( basename( $file ) == '.' ) {}
2293	+ elseif ( basename( $file ) == '..' ) {}
2294	+ elseif ( is_dir( $file ) ) $result++;
2295	+ }
2296	+ }
2297	+ return $result;
2298	+ }
2299	+
2300	+ // Find .csv file count
2301	+ function wppa_get_csvcount( $files ) {
2302	+ $result = 0;
2303	+ if ( $files ) {
2304	+ foreach ( $files as $file ) {
2305	+ if ( is_file( $file ) ) {
2306	+ if ( strtolower( wppa_get_ext( $file ) ) == 'csv' ) $result++;
2307	+ }
2308	+ }
2309	+ }
2310	+ return $result;
2311	+ }
2312	+
2313	+ function wppa_get_meta_name( $file, $opt = '' ) {
2314	+ return wppa_get_meta_data( $file, 'name', $opt );
2315	+ }
2316	+ function wppa_get_meta_album( $file, $opt = '' ) {
2317	+ return wppa_get_meta_data( $file, 'albm', $opt );
2318	+ }
2319	+ function wppa_get_meta_desc( $file, $opt = '' ) {
2320	+ return wppa_get_meta_data( $file, 'desc', $opt );
2321	+ }
2322	+ function wppa_get_meta_porder( $file, $opt = '' ) {
2323	+ return wppa_get_meta_data( $file, 'pord', $opt );
2324	+ }
2325	+ function wppa_get_meta_linkurl( $file, $opt = '' ) {
2326	+ return wppa_get_meta_data( $file, 'lnku', $opt );
2327	+ }
2328	+ function wppa_get_meta_linktitle( $file, $opt = '' ) {
2329	+ return wppa_get_meta_data( $file, 'lnkt', $opt );
2330	+ }
2331	+
2332	+ function wppa_get_meta_data( $file, $item, $opt ) {
2333	+ $result = '';
2334	+ $opt2 = '';
2335	+ if ( $opt == '( ' ) $opt2 = ' )';
2336	+ if ( $opt == '{' ) $opt2 = '}';
2337	+ if ( $opt == '[' ) $opt2 = ']';
2338	+ if ( is_file( $file ) ) {
2339	+ $handle = fopen( $file, "r" );
2340	+ if ( $handle ) {
2341	+ while ( ( $buffer = fgets( $handle, 4096 ) ) !== false ) {
2342	+ if ( substr( $buffer, 0, 5 ) == $item.'=' ) {
2343	+ if ( $opt == '' ) $result = substr( $buffer, 5, strlen( $buffer )-6 );
2344	+ else $result = $opt.__( substr( $buffer, 5, strlen( $buffer )-6 ) ).$opt2; // Translate for display purposes only
2345	+ }
2346	+ }
2347	+ if ( !feof( $handle ) ) {
2348	+ _e( 'Error: unexpected fgets() fail in wppa_get_meta_data().', 'wp-photo-album-plus' );
2349	+ }
2350	+ fclose( $handle );
2351	+ }
2352	+ }
2353	+ return $result;
2354	+ }
2355	+
2356	+
2357	+ function wppa_extract( $xpath, $delz ) {
2358	+ // There are two reasons that we do not allow the directory structure from the zipfile to be restored.
2359	+ // 1. we may have no create dir access rights.
2360	+ // 2. we can not reach the pictures as we only glob the users depot and not lower.
2361	+ // We extract all files to the users depot.
2362	+ // The illegal files will be deleted there by the wppa_sanitize_files routine,
2363	+ // so there is no chance a depot/subdir/destroy.php or the like will get a chance to be created.
2364	+ // dus...
2365	+
2366	+ $err = '0';
2367	+ if ( ! class_exists( 'ZipArchive' ) ) {
2368	+ $err = '3';
2369	+ wppa_error_message( __( 'Class ZipArchive does not exist! Check your php configuration', 'wp-photo-album-plus') );
2370	+ }
2371	+ else {
2372	+
2373	+ // Start security fix
2374	+ $path = wppa_sanitize_file_name( $xpath );
2375	+ if ( ! file_exists( $xpath ) ) {
2376	+ wppa_error_message( 'Zipfile '.$path.' does not exist.' );
2377	+ // unlink( $xpath );
2378	+ $err = '4';
2379	+ return $err;
2380	+ }
2381	+ // End security fix
2382	+
2383	+ $ext = strtolower( wppa_get_ext( $xpath ) );
2384	+ if ( $ext == 'zip' ) {
2385	+ $zip = new ZipArchive;
2386	+ if ( $zip->open( $xpath ) === true ) {
2387	+
2388	+ $supported_file_ext = array( 'jpg', 'png', 'gif', 'JPG', 'PNG', 'GIF', 'amf', 'pmf' );
2389	+ $done = '0';
2390	+ $skip = '0';
2391	+ for( $i = 0; $i < $zip->numFiles; $i++ ){
2392	+ $stat = $zip->statIndex( $i );
2393	+ $file_ext = @ end( explode( '.', $stat['name'] ) );
2394	+ if ( in_array( $file_ext, $supported_file_ext ) ) {
2395	+ $zip->extractTo( WPPA_DEPOT_PATH, $stat['name'] );
2396	+ $done++;
2397	+ }
2398	+ else {
2399	+ wppa_warning_message( sprintf( __( 'File %s is of an unsupported filetype and has been ignored during extraction.', 'wp-photo-album-plus'), wppa_sanitize_file_name( $stat['name'] ) ) );
2400	+ $skip++;
2401	+ }
2402	+ }
2403	+
2404	+ $zip->close();
2405	+ wppa_ok_message( sprintf( __( 'Zipfile %s processed. %s files extracted, %s files skipped.', 'wp-photo-album-plus'), basename( $path ), $done, $skip ) );
2406	+ if ( $delz ) unlink( $xpath );
2407	+ } else {
2408	+ wppa_error_message( __( 'Failed to extract', 'wp-photo-album-plus').' '.$path );
2409	+ $err = '1';
2410	+ }
2411	+ }
2412	+ else $err = '2';
2413	+ }
2414	+ return $err;
2415	+ }
2416	+
2417	+ function wppa_import_dir_to_album( $file, $parent ) {
2418	+ global $photocount;
2419	+ global $wpdb;
2420	+ global $wppa_session;
2421	+
2422	+ // Session should survive the default hour
2423	+ wppa_extend_session();
2424	+
2425	+ // see if album exists
2426	+ if ( is_dir( $file ) ) {
2427	+
2428	+ // Check parent
2429	+ if ( wppa_switch( 'import_parent_check' ) ) {
2430	+
2431	+ $alb = wppa_get_album_id( basename( $file ), $parent );
2432	+
2433	+ // If parent = 0 ( top-level album ) and album not found,
2434	+ // try a 'separate' album ( i.e. parent = -1 ) with this name
2435	+ if ( ! $alb && $parent == '0' ) {
2436	+ $alb = wppa_get_album_id( basename( $file ), '-1' );
2437	+ }
2438	+ }
2439	+
2440	+ // All albums have unique names, do'nt worry about parent
2441	+ else {
2442	+ $alb = wppa_get_album_id( basename( $file ), false );
2443	+ }
2444	+
2445	+ if ( ! $alb ) { // Album must be created
2446	+ $name = basename( $file );
2447	+ $uplim = wppa_opt( 'upload_limit_count' ). '/' . wppa_opt( 'upload_limit_time' );
2448	+ $alb = wppa_create_album_entry( array ( 'name' => $name,
2449	+ 'a_parent' => $parent
2450	+ ) );
2451	+ if ( $alb === false ) {
2452	+ wppa_error_message( __( 'Could not create album.', 'wp-photo-album-plus').'<br/>Query = '.$query );
2453	+ wp_die( 'Sorry, cannot continue' );
2454	+ }
2455	+ else {
2456	+ wppa_set_last_album( $alb );
2457	+ wppa_flush_treecounts( $alb );
2458	+ wppa_index_add( 'album', $alb );
2459	+ wppa_create_pl_htaccess();
2460	+ wppa_ok_message( __( 'Album #', 'wp-photo-album-plus') . ' ' . $alb . ' ( '.$name.' ) ' . __( 'Added.', 'wp-photo-album-plus') );
2461	+ if ( wppa_switch( 'newpag_create' ) && $parent <= '0' ) {
2462	+
2463	+ // Create post object
2464	+ $my_post = array(
2465	+ 'post_title' => $name,
2466	+ 'post_content' => str_replace( 'w#album', $alb, wppa_opt( 'newpag_content' ) ),
2467	+ 'post_status' => wppa_opt( 'newpag_status' ),
2468	+ 'post_type' => wppa_opt( 'newpag_type' )
2469	+ );
2470	+
2471	+ // Insert the post into the database
2472	+ $pagid = wp_insert_post( $my_post );
2473	+ if ( $pagid ) {
2474	+ wppa_ok_message( sprintf( __( 'Page <a href="%s" target="_blank" >%s</a> created.', 'wp-photo-album-plus'), home_url().'?page_id='.$pagid, $name ) );
2475	+ $wpdb->query( $wpdb->prepare( "UPDATE `".WPPA_ALBUMS."` SET `cover_linkpage` = %s WHERE `id` = %s", $pagid, $alb ) );
2476	+ }
2477	+ else {
2478	+ wppa_error_message( __( 'Could not create page.', 'wp-photo-album-plus') );
2479	+ }
2480	+ }
2481	+ }
2482	+ }
2483	+
2484	+ // Now import the files
2485	+ $photofiles = glob( $file.'/*' );
2486	+ if ( $photofiles ) foreach ( $photofiles as $photofile ) {
2487	+ if ( ! is_dir( $photofile ) ) {
2488	+
2489	+ if ( ! isset( $wppa_session[$photofile] ) \|\| ! wppa_switch( 'keep_import_files' ) ) {
2490	+
2491	+ if ( wppa_albumphoto_exists( $alb, basename( $photofile ) ) ) {
2492	+ if ( ! wppa_switch( 'keep_import_files' ) ) {
2493	+ wppa_warning_message( 'Photo '.basename( $photofile ).' already exists in album '.$alb.'. Removed. (2)' );
2494	+ }
2495	+ }
2496	+ else {
2497	+ $bret = wppa_insert_photo( $photofile, $alb, basename( $photofile ) );
2498	+ $photocount++;
2499	+ }
2500	+ if ( ! wppa_switch( 'keep_import_files' ) ) {
2501	+ @ unlink( $photofile );
2502	+ }
2503	+ $wppa_session[$photofile] = true;
2504	+ }
2505	+
2506	+ if ( wppa_is_time_up( $photocount ) ) return false;
2507	+ }
2508	+ }
2509	+
2510	+ // Now go deeper, process the subdirs
2511	+ $subdirs = glob( $file.'/*' );
2512	+ if ( $subdirs ) foreach ( $subdirs as $subdir ) {
2513	+ if ( is_dir( $subdir ) ) {
2514	+ if ( basename( $subdir ) != '.' && basename( $subdir ) != '..' ) {
2515	+ $bret = wppa_import_dir_to_album( $subdir, $alb );
2516	+ if ( ! $bret ) return false; // Time out
2517	+ }
2518	+ }
2519	+ }
2520	+ @ rmdir( $file ); // Try to remove dir, ignore error
2521	+ }
2522	+ else {
2523	+ wppa_dbg_msg( 'Invalid file in wppa_import_dir_to_album(): '.$file );
2524	+ return false;
2525	+ }
2526	+ return true;
2527	+ }
2528	+
2529	+ function wppa_is_wppa_tree( $file ) {
2530	+
2531	+ $temp = explode( '/uploads/wppa/', $file );
2532	+ if ( count( $temp ) === 2 ) {
2533	+ $temp[1] = wppa_expand_id( wppa_strip_ext( $temp[1] ) ) . '.' . wppa_get_ext( $temp[1] );
2534	+ $newf = implode( '/wppa/', $temp );
2535	+ wppa( 'is_wppa_tree', ( $newf != $file ) );
2536	+ }
2537	+ else {
2538	+ wppa( 'is_wppa_tree', false );
2539	+ }
2540	+ return wppa( 'is_wppa_tree' );
2541	+ }
2542	+
2543	+ function wppa_compress_tree_path( $path ) {
2544	+
2545	+ $result = $path;
2546	+ $temp = explode( '/wppa/', $path );
2547	+ if ( count( $temp ) == '2' ) {
2548	+ $temp[1] = str_replace( '/', '', $temp[1] );
2549	+ $result = implode( '/wppa/', $temp );
2550	+ }
2551	+ return $result;
2552	+ }
2553	+
2554	+ function wppa_expand_tree_path( $path ) {
2555	+
2556	+ $result = $path;
2557	+ $temp = explode( '/wppa/', $path );
2558	+ if ( count( $temp ) == '2' ) {
2559	+ $temp[1] = wppa_expand_id( wppa_strip_ext( $temp[1] ) ) . '.' . wppa_get_ext( $temp[1] );
2560	+ $result = implode( '/wppa/', $temp );
2561	+ }
2562	+ return $result;
2563	+ }
2564	+
2565	+ function wppa_abs_walktree( $root, $source ) {
2566	+ static $void_dirs;
2567	+
2568	+ $result = '';
2569	+
2570	+ // Init void dirs
2571	+ if ( ! $void_dirs ) {
2572	+ $void_dirs = array( '.', '..',
2573	+ 'wp-admin',
2574	+ 'wp-includes',
2575	+ 'themes',
2576	+ 'upgrade',
2577	+ 'plugins',
2578	+ 'languages',
2579	+ 'wppa',
2580	+ ( wppa_switch( 'allow_import_source') ? '' : 'wppa-source' ),
2581	+ );
2582	+ }
2583	+
2584	+ // If currently in selected dir, set selected
2585	+ $sel = $root == $source ? ' selected="selected"' : '';
2586	+
2587	+ // Set disabled if there are no files inside
2588	+ $n_files = count( glob( $root . '/*' ) );
2589	+ $n_dirs = count( glob( $root . '/*', GLOB_ONLYDIR ) );
2590	+ $dis = $n_files == $n_dirs ? ' disabled="disabled"' : '';
2591	+
2592	+ // Check for (sub)depot
2593	+ $my_depot = __( '--- My depot --- ' ,'wp-photo-album-plus' );
2594	+ $display = str_replace( WPPA_DEPOT_PATH, $my_depot, $root );
2595	+ if ( strpos( $display, $my_depot ) !== false ) {
2596	+ $dis = '';
2597	+ }
2598	+
2599	+ // Check for ngg gallery dir
2600	+ $ngg_opts = get_option( 'ngg_options', false );
2601	+ if ( $ngg_opts ) {
2602	+ $ngg_gal = __( '--- Ngg Galleries --- ', 'wp-photo-album-plus' );
2603	+ $display = str_replace( rtrim( $ngg_opts['gallerypath'], '/' ), $ngg_gal, $display );
2604	+ $pos = strpos( $display, $ngg_gal );
2605	+ if ( $pos ) {
2606	+ $display = substr( $display, $pos );
2607	+ }
2608	+ }
2609	+
2610	+ // Remove ABSPATH from display string
2611	+ $display = str_replace( ABSPATH, '', $display );
2612	+
2613	+ // Output the selecion if not in the wp dir
2614	+ if ( $root.'/' != ABSPATH ) {
2615	+ $result .=
2616	+ '<option' .
2617	+ ' value="' . $root . '"' .
2618	+ $sel .
2619	+ $dis .
2620	+ ' data-nfiles="' . $n_files . '"' .
2621	+ ' data-ndirs="' . $n_dirs . '"' .
2622	+ ' >' .
2623	+ $display .
2624	+ '</option>';
2625	+ }
2626	+
2627	+ // See if subdirs exist
2628	+ $dirs = glob( $root . '/*', GLOB_ONLYDIR );
2629	+
2630	+ // Go deeper if not in a list of void disnames
2631	+ if ( $dirs ) foreach( $dirs as $path ) {
2632	+ $dir = basename( $path );
2633	+ if ( ! in_array( $dir, $void_dirs ) ) {
2634	+ $newroot = $root . '/' . $dir;
2635	+ $result .= wppa_abs_walktree( $newroot, $source );
2636	+ }
2637	+ }
2638	+
2639	+ return $result;
2640	+ }

wppa-init.php CHANGED Viewed

@@ -4,7 +4,7 @@
+            *
             * This file loads required php files and contains all functions used in init actions.
+            *
-            -
            * Version 6.4.17
             */
             /* LOAD SIDEBAR WIDGETS */
@@ -278,6 +278,45 @@ function wppa_cat_message() {
             	wppa_error_message( __('</strong>The cats system needs to be converted. Please run <b>Photo Albums -> Settings</b> admin page <b>Table VIII-B17</b><strong>' , 'wp-photo-album-plus') );
+            }
             /* This function will add "donate" link to main plugins page */
             function wppa_donate_link($links, $file) {
             	if ( $file == plugin_basename(__FILE__) ) {


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

278	wppa_error_message( __('</strong>The cats system needs to be converted. Please run <b>Photo Albums -> Settings</b> admin page <b>Table VIII-B17</b><strong>' , 'wp-photo-album-plus') );
279	}
280
281	+ function wppa_scripts_are_obssolete() {
282	+ global $wpdb;
283	+
284	+ // This notice dismissed?
285	+ if ( get_option( 'wppa_dismiss_admin_notice_scripts_are_obsolete', 'no' ) == 'yes' ) {
286	+ return;
287	+ }
288	+
289	+ $has_wppa_scripts = $wpdb->get_results( "SELECT `ID`, `post_title`, `post_content`, `post_type` " .
290	+ "FROM `" . $wpdb->prefix . 'posts' ."` " .
291	+ "WHERE `post_status` = 'publish' " .
292	+ "AND ( `post_type` = 'post' OR `post_type` = 'page' ) " .
293	+ "AND `post_content` LIKE '%\\%\\%wppa\\%\\%%' " , ARRAY_A );
294	+
295	+ if ( $has_wppa_scripts ) {
296	+ foreach( array_keys( $has_wppa_scripts ) as $key ) {
297	+ if ( strpos( $has_wppa_scripts[$key]['post_content'], '%%wppa%%' ) === false ) {
298	+ unset( $has_wppa_scripts[$key] );
299	+ }
300	+ }
301	+ }
302	+
303	+ if ( ! empty( $has_wppa_scripts ) ) {
304	+ $msg = __( 'WPPA scripts will no longer be supported in version 6.6. Please convert the %%wppa%% scripts to [wppa][/wppa] shortcodes before upgrading to version 6.6.', 'wp-photo-album-plus' );
305	+ $msg .= '<br /><br />';
306	+ $msg .= __( 'WPPA scripts found in the following Pages / Posts', 'wp-photo-album-plus' );
307	+ $msg .= '<br /><br />';
308	+ foreach( $has_wppa_scripts as $item ) {
309	+ $msg .= $item['ID'] . ' <a href="'. admin_url( 'post.php?post=' . $item['ID'] . '&action=edit' ) .'" title="Edit this ' . $item['post_type'] . '" >' . $item['post_title'] . '</a>' .
310	+ ' at loc:' . strpos( $item['post_content'], '%%wppa%%' ) . ' :' . htmlspecialchars( substr( $item['post_content'] , strpos( $item['post_content'], '%%wppa%%' ), 32 ) ) . '...' .
311	+ '<br />';
312	+ }
313	+ $msg .= '<br />' . sprintf( __( 'For more information see the %s documentation page', 'wp-photo-album-plus' ), '<a href="http://wppa.nl/changelog/script-to-shortcode-conversion/" target="_blank" >Script to shortcode conversion</a>' );
314	+ $msg .= '<br /><div style="float:right;" ><input type="checkbox" onchange="wppaDismissAdminNotice(\'dismiss_admin_notice_scripts_are_obsolete\', this);" > Dismiss this message</div><div style="clear:both;" ></div>';
315	+ $msg .= wp_nonce_field('wppa-nonce', 'wppa-nonce', false, false);
316	+ wppa_warning_message( $msg );
317	+ }
318	+ }
319	+
320	/* This function will add "donate" link to main plugins page */
321	function wppa_donate_link($links, $file) {
322	if ( $file == plugin_basename(__FILE__) ) {

wppa-mobile.php CHANGED Viewed

@@ -1,90 +1,90 @@
-            -
            <?php
-            -
-            -
            /**
-            -
             * Mobile Detect
-            -
             *
-            -
             * @license    http://www.opensource.org/licenses/mit-license.php The MIT License
-            -
             * @version    SVN: $Id: Mobile_Detect.php 3 2009-05-21 13:06:28Z vic.stanciu $
-            -
             * @version    SVN: $Id: Mobile_Detect.php 3 2011-04-19 18:44:28Z sjevsejev $
-            -
             */
-            -
-            -
            class wppa_mobile_detect {
-            -
-            -
                protected $accept;
-            -
                protected $userAgent;
-            -
-            -
                protected $isMobile     = false;
-            -
                protected $isAndroid    = null;
-            -
                protected $isBlackberry = null;
-            -
                protected $isIphone     = null;
-            -
                protected $isIpad       = null;
-            -
                protected $isOpera      = null;
-            -
                protected $isPalm       = null;
-            -
                protected $isWindows    = null;
-            -
                protected $isGeneric    = null;
-            -
-            -
                protected $devices = array(
-            -
                    "android"       => "android",
-            -
                    "blackberry"    => "blackberry",
-            -
                    "iphone"        => "(iphone|ipod)",
-            -
                    "ipad"          => "ipad",
-            -
                    "opera"         => "opera mini",
-            -
                    "palm"          => "(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)",
-            -
                    "windows"       => "windows ce; (iemobile|ppc|smartphone)",
-            -
                    "generic"       => "(kindle|mobile|mmp|midp|o2|pda|pocket|psp|symbian|smartphone|treo|up.browser|up.link|vodafone|wap)"
-            -
                );
-            -
-            -
                public function __construct() {
-            -
                    $this->userAgent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '';
-            -
                    $this->accept    = isset( $_SERVER['HTTP_ACCEPT'] ) ? $_SERVER['HTTP_ACCEPT'] : '';
-            -
-            -
                    if (isset($_SERVER['HTTP_X_WAP_PROFILE'])|| isset($_SERVER['HTTP_PROFILE'])) {
-            -
                        $this->isMobile = true;
-            -
                    } elseif (strpos($this->accept,'text/vnd.wap.wml') > 0 || strpos($this->accept,'application/vnd.wap.xhtml+xml') > 0) {
-            -
                        $this->isMobile = true;
-            -
                    } else {
-            -
                        foreach ($this->devices as $device => $regexp) {
-            -
                            if ($this->isDevice($device)) {
-            -
                                $this->isMobile = true;
-            -
                            }
-            -
                        }
-            -
                    }
-            -
                }
-            -
-            -
-            -
                /**
-            -
                 * Overloads isAndroid() | isBlackberry() | isOpera() | isPalm() | isWindows() | isGeneric() through isDevice()
-            -
                 *
-            -
                 * @param string $name
-            -
                 * @param array $arguments
-            -
                 * @return bool
-            -
                 */
-            -
                public function __call($name, $arguments) {
-            -
                    $device = strtolower(substr($name, 2));
-            -
                    if ($name == "is" . ucfirst($device)) {
-            -
                        return $this->isDevice($device);
-            -
                    } else {
-            -
                        trigger_error("Method $name not defined", E_USER_ERROR);
-            -
                    }
-            -
                }
-            -
-            -
-            -
                /**
-            -
                 * Returns true if any type of mobile device detected, including special ones
-            -
                 * @return bool
-            -
                 */
-            -
                public function isMobile() {
-            -
                    return $this->isMobile;
-            -
                }
-            -
-            -
                protected function isDevice($device) {
-            -
                    $var    = "is" . ucfirst($device);
-            -
                    $return = $this->$var === null ? (bool) preg_match("/" . $this->devices[$device] . "/i", $this->userAgent) : $this->$var;
-            -
-            -
                    if ($device != 'generic' && $return == true) {
-            -
                        $this->isGeneric = false;
-            -
                    }
-            -
-            -
                    return $return;
-            -
                }
+            }


1	+ <?php
2	+
3	+ /**
4	+ * Mobile Detect
5	+ *
6	+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
7	+ * @version SVN: $Id: Mobile_Detect.php 3 2009-05-21 13:06:28Z vic.stanciu $
8	+ * @version SVN: $Id: Mobile_Detect.php 3 2011-04-19 18:44:28Z sjevsejev $
9	+ */
10	+
11	+ class wppa_mobile_detect {
12	+
13	+ protected $accept;
14	+ protected $userAgent;
15	+
16	+ protected $isMobile = false;
17	+ protected $isAndroid = null;
18	+ protected $isBlackberry = null;
19	+ protected $isIphone = null;
20	+ protected $isIpad = null;
21	+ protected $isOpera = null;
22	+ protected $isPalm = null;
23	+ protected $isWindows = null;
24	+ protected $isGeneric = null;
25	+
26	+ protected $devices = array(
27	+ "android" => "android",
28	+ "blackberry" => "blackberry",
29	+ "iphone" => "(iphone\|ipod)",
30	+ "ipad" => "ipad",
31	+ "opera" => "opera mini",
32	+ "palm" => "(avantgo\|blazer\|elaine\|hiptop\|palm\|plucker\|xiino)",
33	+ "windows" => "windows ce; (iemobile\|ppc\|smartphone)",
34	+ "generic" => "(kindle\|mobile\|mmp\|midp\|o2\|pda\|pocket\|psp\|symbian\|smartphone\|treo\|up.browser\|up.link\|vodafone\|wap)"
35	+ );
36	+
37	+ public function __construct() {
38	+ $this->userAgent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '';
39	+ $this->accept = isset( $_SERVER['HTTP_ACCEPT'] ) ? $_SERVER['HTTP_ACCEPT'] : '';
40	+
41	+ if (isset($_SERVER['HTTP_X_WAP_PROFILE'])\|\| isset($_SERVER['HTTP_PROFILE'])) {
42	+ $this->isMobile = true;
43	+ } elseif (strpos($this->accept,'text/vnd.wap.wml') > 0 \|\| strpos($this->accept,'application/vnd.wap.xhtml+xml') > 0) {
44	+ $this->isMobile = true;
45	+ } else {
46	+ foreach ($this->devices as $device => $regexp) {
47	+ if ($this->isDevice($device)) {
48	+ $this->isMobile = true;
49	+ }
50	+ }
51	+ }
52	+ }
53	+
54	+
55	+ /**
56	+ * Overloads isAndroid() \| isBlackberry() \| isOpera() \| isPalm() \| isWindows() \| isGeneric() through isDevice()
57	+ *
58	+ * @param string $name
59	+ * @param array $arguments
60	+ * @return bool
61	+ */
62	+ public function __call($name, $arguments) {
63	+ $device = strtolower(substr($name, 2));
64	+ if ($name == "is" . ucfirst($device)) {
65	+ return $this->isDevice($device);
66	+ } else {
67	+ trigger_error("Method $name not defined", E_USER_ERROR);
68	+ }
69	+ }
70	+
71	+
72	+ /**
73	+ * Returns true if any type of mobile device detected, including special ones
74	+ * @return bool
75	+ */
76	+ public function isMobile() {
77	+ return $this->isMobile;
78	+ }
79	+
80	+ protected function isDevice($device) {
81	+ $var = "is" . ucfirst($device);
82	+ $return = $this->$var === null ? (bool) preg_match("/" . $this->devices[$device] . "/i", $this->userAgent) : $this->$var;
83	+
84	+ if ($device != 'generic' && $return == true) {
85	+ $this->isGeneric = false;
86	+ }
87	+
88	+ return $return;
89	+ }
90	}

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 6.4.19
7	*
8	*/
9
	@@ -1550,11 +1550,26 @@ global $wpdb;
1550	background-color: rgb( 224, 255, 224 );
1551	border-color: rgb( 85, 238, 85 );
1552	}
1553	- .wppa-pending {
1554	border: 1px solid;
1555	background-color: rgb( 255, 235, 232 );
1556	border-color: rgb( 204, 0, 0 );
1557	}















1558	</style>
1559	<script>
1560	jQuery( function() {


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

1550	background-color: rgb( 224, 255, 224 );
1551	border-color: rgb( 85, 238, 85 );
1552	}
1553	+ .wppa-pending, .wppa-scheduled, .wppa-private {
1554	border: 1px solid;
1555	background-color: rgb( 255, 235, 232 );
1556	border-color: rgb( 204, 0, 0 );
1557	}
1558	+ .wppa-bronze {
1559	+ border: 1px solid;
1560	+ background-color: rgb( 221, 221, 187 );
1561	+ border-color: rgb( 204, 204, 170 );
1562	+ }
1563	+ .wppa-silver {
1564	+ border: 1px solid;
1565	+ background-color: rgb( 255, 255, 255 );
1566	+ border-color: rgb( 238, 238, 238 );
1567	+ }
1568	+ .wppa-gold {
1569	+ border: 1px solid;
1570	+ background-color: rgb( 238, 238, 204 );
1571	+ border-color: rgb( 221, 221, 187 );
1572	+ }
1573	</style>
1574	<script>
1575	jQuery( function() {

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 6.5.01
7	*
8	*/
9
	@@ -2888,6 +2888,24 @@ global $wp_version;
2888	$clas = 'wppa_feup';
2889	$tags = 'upload';
2890	wppa_setting($slug, '15', $name, $desc, $html, $help, $clas, $tags);


















2891
2892	}
2893	wppa_setting_subheader( 'J', '1', __( 'Miscellaneous visibility settings' , 'wp-photo-album-plus') );
	@@ -6100,6 +6118,17 @@ global $wp_version;
6100	$clas = '';
6101	$tags = 'access,album';
6102	wppa_setting($slug, '2', $name, $desc, $html, $help, $clas, $tags);











6103
6104	// User upload limits
6105	$options = array( __('for ever', 'wp-photo-album-plus'),


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

2888	$clas = 'wppa_feup';
2889	$tags = 'upload';
2890	wppa_setting($slug, '15', $name, $desc, $html, $help, $clas, $tags);
2891	+
2892	+ $name = __('Blog It!', 'wp-photo-album-plus');
2893	+ $desc = __('Enable blogging photos.', 'wp-photo-album-plus');
2894	+ $help = esc_js( __('Users need the capability edit_posts to directly blog photos.', 'wp-photo-album-plus'));
2895	+ $slug = 'wppa_blog_it';
2896	+ $html = wppa_checkbox($slug);
2897	+ $clas = 'wppa_feup';
2898	+ $tags = 'upload';
2899	+ wppa_setting($slug, '16', $name, $desc, $html, $help, $clas, $tags);
2900	+
2901	+ $name = __('Blog It need moderation', 'wp-photo-album-plus');
2902	+ $desc = __('Posts with blogged photos need moderation.', 'wp-photo-album-plus');
2903	+ $help = '';
2904	+ $slug = 'wppa_blog_it_moderate';
2905	+ $html = wppa_checkbox($slug);
2906	+ $clas = 'wppa_feup';
2907	+ $tags = 'upload';
2908	+ wppa_setting($slug, '17', $name, $desc, $html, $help, $clas, $tags);
2909
2910	}
2911	wppa_setting_subheader( 'J', '1', __( 'Miscellaneous visibility settings' , 'wp-photo-album-plus') );

6118	$clas = '';
6119	$tags = 'access,album';
6120	wppa_setting($slug, '2', $name, $desc, $html, $help, $clas, $tags);
6121	+
6122	+ $name = __('User create Albums Captcha', 'wp-photo-album-plus');
6123	+ $desc = __('Uer must answer security question.', 'wp-photo-album-plus');
6124	+ $help = '';
6125	+ $slug = 'wppa_user_create_captcha';
6126	+ $html1 = wppa_checkbox($slug);
6127	+ $html2 = '';
6128	+ $html = array( $html1, $html2 );
6129	+ $clas = '';
6130	+ $tags = 'access,album';
6131	+ wppa_setting($slug, '3', $name, $desc, $html, $help, $clas, $tags);
6132
6133	// User upload limits
6134	$options = array( __('for ever', 'wp-photo-album-plus'),

wppa-setup.php CHANGED Viewed

	@@ -43,6 +43,7 @@ global $silent;
43	if ( $old_rev == $wppa_revno && ! $force ) return; // Nothing to do here
44
45	wppa_clear_cache(true); // Clear cache

46
47	$wppa_error = false; // Init no error
48
	@@ -874,6 +875,8 @@ Hide Camera info
874	'wppa_up_tag_input_title' => __( 'Enter new tags:' , 'wp-photo-album-plus'),
875	'wppa_up_tag_preview' => 'yes',
876	'wppa_camera_connect' => 'yes',


877
878	// J Custom datafields
879	'wppa_album_custom_fields' => 'no',
	@@ -1300,6 +1303,7 @@ Hide Camera info
1300	'wppa_spam_maxage' => 'none',
1301	'wppa_user_create_on' => 'no',
1302	'wppa_user_create_login' => 'yes',

1303	'wppa_user_destroy_on' => 'no',
1304	'wppa_upload_fronend_maxsize' => '0',
1305	'wppa_void_dups' => 'no',
	@@ -1592,8 +1596,11 @@ Hide Camera info
1592	// QR code settings
1593	'wppa_qr_size' => '200',
1594	'wppa_qr_color' => '#000000',
1595	- 'wppa_qr_bgcolor' => '#FFFFFF'
1596



1597	);
1598
1599	array_walk( $wppa_defaults, 'wppa_set_default', $force );


43	if ( $old_rev == $wppa_revno && ! $force ) return; // Nothing to do here
44
45	wppa_clear_cache(true); // Clear cache
46	+ delete_option( 'wppa_dismiss_admin_notice_scripts_are_obsolete' );
47
48	$wppa_error = false; // Init no error
49

875	'wppa_up_tag_input_title' => __( 'Enter new tags:' , 'wp-photo-album-plus'),
876	'wppa_up_tag_preview' => 'yes',
877	'wppa_camera_connect' => 'yes',
878	+ 'wppa_blog_it' => 'no',
879	+ 'wppa_blog_it_moderate' => 'yes',
880
881	// J Custom datafields
882	'wppa_album_custom_fields' => 'no',

1303	'wppa_spam_maxage' => 'none',
1304	'wppa_user_create_on' => 'no',
1305	'wppa_user_create_login' => 'yes',
1306	+ 'wppa_user_create_captcha' => 'yes', // VII-B3
1307	'wppa_user_destroy_on' => 'no',
1308	'wppa_upload_fronend_maxsize' => '0',
1309	'wppa_void_dups' => 'no',

1596	// QR code settings
1597	'wppa_qr_size' => '200',
1598	'wppa_qr_color' => '#000000',
1599	+ 'wppa_qr_bgcolor' => '#FFFFFF',
1600
1601	+
1602	+ 'wppa_dismiss_admin_notice_scripts_are_obsolete' => 'no',
1603	+
1604	);
1605
1606	array_walk( $wppa_defaults, 'wppa_set_default', $force );

wppa-source.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains photo source file management routines
6	- * Version 6.4.17
7	*
8	*/
9
	@@ -136,6 +136,8 @@ global $wppa_supported_photo_extensions;
136	foreach( $supext as $ext ) {
137	if ( is_file( $frompath.'.'.$ext ) ) {
138	@ copy( $frompath.'.'.$ext, $topath.'.'.$ext );


139	@ copy( $frompath.'-o1.'.$ext, $topath.'-o1.'.$ext );
140	}
141	}


3	* Package: wp-photo-album-plus
4	*
5	* Contains photo source file management routines
6	+ * Version 6.5.02
7	*
8	*/
9

136	foreach( $supext as $ext ) {
137	if ( is_file( $frompath.'.'.$ext ) ) {
138	@ copy( $frompath.'.'.$ext, $topath.'.'.$ext );
139	+ }
140	+ if ( is_file( $frompath.'-o1.'.$ext ) ) {
141	@ copy( $frompath.'-o1.'.$ext, $topath.'-o1.'.$ext );
142	}
143	}

wppa-tinymce-shortcodes.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Pachkage: wp-photo-album-plus
4	*
5	*
6	- * Version 6.4.17
7	*
8	*/
9
	@@ -600,8 +600,10 @@ global $wpdb;
600	'<br />'.
601	'<small>'.
602	__('Specify the horizontal size in pixels or <span style="color:blue" >auto</span>.', 'wp-photo-album-plus').' '.
603	- __('A value less than <span style="color:blue" >100</span> will automaticly be interpreted as a <span style="color:blue" >percentage</span> of the available space.', 'wp-photo-album-plus').~~'<br />'.~~
604	- __('~~Leave~~ ~~this~~ ~~blank~~ ~~for~~ ~~default~~ ~~size~~', 'wp-photo-album-plus').'~~</small>~~'.


605	'</td>'.
606	'</tr>'.
607


3	* Pachkage: wp-photo-album-plus
4	*
5	*
6	+ * Version 6.5.02
7	*
8	*/
9

600	'<br />'.
601	'<small>'.
602	__('Specify the horizontal size in pixels or <span style="color:blue" >auto</span>.', 'wp-photo-album-plus').' '.
603	+ __('A value less than <span style="color:blue" >100</span> will automaticly be interpreted as a <span style="color:blue" >percentage</span> of the available space.', 'wp-photo-album-plus').
604	+ __('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 />'.
605	+ __('Leave this blank for default size', 'wp-photo-album-plus').
606	+ '</small>'.
607	'</td>'.
608	'</tr>'.
609

wppa-upload.php CHANGED Viewed

@@ -2,8 +2,8 @@
             /* wppa-upload.php
             * Package: wp-photo-album-plus
+            *
-            -
            * Contains all the upload/import pages and functions
-            -
            * Version 6.4.19
+            *
             */
@@ -13,19 +13,59 @@ if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
             function _wppa_page_upload() {
             global $target;
             global $wppa_revno;
                 // sanitize system
             	$user = wppa_get_user();
             	wppa_sanitize_files();
-            -
            	// Update watermark settings for the user ifnew values supplied
             	if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
-            -
            		if ( isset( $_POST['wppa-watermark-file'] ) ) update_option( 'wppa_watermark_file_'.$user, $_POST['wppa-watermark-file'] );
-            -
            		if ( isset( $_POST['wppa-watermark-pos'] ) ) update_option( 'wppa_watermark_pos_'.$user, $_POST['wppa-watermark-pos'] );
+            	}
             	// If from album admin set the last album
-            -
            	if ( isset( $_REQUEST['wppa-set-album'] ) ) wppa_set_last_album( $_REQUEST['wppa-set-album'] );
             	// Do the upload if requested
             	// From BOX A
@@ -35,7 +75,7 @@ global $wppa_revno;
             		if ( isset( $_POST['wppa-go-edit-multiple'] ) ) {
             			if ( current_user_can( 'wppa_admin' ) ) {
             				wppa_ok_message( __( 'Connecting to edit album...' , 'wp-photo-album-plus' ) ); ?>
-            -
            				<script type="text/javascript">document.location = '<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu&tab=edit&edit_id='.$_POST['wppa-album'], 'js' ) ) ?>';</script>
             			<?php }
             			else {
             				wppa_ok_message( __( 'Connecting to edit photos...' , 'wp-photo-album-plus' ) ); ?>
@@ -50,7 +90,7 @@ global $wppa_revno;
             		if ( isset( $_POST['wppa-go-edit-single'] ) ) {
             			if ( current_user_can( 'wppa_admin' ) ) {
             				wppa_ok_message( __( 'Connecting to edit album...' , 'wp-photo-album-plus' ) ); ?>
-            -
            				<script type="text/javascript">document.location = '<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu&tab=edit&edit_id='.$_POST['wppa-album'], 'js' ) ) ?>';</script>
             			<?php }
             			else {
             				wppa_ok_message( __( 'Connecting to edit photos...' , 'wp-photo-album-plus' ) ); ?>
@@ -72,27 +112,13 @@ global $wppa_revno;
             	// sanitize system again
             	wppa_sanitize_files();
-            -
            	?>
-            -
            	<div class="wrap">
-            -
            		<?php $iconurl = WPPA_URL.'/images/camera32.png'; ?>
-            -
            		<div id="icon-camera" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat">
-            -
            		</div>
-            -
            		<?php $iconurl = WPPA_URL.'/images/arrow32.png'; ?>
-            -
            		<div id="icon-arrow" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat">
-            -
            		</div>
-            -
            		<?php $iconurl = WPPA_URL.'/images/album32.png'; ?>
-            -
            		<div id="icon-album" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat">
-            -
            		<br />
-            -
            		</div>
-            -
            		<h2><?php _e( 'Upload Photos' , 'wp-photo-album-plus'); ?></h2>
-            -
-            -
            		<?php
-            -
            		// Check for trivial requirements
-            -
            		if ( ! function_exists( 'wppa_imagecreatefromjpeg' ) ) {
-            -
            			wppa_error_message( __( 'There is a serious misconfiguration in your servers PHP config. Function wppa_imagecreatefromjpeg() does not exist. You will encounter problems when uploading photos and not be able to generate thumbnail images. Ask your hosting provider to add GD support with a minimal version 1.8.' , 'wp-photo-album-plus' ) );
-            -
            		}
             		$max_files = ini_get( 'max_file_uploads' );
             		$max_files_txt = $max_files;
             		if ( $max_files < '1' ) {
@@ -101,1252 +127,367 @@ global $wppa_revno;
+            		}
             		$max_size = ini_get( 'upload_max_filesize' );
             		$max_time = ini_get( 'max_input_time' );
-            -
            		if ( $max_time < '1' ) $max_time = __( 'unknown' , 'wp-photo-album-plus' );
-            -
-            -
            		// chek if albums exist before allowing upload
-            -
            		if ( wppa_has_albums() ) {
-            -
            			if ( wppa_switch( 'upload_one_only' ) && ! wppa_user_is( 'administrator' ) ) {
-            -
            				/* One only */ ?>
-            -
            				<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px;">
-            -
            					<h3 style="margin-top:0px;"><?php _e( 'Upload a single photo' , 'wp-photo-album-plus'); ?></h3>
-            -
            					<form enctype="multipart/form-data" action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_upload_photos' ) ) ?>" method="post">
-            -
            					<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE ); ?>
-            -
            						<input id="my_files" type="file" name="my_files[]" />
-            -
            						<p>
-            -
            							<label for="wppa-album"><?php _e( 'Album:' , 'wp-photo-album-plus'); ?> </label>
-            -
            							<select name="wppa-album" id="wppa-album-s">
-            -
            								<?php echo wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ),'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) ) ?>
-            -
            							</select>
-            -
            						</p>
-            -
            						<?php if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) { ?>
-            -
            							<p>
-            -
            								<?php _e( 'Apply watermark file:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-file" id="wppa-watermark-file">
-            -
            									<?php echo( wppa_watermark_file_select() ) ?>
-            -
            								</select>
-            -
-            -
            								<?php _e( 'Position:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-pos" id="wppa-watermark-pos">
-            -
            									<?php echo( wppa_watermark_pos_select() ) ?>
-            -
            								</select>
-            -
            							</p>
-            -
            						<?php } ?>
-            -
            						<input type="submit" class="button-primary" name="wppa-upload-multiple" value="<?php _e( 'Upload Photo' , 'wp-photo-album-plus') ?>" onclick="if ( document.getElementById( 'wppa-album-s' ).value == 0 ) { alert( '<?php _e( 'Please select an album' , 'wp-photo-album-plus') ?>' ); return false; }" />
-            -
            						<input type="checkbox" id="wppa-go-edit-multiple" name="wppa-go-edit-multiple" style="display:none" checked="checked" />&nbsp;
-            -
            					</form>
-            -
            				</div>
-            -
            <?php		}
-            -
            			else { ?>
-            -
            				<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px; background-color:#fffbcc; border-color:#e6db55;">
-            -
            				<?php echo( sprintf( __( '<b>Notice:</b> your server allows you to upload <b>%s</b> files of maximum total <b>%s</b> bytes and allows <b>%s</b> seconds to complete.' , 'wp-photo-album-plus' ), $max_files_txt, $max_size, $max_time ) ) ?>
-            -
            				<?php _e( 'If your request exceeds these limitations, it will fail, probably without an errormessage.' , 'wp-photo-album-plus' ) ?>
-            -
            				<?php _e( 'Additionally your hosting provider may have set other limitations on uploading files.' , 'wp-photo-album-plus' ) ?>
-            -
            				<?php echo '<br />'.wppa_check_memory_limit() ?>
-            -
            				</div>
-            -
            				<?php /* Multple photos */ ?>
-            -
            				<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px;">
-            -
            					<h3 style="margin-top:0px;"><?php _e( 'Box A:' , 'wp-photo-album-plus'); echo ' ';_e( 'Multiple Photos in one selection' , 'wp-photo-album-plus'); ?></h3>
-            -
            					<?php echo sprintf( __( 'You can select up to %s photos in one selection and upload them.' , 'wp-photo-album-plus'), $max_files_txt ); ?>
-            -
            					<br /><small style="color:blue" ><?php _e( 'You need a modern browser that supports HTML-5 to select multiple files' , 'wp-photo-album-plus') ?></small>
-            -
            					<form enctype="multipart/form-data" action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_upload_photos' ) ) ?>" method="post">
-            -
            					<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE ); ?>
-            -
            						<input id="my_files" type="file" multiple="multiple" name="my_files[]" onchange="showit()" />
-            -
            						<div id="files_list2">
-            -
            							<h3><?php _e( 'Selected Files:' , 'wp-photo-album-plus'); ?></h3>
-            -
-            -
            						</div>
-            -
            						<script type="text/javascript">
-            -
            							function showit() {
-            -
            								var maxsize = parseInt( '<?php echo $max_size ?>' ) * 1024 * 1024;
-            -
            								var maxcount = parseInt( '<?php echo $max_files_txt ?>' );
-            -
            								var totsize = 0;
-            -
            								var files = document.getElementById( 'my_files' ).files;
-            -
            								var tekst = '<h3><?php _e( 'Selected Files:' , 'wp-photo-album-plus') ?></h3>';
-            -
            								tekst += '<table><thead><tr>';
-            -
            										tekst += '<td><?php _e( 'Name' , 'wp-photo-album-plus') ?></td><td><?php _e( 'Size' , 'wp-photo-album-plus') ?></td><td><?php _e( 'Type' , 'wp-photo-album-plus') ?></td>';
-            -
            									tekst += '</tr></thead>';
-            -
            									tekst += '<tbody>';
-            -
            										tekst += '<tr><td><hr /></td><td><hr /></td><td><hr /></td></tr>';
-            -
            										for ( var i=0;i<files.length;i++ ) {
-            -
            											tekst += '<tr>';
-            -
            												tekst += '<td>' + files[i].name + '</td>';
-            -
            												tekst += '<td>' + files[i].size + '</td>';
-            -
            												totsize += files[i].size;
-            -
            												tekst += '<td>' + files[i].type + '</td>';
-            -
            											tekst += '</tr>';
-            -
            										}
-            -
            										tekst += '<tr><td><hr /></td><td><hr /></td><td><hr /></td></tr>';
-            -
            									var style1 = '';
-            -
            									var style2 = '';
-            -
            									var style3 = '';
-            -
            									var warn1 = '';
-            -
            									var warn2 = '';
-            -
            									var warn3 = '';
-            -
            									if ( maxcount > 0 && files.length > maxcount ) {
-            -
            										style1 = 'color:red';
-            -
            										warn1 = '<?php _e( 'Too many!' , 'wp-photo-album-plus') ?>';
-            -
            									}
-            -
            									if ( maxsize > 0 && totsize > maxsize ) {
-            -
            										style2 = 'color:red';
-            -
            										warn2 = '<?php _e( 'Too big!' , 'wp-photo-album-plus') ?>';
-            -
            									}
-            -
            									if ( warn1 || warn2 ) {
-            -
            										style3 = 'color:green';
-            -
            										warn3 = '<?php _e( 'Try again!' , 'wp-photo-album-plus') ?>';
-            -
            									}
-            -
            									tekst += '<tr><td style="'+style1+'" ><?php _e( 'Total' , 'wp-photo-album-plus') ?>: '+files.length+' '+warn1+'</td><td style="'+style2+'" >'+totsize+' '+warn2+'</td><td style="'+style3+'" >'+warn3+'</td></tr>';
-            -
            									tekst += '</tbody>';
-            -
            								tekst += '</table>';
-            -
            								jQuery( '#files_list2' ).html( tekst );
-            -
            							}
-            -
            						</script>
-            -
            						<p>
-            -
            							<label for="wppa-album"><?php _e( 'Album:' , 'wp-photo-album-plus'); ?> </label>
-            -
            							<select name="wppa-album" id="wppa-album-s">
-            -
            								<?php echo wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ), 'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) ) ?>
-            -
            							</select>
-            -
            						</p>
-            -
            						<?php if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) { ?>
-            -
            							<p>
-            -
            								<?php _e( 'Apply watermark file:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-file" id="wppa-watermark-file">
-            -
            									<?php echo( wppa_watermark_file_select() ) ?>
-            -
            								</select>
-            -
-            -
            								<?php _e( 'Position:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-pos" id="wppa-watermark-pos">
-            -
            									<?php echo( wppa_watermark_pos_select() ) ?>
-            -
            								</select>
-            -
            							</p>
-            -
            						<?php } ?>
-            -
            						<input  type="submit" class="button-primary" name="wppa-upload-multiple" value="<?php _e( 'Upload Multiple Photos' , 'wp-photo-album-plus') ?>" onclick="if ( document.getElementById( 'wppa-album-s' ).value == 0 ) { alert( '<?php _e( 'Please select an album' , 'wp-photo-album-plus') ?>' ); return false; }" />
-            -
            						<input type="checkbox" id="wppa-go-edit-multiple" name="wppa-go-edit-multiple" onchange="wppaCookieCheckbox( this, 'wppa-go-edit-multiple' )" />&nbsp;
-            -
            						<script type="text/javascript" >
-            -
            							if ( wppa_getCookie( 'wppa-go-edit-multiple' ) == 'on' ) document.getElementById( 'wppa-go-edit-multiple' ).checked = 'checked';
-            -
            						</script>
-            -
            						<?php
-            -
            						if ( current_user_can( 'wppa_admin' ) ) {
-            -
            							_e( 'After upload: Go to the <b>Edit Album</b> page.' , 'wp-photo-album-plus');
-            -
            						}
-            -
            						else {
-            -
            							_e( 'After upload: Go to the <b>Edit Photos</b> page.' , 'wp-photo-album-plus');
-            -
            						}
-            -
            						?>
-            -
            					</form>
-            -
            				</div>
-            -
            				<?php /* End multiple */ ?>
-            -
-            -
            				<?php /* Single photos */ ?>
-            -
            				<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px;">
-            -
            					<h3 style="margin-top:0px;"><?php  _e( 'Box B:' , 'wp-photo-album-plus'); echo ' ';_e( 'Single Photos in multiple selections' , 'wp-photo-album-plus'); ?></h3>
-            -
            					<?php echo sprintf( __( 'You can select up to %s photos one by one and upload them at once.' , 'wp-photo-album-plus'), $max_files_txt ); ?>
-            -
            					<form enctype="multipart/form-data" action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_upload_photos' ) ) ?>" method="post">
-            -
            					<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE ); ?>
-            -
            						<input id="my_file_element" type="file" name="file_1" />
-            -
            						<div id="files_list">
-            -
            							<h3><?php _e( 'Selected Files:' , 'wp-photo-album-plus'); ?></h3>
-            -
-            -
            						</div>
-            -
            						<p>
-            -
            							<label for="wppa-album"><?php _e( 'Album:' , 'wp-photo-album-plus'); ?> </label>
-            -
            							<select name="wppa-album" id="wppa-album-m">
-            -
            								<?php echo wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ), 'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) );//( '', '', false, false, false, false, false, true ) ); ?>
-            -
            							</select>
-            -
            						</p>
-            -
            						<?php if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) { ?>
-            -
            							<p>
-            -
            								<?php _e( 'Apply watermark file:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-file" id="wppa-watermark-file">
-            -
            									<?php echo( wppa_watermark_file_select() ) ?>
-            -
            								</select>
-            -
-            -
            								<?php _e( 'Position:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-pos" id="wppa-watermark-pos">
-            -
            									<?php echo( wppa_watermark_pos_select() ) ?>
-            -
            								</select>
-            -
            							</p>
-            -
            						<?php } ?>
-            -
            						<input type="submit" class="button-primary" name="wppa-upload" value="<?php _e( 'Upload Single Photos' , 'wp-photo-album-plus') ?>" onclick="if ( document.getElementById( 'wppa-album-m' ).value == 0 ) { alert( '<?php _e( 'Please select an album' , 'wp-photo-album-plus') ?>' ); return false; }" />
-            -
            						<input type="checkbox" id="wppa-go-edit-single" name="wppa-go-edit-single" onchange="wppaCookieCheckbox( this, 'wppa-go-edit-single' )" />&nbsp;
-            -
            						<script type="text/javascript" >
-            -
            							if ( wppa_getCookie( 'wppa-go-edit-single' ) == 'on' ) document.getElementById( 'wppa-go-edit-single' ).checked = 'checked';
-            -
            						</script>
-            -
            						<?php
-            -
            						if ( current_user_can( 'wppa_admin' ) ) {
-            -
            							_e( 'After upload: Go to the <b>Edit Album</b> page.' , 'wp-photo-album-plus');
-            -
            						}
-            -
            						else {
-            -
            							_e( 'After upload: Go to the <b>Edit Photos</b> page.' , 'wp-photo-album-plus');
-            -
            						}
-            -
            						?>
-            -
            					</form>
-            -
            					<script type="text/javascript">
-            -
            					<!-- Create an instance of the multiSelector class, pass it the output target and the max number of files -->
-            -
            						var multi_selector = new MultiSelector( document.getElementById( 'files_list' ), <?php echo( $max_files ) ?> );
-            -
            					<!-- Pass in the file element -->
-            -
            						multi_selector.addElement( document.getElementById( 'my_file_element' ) );
-            -
            					</script>
-            -
            				</div>
-            -
            				<?php /* End single photos */ ?>
-            -
-            -
            				<?php /* Single zips */ ?>
-            -
            				<?php if ( current_user_can( 'wppa_import' ) ) { ?>
-            -
            					<?php if ( PHP_VERSION_ID >= 50207 ) { ?>
-            -
            						<div style="border:1px solid #ccc; padding:10px; width: 600px;">
-            -
            							<h3 style="margin-top:0px;"><?php  _e( 'Box C:' , 'wp-photo-album-plus'); echo ' ';_e( 'Zipped Photos in one selection' , 'wp-photo-album-plus'); ?></h3>
-            -
            							<?php echo sprintf( __( 'You can upload one zipfile. It will be placed in your personal wppa-depot: <b>.../%s</b><br/>Once uploaded, use <b>Import Photos</b> to unzip the file and place the photos in any album.' , 'wp-photo-album-plus'), WPPA_DEPOT ) ?>
-            -
            							<form enctype="multipart/form-data" action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_upload_photos' ) ) ?>" method="post">
-            -
            							<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE ); ?>
-            -
            								<input id="my_zipfile_element" type="file" name="file_zip" /><br/><br/>
-            -
            								<input type="submit" class="button-primary" name="wppa-upload-zip" value="<?php _e( 'Upload Zipped Photos' , 'wp-photo-album-plus') ?>" />
-            -
            								<input type="checkbox" id="wppa-go-import" name="wppa-go-import" onchange="wppaCookieCheckbox( this, 'wppa-go-import' )" />&nbsp;
-            -
            								<script type="text/javascript" >
-            -
            									if ( wppa_getCookie( 'wppa-go-import' ) == 'on' ) document.getElementById( 'wppa-go-import' ).checked = 'checked';
-            -
            								</script>
-            -
            								<?php _e( 'After upload: Go to the <b>Import Photos</b> page.' , 'wp-photo-album-plus') ?>
-            -
            							</form>
-            -
            						</div>
-            -
            					<?php }
-            -
            					else { ?>
-            -
            						<div style="border:1px solid #ccc; padding:10px; width: 600px;">
-            -
            						<?php _e( '<small>Ask your administrator to upgrade php to version 5.2.7 or later. This will enable you to upload zipped photos.</small>' , 'wp-photo-album-plus') ?>
-            -
            						</div>
-            -
            					<?php }
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            	else { ?>
-            -
            			<?php $url = wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu' ); ?>
-            -
            			<p><?php _e( 'No albums exist. You must' , 'wp-photo-album-plus'); ?> <a href="<?php echo( $url ) ?>"><?php _e( 'create one' , 'wp-photo-album-plus'); ?></a> <?php _e( 'beofre you can upload your photos.' , 'wp-photo-album-plus'); ?></p>
-            -
            <?php } ?>
-            -
            	</div>
-            -
            <?php
-            -
            }
-            -
-            -
            // import images admin page
-            -
            function _wppa_page_import() {
-            -
            global $wppa_revno;
-            -
            global $wpdb;
-            -
            global $wppa_supported_photo_extensions;
-            -
            global $wppa_supported_video_extensions;
-            -
            global $wppa_supported_audio_extensions;
-            -
            global $wppa_session;
-            -
-            -
            	if ( wppa( 'ajax' ) ) ob_start();	// Suppress output if ajax operation
-            -
-            -
            	// Init
-            -
            	$ngg_opts 	= get_option( 'ngg_options', false );
-            -
            	$user 		= wppa_get_user();
-            -
-            -
            	// Check database
-            -
            	wppa_check_database( true );
-            -
-            -
            	// Update watermark settings
-            -
            	if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
-            -
            		if ( isset( $_POST['wppa-watermark-file'] ) ) update_option( 'wppa_watermark_file_'.$user, $_POST['wppa-watermark-file'] );
-            -
            		if ( isset( $_POST['wppa-watermark-pos'] ) ) update_option( 'wppa_watermark_pos_'.$user, $_POST['wppa-watermark-pos'] );
-            -
            	}
-            -
-            -
            	// Update last used albums
-            -
            	if ( isset( $_POST['wppa-photo-album'] ) ) {
-            -
            		update_option( 'wppa-photo-album-import-'.wppa_get_user(), $_POST['wppa-photo-album'] );	// nog in form verwerken
-            -
            	}
-            -
            	if ( isset( $_POST['wppa-video-album'] ) ) {
-            -
            		update_option( 'wppa-video-album-import-'.wppa_get_user(), $_POST['wppa-video-album'] );
-            -
            	}
-            -
            	if ( isset( $_POST['wppa-audio-album'] ) ) {
-            -
            		update_option( 'wppa-audio-album-import-'.wppa_get_user(), $_POST['wppa-audio-album'] );
-            -
            	}
-            -
-            -
            	// Verify last albums still exist
-            -
            	$alb = get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' );
-            -
            	if ( $alb ) {
-            -
            		$exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
-            -
            		if ( ! $exists ) update_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' );
-            -
            	}
-            -
            	$alb = get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' );
-            -
            	if ( $alb ) {
-            -
            		$exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
-            -
            		if ( ! $exists ) update_option( 'wppa-video-album-import-'.wppa_get_user(), '0' );
-            -
            	}
-            -
            	$alb = get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' );
-            -
            	if ( $alb ) {
-            -
            		$exists = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `" . WPPA_ALBUMS . "` WHERE `id` = %s", $alb ) );
-            -
            		if ( ! $exists ) update_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' );
-            -
            	}
-            -
-            -
            	// Extract zip
-            -
            	if ( isset( $_GET['zip'] ) ) {
-            -
            		wppa_extract( $_GET['zip'], true );
-            -
            	}
-            -
-            -
            	// Set local / remote
-            -
            	if ( isset( $_POST['wppa-local-remote'] ) ) {
-            -
            		check_admin_referer( '$wppa_nonce', WPPA_NONCE );
-            -
            		update_option( 'wppa_import_source_type_'.$user, $_POST['wppa-local-remote'] );
-            -
            	}
-            -
-            -
            	// Set import source dir ( when local )
-            -
            	if ( isset( $_POST['wppa-import-set-source-dir'] ) ) {
-            -
            		check_admin_referer( '$wppa_nonce', WPPA_NONCE );
-            -
            		if ( isset( $_POST['wppa-source'] ) ) {
-            -
            			update_option( 'wppa_import_source_'.$user, $_POST['wppa-source'] );
-            -
            		}
-            -
            	}
-            -
-            -
            	// Set import source url ( when remote )
-            -
            	if ( isset( $_POST['wppa-import-set-source-url'] ) ) {
-            -
            		check_admin_referer( '$wppa_nonce', WPPA_NONCE );
-            -
            		if ( isset( $_POST['wppa-source-remote'] ) ) {
-            -
            			update_option( 'wppa_import_source_url_'.$user, $_POST['wppa-source-remote'] );
-            -
            			update_option( 'wppa_import_source_url_found_'.$user, false );
-            -
            			update_option( 'wppa_import_remote_max_'.$user, strval( intval( $_POST['wppa-import-remote-max'] ) ) );
-            -
            		}
-            -
            	}
-            -
-            -
            	// Hit the submit button
-            -
            	if ( isset( $_POST['wppa-import-submit'] ) ) {
-            -
            		if ( wppa( 'ajax' ) ) {
-            -
            			if ( ! wp_verify_nonce( $_POST['wppa-update-check'], '$wppa_nonce' ) ) {
-            -
            				echo $_POST['wppa-update-check'].' Security check failure';
-            -
            				wppa_exit();
-            -
            			}
-            -
            		}
-            -
            		else {
-            -
            			check_admin_referer( '$wppa_nonce', WPPA_NONCE );
-            -
            		}
-            -
                    if ( isset( $_POST['del-after-p'] ) ) $delp = true; else $delp = false;
-            -
            		if ( isset( $_POST['del-after-f'] ) ) $delf = true; else $delf = false;
-            -
            		if ( isset( $_POST['del-after-a'] ) ) $dela = true; else $dela = false;
-            -
            		if ( isset( $_POST['del-after-z'] ) ) $delz = true; else $delz = false;
-            -
            		if ( isset( $_POST['del-after-v'] ) ) $delv = true; else $delv = false;
-            -
            		if ( isset( $_POST['del-after-u'] ) ) $delu = true; else $delu = false;
-            -
            		if ( isset( $_POST['del-after-c'] ) ) $delc = true; else $delc = false;
-            -
-            -
            		wppa_import_photos( $delp, $dela, $delz, $delv, $delu, $delc, $delf );
-            -
            	}
-            -
-            -
            	// Continue dirimport after timeout
-            -
            	elseif ( isset( $_GET['continue'] ) ) {
-            -
            		if ( wp_verify_nonce( $_GET['nonce'], 'dirimport' ) ) wppa_import_photos();
-            -
            	}
-            -
-            -
            	// If we did this by ajax, setup reporting results for it
-            -
            	if ( wppa( 'ajax' ) ) {
-            -
            		ob_end_clean();
-            -
            		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();
-            -
            	}
-            -
-            -
            ?>
-            -
-            -
            	<div class="wrap">
-            -
            		<?php $iconurl = WPPA_URL.'/images/camera32.png'; ?>
-            -
            		<div id="icon-camera" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat"></div>
-            -
            		<?php $iconurl = WPPA_URL.'/images/arrow32.png'; ?>
-            -
            		<div id="icon-arrow" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat"></div>
-            -
            		<?php $iconurl = WPPA_URL.'/images/album32.png'; ?>
-            -
            		<div id="icon-album" class="icon32" style="background: transparent url( <?php echo( $iconurl ); ?> ) no-repeat"><br /></div>
-            -
-            -
            		<h2><?php _e( 'Import Photos' , 'wp-photo-album-plus'); ?></h2><br />
-            -
            		<?php
-            -
-            -
            		// Get this users current source directory setting
-            -
            		$can_remote = ini_get( 'allow_url_fopen' ) && function_exists( 'curl_init' );
-            -
            		// $can_remote = false; // Debug
-            -
            		if ( ! $can_remote ) {
-            -
            			update_option( 'wppa_import_source_type_'.$user, 'local' );
-            -
            		}
-            -
            		$source_type = get_option( 'wppa_import_source_type_'.$user, 'local' );
-            -
            		if ( $source_type == 'local' ) {
-            -
            			$source      = get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
-            -
            			if ( ! $source || ! is_dir( $source ) ) {
-            -
            				$source = WPPA_DEPOT_PATH;
-            -
            				update_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
-            -
            			}
-            -
-            -
            			// See if the current source is the 'home' directory
-            -
            			$is_depot 	= ( $source == WPPA_DEPOT_PATH );
-            -
-            -
            			// See if the current source is a subdir of my depot
-            -
            			$is_sub_depot = ( substr( $source, 0, strlen( WPPA_DEPOT_PATH ) ) == WPPA_DEPOT_PATH );
-            -
-            -
            			// Sanitize system
-            -
            			if ( $is_sub_depot ) {
-            -
            				wppa_sanitize_files();
-            -
            			}
-            -
-            -
            			// See what's in there
-            -
            			$files 		= wppa_get_import_files();
-            -
            			$zipcount 	= wppa_get_zipcount( $files );
-            -
            			$albumcount = wppa_get_albumcount( $files );
-            -
            			$photocount = wppa_get_photocount( $files );
-            -
            			$videocount = wppa_get_video_count( $files );
-            -
            			$audiocount = wppa_get_audio_count( $files );
-            -
            			$dircount	= $is_depot ? wppa_get_dircount( $files ) : '0';
-            -
            			$csvcount 	= $is_depot ? wppa_get_csvcount( $files ) : '0';
-            -
            			// echo 'zips:'.$zipcount,' albs:'.$albumcount.' pho:'.$photocount.' dirs:'.$dircount;
-            -
            			if ( $ngg_opts ) {
-            -
            				$is_ngg = strpos( $source, $ngg_opts['gallerypath'] ) !== false;	// this is false for the ngg root !!
-            -
            			}
-            -
            			else $is_ngg = false;
-            -
            		}
-            -
            		if ( $source_type == 'remote' ) {
-            -
            			wppa( 'is_remote', true );
-            -
            			$source     	= get_option( 'wppa_import_source_url_' . $user, 'http://' );
-            -
            			$source_path 	= $source;
-            -
            			$source_url 	= $source;
-            -
            			$is_depot 		= false;
-            -
            			$is_sub_depot 	= false;
-            -
            			$files 			= wppa_get_import_files();
-            -
            			$zipcount 		= '0';
-            -
            			$albumcount 	= '0';
-            -
            			$photocount 	= $files ? count( $files ) : '0';
-            -
            			$videocount 	= '0';
-            -
            			$audiocount 	= '0';
-            -
            			$dircount		= '0';
-            -
            			$csvcount 		= '0';
-            -
            			$is_ngg 		= false;
-            -
            			$remote_max 	= get_option( 'wppa_import_remote_max_'.$user, '10' );
-            -
            		}
-            -
-            -
            ?>
-            -
            	<form action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_import_photos' ) ) ?>" method="post">
-            -
            		<?php if ( wppa_user_is( 'administrator' ) || ! wppa_switch( 'chgsrc_is_restricted' ) ) { ?>
-            -
-            -
            		<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            			<?php
-            -
            				wp_nonce_field( '$wppa_nonce', WPPA_NONCE );
-            -
            				_e( 'Select Local or Remote' , 'wp-photo-album-plus');
-            -
            				$disabled = $can_remote ? '' : 'disabled="disabled"';
-            -
            			?>
-            -
            			<select name="wppa-local-remote" >
-            -
            				<option value="local" <?php if ( $source_type == 'local' ) echo 'selected="selected"' ?>><?php _e( 'Local' , 'wp-photo-album-plus') ?></option>
-            -
            				<option value="remote" <?php echo $disabled; if ( $source_type == 'remote' ) echo 'selected="selected"' ?>><?php _e( 'Remote' , 'wp-photo-album-plus') ?></option>
-            -
            			</select>
-            -
            			<?php if ( $can_remote ) { ?>
-            -
            				<input type="submit" class="button-secundary" name="wppa-import-set-source" value="<?php _e( 'Set Local/Remote' , 'wp-photo-album-plus'); ?>" />
-            -
            			<?php } 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');
-            -
            			} ?>
-            -
            		</div>
-            -
            		<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            			<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE ); ?>
-            -
            			<?php _e( 'Import photos from:' , 'wp-photo-album-plus'); ?>
-            -
            			<?php if ( $source_type == 'local' ) { ?>
-            -
            			<select name="wppa-source">
-            -
            				<?php wppa_abs_walktree( wppa_opt( 'import_root'), $source ) ?>
-            -
            			</select>
-            -
            			<input type="submit" class="button-secundary" name="wppa-import-set-source-dir" value="<?php _e( 'Set source directory' , 'wp-photo-album-plus'); ?>" />
-            -
            			<?php } else { ?>
-            -
            			<input type="text" style="width:50%" name="wppa-source-remote" value="<?php echo $source ?>" />
-            -
            			<?php _e( 'Max:' , 'wp-photo-album-plus') ?>
-            -
            			<input type="text" style="width:50px;" name="wppa-import-remote-max" value="<?php echo $remote_max ?>" />
-            -
            			<input type="submit" onclick="jQuery( '#rem-rem' ).css( 'display','inline' ); return true;" class="button-secundary" name="wppa-import-set-source-url" value="<?php _e( 'Find remote photos' , 'wp-photo-album-plus'); ?>" />
-            -
            			<span id="rem-rem" style="display:none;"><?php _e( 'Working, please wait...' , 'wp-photo-album-plus') ?></span>
-            -
            			<?php _e( '<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'); ?>
-            -
            			<?php } ?>
-            -
            		</div>
-            -
-            -
            		<?php } ?>
-            -
            	</form>
-            -
-            -
            	<?php
-            -
            		// check if albums exist or will be made before allowing upload
-            -
            		if ( wppa_has_albums() || $albumcount > '0' || $zipcount >'0' || $dircount > '0' || $videocount > '0' || $audiocount > '0' || $csvcount > '0' ) {
-            -
-            -
            			if ( $photocount > '0' || $albumcount > '0' || $zipcount >'0' || $dircount > '0' || $videocount > '0' || $audiocount > '0' || $csvcount > '0' ) { ?>
-            -
-            -
            				<form action="<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_import_photos' ) ) ?>" method="post">
-            -
            				<?php wp_nonce_field( '$wppa_nonce', WPPA_NONCE );
-            -
-            -
            				// Display the zips
-            -
            				if ( PHP_VERSION_ID >= 50207 && $zipcount > '0' ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$zipcount.' ' ); _e( 'zipfiles in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</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;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<?php if ( $is_sub_depot ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="del-after-z" name="del-after-z" checked="checked" /><b>&nbsp;&nbsp;<?php _e( 'Delete after successful extraction.' , 'wp-photo-album-plus'); ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<tr>
-            -
            								<?php
-            -
            								$ct = 0;
-            -
            								$idx = '0';
-            -
            								foreach ( $files as $file ) {
-            -
-            -
            									$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            									if ( $ext == 'zip' ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" class="wppa-zip" checked="checked" />&nbsp;&nbsp;<?php echo( wppa_sanitize_file_name( basename( $file ) ) ); ?>
-            -
            										</td>
-            -
            										<?php if ( $ct == 3 ) {
-            -
            											echo( '</tr><tr>' );
-            -
            											$ct = 0;
-            -
            										}
-            -
            										else {
-            -
            											$ct++;
-            -
            										}
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            							</tr>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php }
-            -
-            -
            				// Dispay the albums ( .amf files )
-            -
            				if ( $albumcount > '0' ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$albumcount.' ' ); _e( 'albumdefinitions in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</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;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<?php if ( $is_sub_depot ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="del-after-a" name="del-after-a" checked="checked" /><b>&nbsp;&nbsp;<?php _e( 'Remove from depot after successful import, or if the album already exists.' , 'wp-photo-album-plus'); ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat"  style="margin-top:0;" >
-            -
            							<tr>
-            -
            								<?php
-            -
            								$ct = 0;
-            -
            								$idx = '0';
-            -
            								foreach ( $files as $file ) {
-            -
            									$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            									if ( $ext == 'amf' ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" class="wppa-amf" checked="checked" />&nbsp;&nbsp;<?php echo( basename( $file ) ); ?>&nbsp;<?php echo( stripslashes( wppa_get_meta_name( $file, '( ' ) ) ) ?>
-            -
            										</td>
-            -
            										<?php if ( $ct == 3 ) {
-            -
            											echo( '</tr><tr>' );
-            -
            											$ct = 0;
-            -
            										}
-            -
            										else {
-            -
            											$ct++;
-            -
            										}
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            							</tr>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php }
-            -
-            -
            				// Display the single photos
-            -
            				if ( $photocount > '0' ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$photocount.' ' );
-            -
            								if ( $source_type == 'local' ) {
-            -
            									if ( $is_ngg ) {
-            -
            										_e( 'photos in the ngg gallery.' , 'wp-photo-album-plus');
-            -
            									}
-            -
            									else _e( 'photos in the depot.' , 'wp-photo-album-plus');
-            -
            								}
-            -
            								else _e( 'possible photos found remote.' , 'wp-photo-album-plus');
-            -
            								if ( wppa_switch( 'resize_on_upload' ) ) { echo( ' ' ); _e( 'Photos will be downsized during import.' , 'wp-photo-album-plus'); } ?><br/>
-            -
            						</b></p>
-            -
            						<p class="hideifupdate" >
-            -
            							<?php _e( 'Default album for import:' , 'wp-photo-album-plus') ?>
-            -
            							<select name="wppa-photo-album" id="wppa-photo-album">
-            -
            								<?php echo wppa_album_select_a( array( 	'path' 				=> wppa_switch( 'hier_albsel' ),
-            -
            																		'selected' 			=> get_option( 'wppa-photo-album-import-'.wppa_get_user(), '0' ),
-            -
            																		'addpleaseselect' 	=> true,
-            -
            																		'checkowner' 		=> true,
-            -
            																		'checkupload' 		=> true
-            -
            																	) ) ?>
-            -
            							</select>
-            -
            							<?php _e( '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>
-            -
            						<?php if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) { ?>
-            -
            							<p>
-            -
            								<?php _e( 'Apply watermark file:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-file" id="wppa-watermark-file">
-            -
            									<?php echo( wppa_watermark_file_select() ) ?>
-            -
            								</select>
-            -
            								<?php _e( 'Position:' , 'wp-photo-album-plus') ?>
-            -
            								<select name="wppa-watermark-pos" id="wppa-watermark-pos">
-            -
            									<?php echo( wppa_watermark_pos_select() ) ?>
-            -
            								</select>
-            -
            							</p>
-            -
            						<?php } ?>
-            -
            						<table class="form-table wppa-table widefat" style="margin-bottom:0;" >
-            -
            							<thead>
-            -
            								<tr>
-            -
            									<td>
-            -
            										<input type="checkbox" id="all-pho" <?php if ( $is_sub_depot ) echo( 'checked="checked"' ) ?> onchange="checkAll( 'all-pho', '.wppa-pho' )" /><b>&nbsp;&nbsp;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<?php if ( $is_sub_depot ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="del-after-p" name="del-after-p" checked="checked" /><b>&nbsp;&nbsp;<?php _e( '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;<?php _e( 'Remove from depot after failed import.' , 'wp-photo-album-plus'); ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            									<?php if ( $is_ngg ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="cre-album" name="cre-album" checked="checked" value="<?php echo esc_attr( basename( $source ) ) ?>" /><b>&nbsp;&nbsp;<?php echo sprintf( __( 'Import into album <i>%s</i>.' , 'wp-photo-album-plus'), basename( $source ) ); ?></b>
-            -
            											<br /><small><?php _e( '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;<?php _e( 'Use backup if available' , 'wp-photo-album-plus') ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            									<td>
-            -
            										<input type="checkbox" id="wppa-update" onchange="impUpd( this, '#submit' )" name="wppa-update"><b>&nbsp;&nbsp;<?php _e( 'Update existing photos' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<td>
-            -
            									<?php if ( wppa_switch( 'void_dups' ) ) { ?>
-            -
            										<input type="hidden" id="wppa-nodups" name="wppa-nodups" value="true" />
-            -
            									<?php } else { ?>
-            -
            										<input type="checkbox" id="wppa-nodups" name="wppa-nodups" checked="checked" ><b>&nbsp;&nbsp;<?php _e( 'Do not create duplicates' , 'wp-photo-album-plus') ?></b>
-            -
            									<?php } ?>
-            -
            									</td>
-            -
            									<?php
-            -
            									if ( wppa_switch( 'import_preview' ) ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="wppa-zoom" onclick="wppa_setCookie('zoompreview', this.checked, '365')" ><b>&nbsp;&nbsp;<?php _e( 'Zoom previews' , 'wp-photo-album-plus') ?></b>
-            -
            											<script type="text/javascript">if ( wppa_getCookie('zoompreview') == true ) { jQuery('#wppa-zoom').attr('checked', 'checked') }</script>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<tr>
-            -
            								<?php
-            -
            								$ct = 0;
-            -
            								$idx = '0';
-            -
            								if ( is_array( $files ) ) foreach ( $files as $file ) {
-            -
            									$ext = wppa_get_ext( $file ); //strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            									$meta =	wppa_strip_ext( $file ).'.PMF';
-            -
            									if ( ! is_file( $meta ) ) {
-            -
            										$meta =	wppa_strip_ext( $file ).'.pmf';
-            -
            									}
-            -
            									if ( in_array( strtolower($ext), $wppa_supported_photo_extensions ) ) { ?>
-            -
            										<td id="td-file-<?php echo( $idx ) ?>" >
-            -
            											<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" title="<?php echo $file ?>" class= "wppa-pho" <?php if ( $is_sub_depot ) echo( 'checked="checked"' ) ?> />
-            -
            											<span id="name-file-<?php echo( $idx ) ?>" >&nbsp;&nbsp;
-            -
            												<?php
-            -
            												if ( wppa( 'is_wppa_tree' ) ) {
-            -
            													$t = explode( '/wppa/', $file );
-            -
            													echo $t[1];
-            -
            												}
-            -
            												else {
-            -
            													echo( wppa_sanitize_file_name( basename( $file ) ) );
-            -
            												}
-            -
            												?>&nbsp;
-            -
            												<?php echo( stripslashes( wppa_get_meta_name( $meta, '( ' ) ) ) ?>
-            -
            												<?php echo( stripslashes( wppa_get_meta_album( $meta, '[' ) ) ) ?>
-            -
            											</span>
-            -
            											<?php
-            -
            											if ( wppa_switch( 'import_preview' ) ) {
-            -
            												if ( wppa( 'is_remote' ) ) {
-            -
            													if ( strpos( $file, '//res.cloudinary.com/' ) !== false ) {
-            -
            														$img_url = dirname( $file ) . '/h_144/' . basename( $file );
-            -
            													}
-            -
            													else {
-            -
            														$img_url = $file;
-            -
            													}
-            -
            												}
-            -
            												else {
-            -
            													$img_url = str_replace( ABSPATH, home_url().'/', $file );
-            -
            												}
-            -
            											?>
-            -
            											<img src="<?php echo $img_url ?>" alt="N.A." style="max-height:48px;" onmouseover="if (jQuery('#wppa-zoom').attr('checked')) jQuery(this).css('max-height', '144px')" onmouseout="if (jQuery('#wppa-zoom').attr('checked')) jQuery(this).css('max-height', '48px')" />
-            -
            											<?php } ?>
-            -
            										</td>
-            -
            										<?php if ( $ct == 3 ) {
-            -
            											echo( '</tr><tr>' );
-            -
            											$ct = 0;
-            -
            										}
-            -
            										else {
-            -
            											$ct++;
-            -
            										}
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            							</tr>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php }
-            -
-            -
            				// Display the videos
-            -
            				if ( $videocount > '0' && wppa_switch( 'enable_video' ) ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$videocount.' ' ); _e( 'videos in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</b></p>
-            -
            						<p class="hideifupdate" >
-            -
            							<?php _e( 'Album to import to:' , 'wp-photo-album-plus') ?>
-            -
            							<select name="wppa-video-album" id="wppa-video-album">
-            -
            								<?php echo wppa_album_select_a( array( 	'path' 				=> wppa_switch( 'hier_albsel' ),
-            -
            																		'selected' 			=> get_option( 'wppa-video-album-import-'.wppa_get_user(), '0' ),
-            -
            																		'addpleaseselect'	=> true,
-            -
            																		'checkowner' 		=> true,
-            -
            																		'checkupload' 		=> true
-            -
            																	) ) ?>
-            -
            							</select>
-            -
            						</p>
-            -
            						<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;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<?php if ( $is_sub_depot ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="del-after-v" name="del-after-v" checked="checked" /><b>&nbsp;&nbsp;<?php _e( 'Remove from depot after successful import.' , 'wp-photo-album-plus'); ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<tr>
-            -
            								<?php
-            -
            								$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 ) ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" title="<?php echo $file ?>" class="wppa-video" checked="checked" /><span id="name-file-<?php echo( $idx ) ?>" >&nbsp;&nbsp;<?php echo( wppa_sanitize_file_name( basename( $file ) ) ); ?></span>
-            -
            										</td>
-            -
            										<?php if ( $ct == 3 ) {
-            -
            											echo( '</tr><tr>' );
-            -
            											$ct = 0;
-            -
            										}
-            -
            										else {
-            -
            											$ct++;
-            -
            										}
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            							</tr>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php }
-            -
-            -
            				// Display the audios
-            -
            				if ( $audiocount > '0' && wppa_switch( 'enable_audio' ) ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$audiocount.' ' ); _e( 'audios in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</b></p>
-            -
            						<p class="hideifupdate" >
-            -
            							<?php _e( 'Album to import to:' , 'wp-photo-album-plus') ?>
-            -
            							<select name="wppa-audio-album" id="wppa-audio-album">
-            -
            								<?php echo wppa_album_select_a( array( 	'path' 				=> wppa_switch( 'hier_albsel' ),
-            -
            																		'selected' 			=> get_option( 'wppa-audio-album-import-'.wppa_get_user(), '0' ),
-            -
            																		'addpleaseselect' 	=> true,
-            -
            																		'checkowner' 		=> true,
-            -
            																		'checkupload' 		=> true
-            -
            																	) ) ?>
-            -
            							</select>
-            -
            						</p>
-            -
            						<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;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            									<?php if ( $is_sub_depot ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="del-after-u" name="del-after-u" checked="checked" /><b>&nbsp;&nbsp;<?php _e( 'Remove from depot after successful import.' , 'wp-photo-album-plus'); ?></b>
-            -
            										</td>
-            -
            									<?php } ?>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<tr>
-            -
            								<?php
-            -
            								$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 ) ) { ?>
-            -
            										<td>
-            -
            											<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" title="<?php echo $file ?>" class="wppa-audio" checked="checked" /><span id="name-file-<?php echo( $idx ) ?>" >&nbsp;&nbsp;<?php echo( wppa_sanitize_file_name( basename( $file ) ) ); ?></span>
-            -
            										</td>
-            -
            										<?php if ( $ct == 3 ) {
-            -
            											echo( '</tr><tr>' );
-            -
            											$ct = 0;
-            -
            										}
-            -
            										else {
-            -
            											$ct++;
-            -
            										}
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            							</tr>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php }
-            -
-            -
            				// Display the directories to be imported as albums. Do this in the depot only!!
-            -
            				if ( $is_depot && $dircount > '0' ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$dircount.' ' ); _e( 'albumdirectories in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</b></p>
-            -
            						<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;<?php _e( 'Check/uncheck all' , 'wp-photo-album-plus') ?></b>
-            -
            									</td>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<?php
-            -
            								$ct = 0;
-            -
            								$idx = '0';
-            -
            								foreach( $files as $dir ) {
-            -
            									if ( basename( $dir ) == '.' ) {}
-            -
            									elseif ( basename( $dir ) == '..' ) {}
-            -
            									elseif ( is_dir( $dir ) ) { ?>
-            -
            										<tr>
-            -
            											<td>
-            -
            												<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" class= "wppa-dir" checked="checked" />&nbsp;&nbsp;<b><?php echo( wppa_sanitize_file_name( basename( $dir ) ) ) ?></b>
-            -
            												<?php
-            -
            													$subfiles = glob( $dir.'/*' );
-            -
            													$subdircount = '0';
-            -
            													if ( $subfiles ) foreach ( $subfiles as $subfile ) if ( is_dir( $subfile ) && basename( $subfile ) != '.' && basename( $subfile ) != '..' ) $subdircount++;
-            -
            													$sfcount = empty( $subfiles ) ? '0' : wppa_get_photocount( $subfiles );
-            -
            													echo ' Contains '.$sfcount.' files';
-            -
            													if ( $subdircount ) echo ' and '.$subdircount.' sub directories.';
-            -
            												?>
-            -
            											</td>
-            -
            										</tr>
-            -
            									<?php
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            						</table>
-            -
            					</div>
-            -
            				<?php } ?>
-            -
            				<?php
-            -
-            -
            				// Display the csv files
-            -
            				if ( $is_depot && $csvcount > '0' ) { ?>
-            -
            					<div style="border:1px solid gray; padding:4px; margin: 3px 0;" >
-            -
            						<p><b>
-            -
            							<?php _e( 'There are' , 'wp-photo-album-plus'); echo( ' '.$csvcount.' ' ); _e( 'csv files in the depot.' , 'wp-photo-album-plus') ?><br/>
-            -
            						</b></p>
-            -
            						<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;<?php _e( '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;<?php _e( 'Remove from depot after successful import.' , 'wp-photo-album-plus'); ?></b>
-            -
            									</td>
-            -
            								</tr>
-            -
            							</thead>
-            -
            						</table>
-            -
            						<table class="form-table wppa-table widefat" style="margin-top:0;" >
-            -
            							<?php
-            -
            								$ct = 0;
-            -
            								$idx = '0';
-            -
            								foreach( $files as $csv ) {
-            -
            									if ( is_file( $csv ) && strtolower( wppa_get_ext( $csv ) ) == 'csv' ) { ?>
-            -
            										<tr>
-            -
            											<td>
-            -
            												<input type="checkbox" id="file-<?php echo( $idx ) ?>" name="file-<?php echo( $idx ) ?>" class= "wppa-csv" checked="checked" />&nbsp;&nbsp;<b><?php echo wppa_sanitize_file_name( basename( $csv ) ) .  ' (' . sprintf( '%5.1f', filesize( $csv ) / 1024 ) . ' kb)' ?></b>
-            -
            											</td>
-            -
            										</tr>
-            -
            									<?php
-            -
            									}
-            -
            									$idx++;
-            -
            								} ?>
-            -
            						</table>
-            -
            					</div>
-            -
-            -
            				<?php } ?>
-            -
            				<?php
-            -
-            -
            				// The submit button
-            -
            				?>
-            -
            				<p>
-            -
            					<script type="text/javascript">
-            -
            						function wppaVfyAlbum() {
-            -
            							var csvs = jQuery( '.wppa-csv' );
-            -
            							if ( jQuery( '#wppa-update' ).attr( 'checked' ) != 'checked' ) {
-            -
            								if ( 	! parseInt( jQuery( '#wppa-photo-album' ).attr( 'value' ) ) &&
-            -
            										! parseInt( jQuery( '#wppa-video-album' ).attr( 'value' ) ) &&
-            -
            										! parseInt( jQuery( '#wppa-audio-album' ).attr( 'value' ) ) &&
-            -
            										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] ).attr( 'checked' ) == '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] ).attr( 'checked' ) == '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>
-            -
            					<input type="submit" onclick="return wppaCheckInputVars()" class="button-primary" id="submit" name="wppa-import-submit" value="<?php _e( 'Import' , 'wp-photo-album-plus'); ?>" />
-            -
            					<script type="text/javascript" >
-            -
            						var wppaImportRuns = false;
-            -
            						function wppaDoAjaxImport() {
-            -
            							wppaImportRuns = true;
-            -
            							var data = '';
-            -
            							data += 'wppa-update-check='+jQuery( '#wppa-update-check' ).attr( 'value' );
-            -
            							data += '&wppa-photo-album='+jQuery( '#wppa-photo-album' ).attr( 'value' );
-            -
            							data += '&wppa-video-album='+jQuery( '#wppa-video-album' ).attr( 'value' );
-            -
            							data += '&wppa-audio-album='+jQuery( '#wppa-audio-album' ).attr( 'value' );
-            -
            							data += '&wppa-watermark-file='+jQuery( '#wppa-watermark-file' ).attr( 'value' );
-            -
            							data += '&wppa-watermark-pos='+jQuery( '#wppa-watermark-pos' ).attr( 'value' );
-            -
            							if ( jQuery( '#cre-album' ).attr( 'checked' ) ) data += '&cre-album='+jQuery( '#cre-album' ).attr( 'value' );
-            -
            							if ( jQuery( '#use-backup' ).attr( 'checked' ) ) data += '&use-backup=on'; //+jQuery( '#use-backup' ).attr( 'value' );
-            -
            							if ( jQuery( '#wppa-update' ).attr( 'checked' ) ) data += '&wppa-update=on'; //+jQuery( '#wppa-update' ).attr( 'value' );
-            -
            							if ( jQuery( '#wppa-nodups' ).attr( 'checked' ) ) data += '&wppa-nodups=on'; //+jQuery( '#wppa-nudups' ).attr( 'value' );
-            -
            							if ( jQuery( '#del-after-p' ).attr( 'checked' ) ) data += '&del-after-p=on';
-            -
            							if ( jQuery( '#del-after-f' ).attr( 'checked' ) ) data += '&del-after-f=on';
-            -
            							if ( jQuery( '#del-after-v' ).attr( 'checked' ) ) data += '&del-after-v=on';
-            -
            							if ( jQuery( '#del-after-u' ).attr( 'checked' ) ) data += '&del-after-u=on';
-            -
            							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' ).attr( 'checked' ) ||
-            -
            											 jQuery( '#del-after-f' ).attr( 'checked' ) ) {
-            -
            											elm.disabled = 'disabled';
-            -
            											elm.title = '';
-            -
            										}
-            -
            										if ( wppaImportRuns ) {
-            -
            											setTimeout( 'wppaDoAjaxImport()', 100 );
-            -
            										}
-            -
            									}
-            -
            									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>' );
-            -
            							jQuery( '#wppa-start-ajax' ).css( 'display', 'none' );
-            -
            							jQuery( '#wppa-stop-ajax' ).css( 'display', 'inline' );
-            -
            						}
-            -
            						function wppaStopAjaxImport() {
-            -
            							wppaImportRuns = false;
-            -
            							jQuery( '#wppa-start-ajax' ).css( 'display', 'inline' );
-            -
            							jQuery( '#wppa-stop-ajax' ).css( 'display', 'none' );
-            -
            						}
-            -
            					</script>
-            -
            					<?php if ( ( $photocount || $videocount || $audiocount ) && ! $albumcount && ! $dircount && ! $zipcount ) { ?>
-            -
            					<input id="wppa-start-ajax" type="button" onclick="if ( wppaVfyAlbum() ) { wppaDoAjaxImport() }" class="button-secundary" value="<?php esc_attr( _e( 'Start Ajax Import', 'wp-photo-album-plus' ) ) ?>" />
-            -
            					<input id="wppa-stop-ajax" style="display:none;" type="button" onclick="wppaStopAjaxImport()" class="button-secundary" value="<?php esc_attr( _e( 'Stop Ajax 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 ( PHP_VERSION_ID >= 50207 ) {
-            -
            			echo '<br />';
-            -
            			_e( 'Compressed file types: .zip' , 'wp-photo-album-plus');
-            -
            		}
-            -
            		if ( true ) {
-            -
            			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;
-            -
            			}
-            -
            		}
-            -
            		echo '<br />';
-            -
            		_e( 'WPPA+ file types: .amf .pmf' , 'wp-photo-album-plus');
-            -
            		echo '<br />';
-            -
            		_e( 'Directories with optional subdirs containig photos' , 'wp-photo-album-plus');
-            -
            		echo '<br />';
-            -
            		_e( 'Custom data files of type .csv' , 'wp-photo-album-plus');
-            -
            		echo '<br /><br />';
-            -
            		_e( 'Your depot directory is:' , 'wp-photo-album-plus');
-            -
            		echo '<b> .../' . WPPA_DEPOT . '/</b>';
-            -
            	}
-            -
            	else { ?>
-            -
            		<?php $url = wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu' ); ?>
-            -
            		<p><?php _e( 'No albums exist. You must' , 'wp-photo-album-plus'); ?> <a href="<?php echo( $url ) ?>"><?php _e( 'create one' , 'wp-photo-album-plus'); ?></a> <?php _e( 'beofre you can upload your photos.' , 'wp-photo-album-plus'); ?></p><?php
-            -
            	}
-            -
            	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&nonce='.wp_create_nonce( 'dirimport' ).'\';</script>';
-            -
            	} ?>
-            -
            	</div>
-            -
            <?php
-            -
            }
-            -
-            -
            // get array of files to import
-            -
            function wppa_get_import_files() {
-            -
-            -
            	// Init
-            -
            	$user 			= wppa_get_user();
-            -
            	$source_type 	= get_option( 'wppa_import_source_type_'.$user, 'local' );
-            -
            	$files			= array();
-            -
-            -
            	// Ajax? one file
-            -
            	if ( isset ( $_POST['import-ajax-file'] ) ) {
-            -
            		$files = array( $_POST['import-ajax-file'] );
-            -
            	}
-            -
-            -
            	// Dispatch on source type local/remote
-            -
            	elseif ( $source_type == 'local' ) {
-            -
            		$source 		= get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
-            -
            		$source_path 	= $source;	// Filesystem
-            -
            		$files 			= glob( $source_path . '/*' );
-            -
            	}
-            -
            	else { // remote
-            -
            		$max_tries 		= get_option( 'wppa_import_remote_max_'.$user, '10' );
-            -
            		$setting 		= get_option( 'wppa_import_source_url_'.$user, 'http://' );
-            -
            		$pattern		= '/src=".*?"/';
-            -
-            -
            		// Is it a photofile in a wppa tree filestructure?
-            -
            		$old_setting = $setting;
-            -
-            -
            		// assume not
-            -
            		if ( is_array( @ getimagesize( $setting ) ) ) {
-            -
            			wppa( 'is_wppa_tree', false );
+            		}
-            -
            		// though?
             		else {
-            -
            			$setting = wppa_expand_tree_path( $old_setting );
-            -
            			if ( is_array( @ getimagesize( $setting ) ) ) {
-            -
            				wppa( 'is_wppa_tree', true );
-            -
            			}
-            -
            		}
-            -
            		// Is it a photofile?
-            -
            		if ( is_array( @ getimagesize( $setting ) ) ) {	// image uri
-            -
            			$files = array( $setting );
-            -
            			$pid = wppa_strip_ext( basename( $old_setting ) );
-            -
            			if ( is_numeric( $pid ) ) {
-            -
            				$tries = 1;
-            -
            				$before = substr( $old_setting, 0, strpos( $old_setting, $pid) );
-            -
            				while ( $tries < $max_tries ) {
-            -
            					$tries++;
-            -
            					$pid++;
-            -
            					if ( wppa( 'is_wppa_tree' ) ) {
-            -
            						$files[] = $before . wppa_expand_id($pid) . '.jpg';
+            					}
             					else {
-            -
            						$files[] = $before . $pid . '.jpg';
+            					}
+            				}
-            -
            			}
-            -
            		}
-            -
-            -
            		// is it a page url
-            -
            		else {
-            -
            			$files = get_option( 'wppa_import_source_url_found_'.$user, false );
-            -
            			if ( $files === false ) {
-            -
-            -
            				// Init
-            -
            				$files = array();
-            -
-            -
            				// Get page content
-            -
            				$curl = curl_init();
-            -
            				curl_setopt( $curl, CURLOPT_RETURNTRANSFER, 1 );
-            -
            				curl_setopt( $curl, CURLOPT_URL, $setting );
-            -
            				$contents = curl_exec( $curl );
-            -
            				curl_close( $curl );
-            -
-            -
            				// Process result
-            -
            				if ( $contents ) {
-            -
-            -
            					// Preprocess
-            -
            					$contents = str_replace( '\'', '"', $contents );
-            -
-            -
            					// Find matches
-            -
            					preg_match_all( $pattern, $contents, $matches, PREG_PATTERN_ORDER );
-            -
            					if ( is_array( $matches[0] ) ) {
-            -
-            -
            						// Sort
-            -
            						sort( $matches[0] );
-            -
-            -
            						// Copy to $files, skipping dups
-            -
            						$val = '';
-            -
            						$count = 0;
-            -
            						$sfxs = array( 'jpg', 'jpeg', 'gif', 'png', 'JPG', 'JPEG', 'GIF', 'PNG' );
-            -
            						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 );
-            -
            								$match 		= trim( $match, '"' );
-            -
            								if ( strpos( $match, '?' ) ) $match = substr( $match, 0, strpos( $match, '?' ) );
-            -
            								$match 		= str_replace( '/uploads/wppa/thumbs/', '/uploads/wppa/', $match );
-            -
            								$sfx = wppa_get_ext( $match );
-            -
            								if ( in_array( $sfx, $sfxs ) ) {
-            -
            									// Save it
-            -
            									$count++;
-            -
            									if ( $count <= $max_tries ) {
-            -
            										$files[] = $match;
-            -
            									}
-            -
            								}
-            -
            							}
-            -
            						}
-            -
            					}
+            				}
-            -
            				update_option( 'wppa_import_source_url_found_'.$user, $files );
+            			}
+            		}
-            -
            	}
-            -
-            -
            	// Remove non originals
-            -
            	if ( is_array( $files ) ) foreach ( array_keys( $files ) as $key ) {
-            -
            		if ( ! wppa_is_orig( $files[$key] ) ) {
-            -
            			unset ( $files[$key] );
-            -
            		}
-            -
            	}
-            -
-            -
            	// Sort to keep synchronicity when doing ajax import
-            -
            	if ( is_array( $files ) ) sort( $files );
-            -
            	// Done, return result
-            -
            	return $files;
+            }
             // Upload multiple photos
             function wppa_upload_multiple() {
-            -
            	global $wpdb;
-            -
            	global $warning_given;
             	$warning_given = false;
             	$uploaded_a_file = false;
@@ -1356,16 +497,16 @@ function wppa_upload_multiple() {
             		if ( is_array( $file['error'] ) ) {
             			for ( $i = '0'; $i < count( $file['error'] ); $i++ ) {
             				if ( wppa_is_time_up() ) {
-            -
            					wppa_warning_message( sprintf( __( 'Time out. %s photos uploaded in album nr %s.' , 'wp-photo-album-plus'), $count, $_POST['wppa-album'] ) );
-            -
            					wppa_set_last_album( $_POST['wppa-album'] );
             					return;
+            				}
             				if ( ! $file['error'][$i] ) {
-            -
            					$id = wppa_insert_photo( $file['tmp_name'][$i], $_POST['wppa-album'], $file['name'][$i] );
             					if ( $id ) {
             						$uploaded_a_file = true;
             						$count++;
-            -
            						wppa_backend_upload_mail( $id, $_POST['wppa-album'], $file['name'][$i] );
+            					}
             					else {
             						wppa_error_message( __( 'Error inserting photo' , 'wp-photo-album-plus') . ' ' . wppa_sanitize_file_name( basename( $file['name'][$i] ) ) . '.' );
@@ -1377,15 +518,17 @@ function wppa_upload_multiple() {
+            	}
             	if ( $uploaded_a_file ) {
-            -
            		wppa_update_message( $count.' '.__( 'Photos Uploaded in album nr' , 'wp-photo-album-plus') . ' ' . $_POST['wppa-album'] );
-            -
            		wppa_set_last_album( $_POST['wppa-album'] );
+                }
+            }
             // Upload single photos
             function wppa_upload_photos() {
-            -
            	global $wpdb;
-            -
            	global $warning_given;
             	$warning_given = false;
             	$uploaded_a_file = false;
@@ -1393,12 +536,11 @@ function wppa_upload_photos() {
             	$count = '0';
             	foreach ( $_FILES as $file ) {
             		if ( $file['tmp_name'] != '' ) {
-            -
            //			$file['name'] = wppa_sanitize_file_name( $file['name'] );
-            -
            			$id = wppa_insert_photo( $file['tmp_name'], $_POST['wppa-album'], $file['name'] );
             			if ( $id ) {
             				$uploaded_a_file = true;
             				$count++;
-            -
            				wppa_backend_upload_mail( $id, $_POST['wppa-album'], $file['name'] );
+            			}
             			else {
             				wppa_error_message( __( 'Error inserting photo' , 'wp-photo-album-plus') . ' ' . wppa_sanitize_file_name( basename( $file['name'] ) ) . '.' );
@@ -1408,8 +550,8 @@ function wppa_upload_photos() {
+            	}
             	if ( $uploaded_a_file ) {
-            -
            		wppa_update_message( $count.' '.__( 'Photos Uploaded in album nr' , 'wp-photo-album-plus') . ' ' . $_POST['wppa-album'] );
-            -
            		wppa_set_last_album( $_POST['wppa-album'] );
+                }
+            }
@@ -1454,1109 +596,3 @@ global $target;
             	return $error;
+            }
-            -
-            -
            // Do the import photos
-            -
            function wppa_import_photos( $delp = false, $dela = false, $delz = false, $delv = false, $delu = false, $delc = false, $delf = false ) {
-            -
            global $wpdb;
-            -
            global $warning_given;
-            -
            global $wppa_supported_photo_extensions;
-            -
            global $wppa_supported_video_extensions;
-            -
            global $wppa_supported_audio_extensions;
-            -
-            -
            	$warning_given = false;
-            -
-            -
            	// Get this users current source directory setting
-            -
            	$user 			= wppa_get_user();
-            -
            	$source_type 	= get_option( 'wppa_import_source_type_'.$user, 'local' );
-            -
            	if ( $source_type == 'remote' ) wppa( 'is_remote', true );
-            -
            	$source 		= get_option( 'wppa_import_source_'.$user, WPPA_DEPOT_PATH );
-            -
-            -
            	$depot 			= WPPA_ABSPATH . $source;	// Filesystem
-            -
            	$depoturl 		= get_bloginfo( 'wpurl' ).'/'.$source;	// url
-            -
-            -
            	// See what's in there
-            -
            	$files = wppa_get_import_files();
-            -
-            -
            	// First extract zips if our php version is ok
-            -
            	$idx='0';
-            -
            	$zcount = 0;
-            -
            	if ( PHP_VERSION_ID >= 50207 ) {
-            -
            		foreach( $files as $zipfile ) {
-            -
            			if ( isset( $_POST['file-'.$idx] ) ) {
-            -
            				$ext = strtolower( substr( strrchr( $zipfile, "." ), 1 ) );
-            -
-            -
            				if ( $ext == 'zip' ) {
-            -
            					$err = wppa_extract( $zipfile, $delz );
-            -
            					if ( $err == '0' ) $zcount++;
-            -
            				} // if ext = zip
-            -
            			} // if isset
-            -
            			$idx++;
-            -
            		} // foreach
-            -
            	}
-            -
-            -
            	// Now see if albums must be created
-            -
            	$idx='0';
-            -
            	$acount = 0;
-            -
            	foreach( $files as $album ) {
-            -
            		if ( isset( $_POST['file-'.$idx] ) ) {
-            -
            			$ext = strtolower( substr( strrchr( $album, "." ), 1 ) );
-            -
            			if ( $ext == 'amf' ) {
-            -
            				$name = '';
-            -
            				$desc = '';
-            -
            				$aord = '0';
-            -
            				$parent = '0';
-            -
            				$porder = '0';
-            -
            				$owner = '';
-            -
            				$handle = fopen( $album, "r" );
-            -
            				if ( $handle ) {
-            -
            					$buffer = fgets( $handle, 4096 );
-            -
            					while ( !feof( $handle ) ) {
-            -
            						$tag = substr( $buffer, 0, 5 );
-            -
            						$len = strlen( $buffer ) - 6;	// substract 5 for label and one for eol
-            -
            						$data = substr( $buffer, 5, $len );
-            -
            						switch( $tag ) {
-            -
            							case 'name=':
-            -
            								$name = $data;
-            -
            								break;
-            -
            							case 'desc=':
-            -
            								$desc = wppa_txt_to_nl( $data );
-            -
            								break;
-            -
            							case 'aord=':
-            -
            								if ( is_numeric( $data ) ) $aord = $data;
-            -
            								break;
-            -
            							case 'prnt=':
-            -
            								if ( $data == __( '--- none ---' , 'wp-photo-album-plus') ) $parent = '0';
-            -
            								elseif ( $data == __( '--- separate ---' , 'wp-photo-album-plus') ) $parent = '-1';
-            -
            								else {
-            -
            									$prnt = wppa_get_album_id( $data );
-            -
            									if ( $prnt != '' ) {
-            -
            										$parent = $prnt;
-            -
            									}
-            -
            									else {
-            -
            										$parent = '0';
-            -
            										wppa_warning_message( __( 'Unknown parent album:' , 'wp-photo-album-plus').' '.$data.' '.__( '--- none --- used.' , 'wp-photo-album-plus') );
-            -
            									}
-            -
            								}
-            -
            								break;
-            -
            							case 'pord=':
-            -
            								if ( is_numeric( $data ) ) $porder = $data;
-            -
            								break;
-            -
            							case 'ownr=':
-            -
            								$owner = $data;
-            -
            								break;
-            -
            						}
-            -
            						$buffer = fgets( $handle, 4096 );
-            -
            					} // while !foef
-            -
            					fclose( $handle );
-            -
            					if ( wppa_get_album_id( $name ) != '' ) {
-            -
            						wppa_warning_message( 'Album already exists '.stripslashes( $name ) );
-            -
            						if ( $dela ) unlink( $album );
-            -
            					}
-            -
            					else {
-            -
            						$id = basename( $album );
-            -
            						$id = substr( $id, 0, strpos( $id, '.' ) );
-            -
            						$id = wppa_create_album_entry( array ( 	'id' 			=> $id,
-            -
            																'name' 			=> stripslashes( $name ),
-            -
            																'description' 	=> stripslashes( $desc ),
-            -
            																'a_order' 		=> $aord,
-            -
            																'a_parent' 		=> $parent,
-            -
            																'p_order_by' 	=> $porder,
-            -
            																'owner' 		=> $owner
-            -
            															 ) );
-            -
-            -
            						if ( $id === false ) {
-            -
            							wppa_error_message( __( 'Could not create album.' , 'wp-photo-album-plus') );
-            -
            						}
-            -
            						else {
-            -
            							//$id = wppa_get_album_id( $name );
-            -
            							wppa_set_last_album( $id );
-            -
            							wppa_index_add( 'album', $id );
-            -
            							wppa_ok_message( __( 'Album #' , 'wp-photo-album-plus') . ' ' . $id . ': '.stripslashes( $name ).' ' . __( 'Added.' , 'wp-photo-album-plus') );
-            -
            							if ( $dela ) unlink( $album );
-            -
            							$acount++;
-            -
            							wppa_clear_cache();
-            -
            							wppa_flush_treecounts( $id );
-            -
            						} // album added
-            -
            					} // album did not exist
-            -
            				} // if handle ( file open )
-            -
            			} // if its an album
-            -
            		} // if isset
-            -
            		$idx++;
-            -
            	} // foreach file
-            -
-            -
            	// Now the photos
-            -
            	$idx 		= '0';
-            -
            	$pcount 	= '0';
-            -
            	$totpcount 	= '0';
-            -
-            -
            	// find album id
-            -
            	if ( isset( $_POST['cre-album'] ) ) {	// use album ngg gallery name for ngg conversion
-            -
            		$album 	= wppa_get_album_id( strip_tags( $_POST['cre-album'] ) );
-            -
            		if ( ! $album ) {				// the album does not exist yet, create it
-            -
            			$name	= strip_tags( $_POST['cre-album'] );
-            -
            			$desc 	= sprintf( __( 'This album has been converted from ngg gallery %s' , 'wp-photo-album-plus'), $name );
-            -
            			$uplim	= '0/0';	// Unlimited not to destroy the conversion process!!
-            -
            			$album 	= wppa_create_album_entry( array ( 	'name' 			=> $name,
-            -
            														'description' 	=> $desc,
-            -
            														'upload_limit' 	=> $uplim
-            -
            														 ) );
-            -
            			if ( $album === false ) {
-            -
            				wppa_error_message( __( 'Could not create album.' , 'wp-photo-album-plus').'<br/>Query = '.$query );
-            -
            				wp_die( 'Sorry, cannot continue' );
-            -
            			}
-            -
            		}
-            -
            	}
-            -
            	elseif ( isset( $_POST['wppa-photo-album'] ) ) {
-            -
            		$album = $_POST['wppa-photo-album'];
-            -
            	}
-            -
            	else $album = '0';
-            -
-            -
            	// Report starting process
-            -
            	wppa_ok_message( __( 'Processing files, please wait...' , 'wp-photo-album-plus').' '.__( 'If the line of dots stops growing or your browser reports Ready, your server has given up. In that case: try again' , 'wp-photo-album-plus').' <a href="'.wppa_dbg_url( get_admin_url().'admin.php?page=wppa_import_photos' ).'">'.__( 'here.' , 'wp-photo-album-plus').'</a>' );
-            -
-            -
            	// Do them all
-            -
            	foreach ( array_keys( $files ) as $file_idx ) {
-            -
            		$unsanitized_path_name = $files[$file_idx];
-            -
            		$file = $files[$file_idx];
-            -
            		wppa_is_wppa_tree( $file );	// Sets wppa( 'is_wppa_tree' )
-            -
            		if ( isset( $_POST['use-backup'] ) && is_file( $file.'_backup' ) ) {
-            -
            			$file = $file.'_backup';
-            -
            		}
-            -
            		$file = wppa_sanitize_file_name( $file );
-            -
            		if ( isset( $_POST['file-'.$idx] ) || wppa( 'ajax' ) ) {
-            -
            			if ( wppa( 'is_wppa_tree' ) ) {
-            -
            				if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', basename( wppa_compress_tree_path( $file ) ) );
-            -
            			}
-            -
            			else {
-            -
            				if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', basename( $file ) );
-            -
            			}
-            -
            			$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            			$ext = str_replace( '_backup', '', $ext );
-            -
            			if ( in_array( $ext, $wppa_supported_photo_extensions ) ) {
-            -
-            -
            				// See if a metafile exists
-            -
            				//$meta = substr( $file, 0, strlen( $file ) - 3 ).'pmf';
-            -
            				$meta = wppa_strip_ext( $unsanitized_path_name ) . '.PMF';
-            -
            				if ( ! is_file( $meta ) ) {
-            -
            					$meta = wppa_strip_ext( $unsanitized_path_name ) . '.pmf';
-            -
            				}
-            -
-            -
            				// find all data: name, desc, porder form metafile
-            -
            				if ( is_file( $meta ) ) {
-            -
            					$alb = wppa_get_album_id( wppa_get_meta_album( $meta ) );
-            -
            					$name = wppa_get_meta_name( $meta );
-            -
            					$desc = wppa_txt_to_nl( wppa_get_meta_desc( $meta ) );
-            -
            					$porder = wppa_get_meta_porder( $meta );
-            -
            					$linkurl = wppa_get_meta_linkurl( $meta );
-            -
            					$linktitle = wppa_get_meta_linktitle( $meta );
-            -
            				}
-            -
            				else {
-            -
            					$alb = $album;	// default album
-            -
            					$name = '';		// default name
-            -
            					$desc = '';		// default description
-            -
            					$porder = '0';	// default p_order
-            -
            					$linkurl = '';
-            -
            					$linktitle = '';
-            -
            				}
-            -
-            -
            				// If there is a video or audio with the same name, this is the poster.
-            -
            				$is_poster = wppa_file_is_in_album( wppa_strip_ext( basename( $file ) ) . '.xxx', $alb );
-            -
            				if ( $is_poster ) {
-            -
-            -
            					// Delete possible poster sourcefile
-            -
            					wppa_delete_source( basename( $file ), $alb );
-            -
-            -
            					// Remove possible existing posters, the file-extension may be different as before
-            -
            					$old_photo = wppa_strip_ext( wppa_get_photo_path( $is_poster ) );
-            -
            					$old_thumb = wppa_strip_ext( wppa_get_thumb_path( $is_poster ) );
-            -
            					foreach ( $wppa_supported_photo_extensions as $pext ) {
-            -
            						@ unlink( $old_photo . '.' . $pext );
-            -
            						@ unlink( $old_thumb . '.' . $pext );
-            -
            					}
-            -
-            -
            					// Clear sizes on db
-            -
            					wppa_update_photo( array( 	'thumbx' => '0',
-            -
            												'thumby' => '0',
-            -
            												'photox' => '0',
-            -
            												'photoy' => '0'
-            -
            										));
-            -
-            -
            					// Make new files
-            -
            					$bret = wppa_make_the_photo_files( $file, $is_poster, strtolower( wppa_get_ext( basename( $file ) ) ) );
-            -
            					if ( $bret ) { 	// Success
-            -
            						if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files_done', true );
-            -
            						wppa_save_source( $file, basename( $file ), $alb );
-            -
            						wppa_make_o1_source( $is_poster );
-            -
            						$pcount++;
-            -
            						$totpcount += $bret;
-            -
            						if ( $delp ) {
-            -
            							unlink( $file );
-            -
            						}
-            -
            					}
-            -
            					else { 			// Failed
-            -
            						if ( ! wppa( 'ajax' ) ) {
-            -
            							wppa_error_message('Failed to add poster for item '.$is_poster);
-            -
            						}
-            -
            						if ( $delf ) {
-            -
            							unlink( $file );
-            -
            						}
-            -
            					}
-            -
            				}
-            -
-            -
            				// Update the photo ?
-            -
            				elseif ( isset( $_POST['wppa-update'] ) ) {
-            -
-            -
            					if ( wppa( 'is_wppa_tree' ) ) {
-            -
            						$tmp = explode( '/wppa/', $file );
-            -
            						$name = str_replace( '/', '', $tmp[1] );
-            -
            					}
-            -
-            -
            					$iret = wppa_update_photo_files( $unsanitized_path_name, $name );
-            -
            					if ( $iret ) {
-            -
            						if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files_done', true );
-            -
            						$pcount++;
-            -
            						$totpcount += $iret;
-            -
            						if ( $delp ) {
-            -
            							unlink( $unsanitized_path_name );
-            -
            						}
-            -
            					}
-            -
            					else {
-            -
            						if ( $delf ) {
-            -
            							unlink( $unsanitized_path_name );
-            -
            						}
-            -
            					}
-            -
            				}
-            -
-            -
            				// Insert the photo
-            -
            				else {
-            -
            					if ( is_numeric( $alb ) && $alb != '0' ) {
-            -
            						if ( wppa( 'is_wppa_tree' ) ) {
-            -
            							$tmp = explode( '/wppa/', $file );
-            -
            							$id = str_replace( '/', '', $tmp[1] );
-            -
            							$name = $id;
-            -
            						}
-            -
            						else {
-            -
            							$id = basename( $file );
-            -
            						}
-            -
            						if ( wppa_switch( 'void_dups' ) && wppa_file_is_in_album( $id, $alb ) ) {
-            -
            							wppa_warning_message( sprintf( __( 'Photo %s already exists in album %s. (1)' , 'wp-photo-album-plus'), $id, $alb ) );
-            -
            							wppa( 'ajax_import_files_error', __( 'Duplicate', 'wp-photo-album-plus') );
-            -
            							if ( $delf ) {
-            -
            								unlink( $file );
-            -
            							}
-            -
            						}
-            -
            						else {
-            -
            							$id = substr( $id, 0, strpos( $id, '.' ) );
-            -
            							if ( !is_numeric( $id ) || ! wppa_is_id_free( 'photo', $id ) ) $id = 0;
-            -
            							if ( wppa_insert_photo( $unsanitized_path_name, $alb, stripslashes( $name ), stripslashes( $desc ), $porder, $id, stripslashes( $linkurl ), stripslashes( $linktitle ) ) ) {
-            -
            								if ( wppa( 'ajax' ) ) {
-            -
            									wppa( 'ajax_import_files_done', true );
-            -
            								}
-            -
            								$pcount++;
-            -
            								if ( $delp ) {
-            -
            									unlink( $unsanitized_path_name );
-            -
            									if ( is_file( $meta ) ) unlink( $meta );
-            -
            								}
-            -
            							}
-            -
            							else {
-            -
            								wppa_error_message( __( 'Error inserting photo' , 'wp-photo-album-plus') . ' ' . basename( $file ) . '.' );
-            -
            								if ( $delf ) {
-            -
            									unlink( $unsanitized_path_name );
-            -
            								}
-            -
            							}
-            -
            						}
-            -
            					}
-            -
            					else {
-            -
            						wppa_error_message( sprintf( __( 'Error inserting photo %s, unknown or non existent album.' , 'wp-photo-album-plus'), basename( $file ) ) );
-            -
            					}
-            -
            				} // Insert
-            -
            			}
-            -
            		}
-            -
            		$idx++;
-            -
            		if ( $source_type == 'remote' ) unset( $files[$file_idx] );
-            -
            		if ( wppa_is_time_up() ) {
-            -
            			wppa_warning_message( sprintf( __( 'Time out. %s photos imported. Please restart this operation.' , 'wp-photo-album-plus'), $pcount ) );
-            -
            			wppa_set_last_album( $album );
-            -
            			if ( $source_type == 'remote' ) update_option( 'wppa_import_source_url_found_'.$user, $files );
-            -
            			return;
-            -
            		}
-            -
            	} // foreach $files
-            -
            	if ( $source_type == 'remote' ) update_option( 'wppa_import_source_url_found_'.$user, $files );
-            -
-            -
            	// Now the dirs to album imports
-            -
-            -
            	$idx 		= '0';
-            -
            	$dircount 	= '0';
-            -
            	global $photocount;
-            -
            	$photocount = '0';
-            -
            	$iret 		= true;
-            -
-            -
            	foreach ( $files as $file ) {
-            -
            		if ( basename( $file ) != '.' &&  basename( $file ) != '..' && ( isset( $_POST['file-'.$idx] ) || isset( $_GET['continue'] ) ) ) {
-            -
            			if ( is_dir( $file ) ) {
-            -
            				$iret = wppa_import_dir_to_album( $file, '0' );
-            -
            				if ( wppa_is_time_up() && wppa_switch( 'auto_continue' ) ) {
-            -
            					wppa( 'continue', 'continue' );
-            -
            				}
-            -
            				$dircount++;
-            -
            			}
-            -
            		}
-            -
            		$idx++;
-            -
            		if ( $iret == false ) break;	// Time out
-            -
            	}
-            -
-            -
            	// Now the video files
-            -
            	$videocount = '0';
-            -
            	$alb = isset( $_POST['wppa-video-album'] ) ? $_POST['wppa-video-album'] : '0';
-            -
            	if ( wppa( 'ajax' ) && ! $alb ) {
-            -
            		wppa( 'ajax_import_files_error', __( 'Unknown album' , 'wp-photo-album-plus' ) );
-            -
            	}
-            -
            	else foreach ( array_keys( $files ) as $idx ) {
-            -
            		$file = $files[$idx];
-            -
            		if ( isset( $_POST['file-'.$idx] ) || wppa( 'ajax' ) ) {
-            -
            			if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', wppa_sanitize_file_name( basename( $file ) ) );	/* */
-            -
            			$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            			if ( in_array( $ext, $wppa_supported_video_extensions ) ) {
-            -
            				if ( is_numeric( $alb ) && $alb != '0' ) {
-            -
-            -
            					// Do we have this filename with ext xxx in this album?
-            -
            					$filename = wppa_strip_ext( basename( $file ) ).'.xxx';
-            -
            					$id = wppa_file_is_in_album( $filename, $alb );
-            -
-            -
            					// Or maybe the poster is already there
-            -
            					foreach ( $wppa_supported_photo_extensions as $pext ) {
-            -
            						if ( ! $id ) {
-            -
            							$id = wppa_file_is_in_album( str_replace( 'xxx', $pext, $filename ), $alb );
-            -
            						}
-            -
            					}
-            -
-            -
            					// This filename already exists: is the poster. Fix the filename in the photo info
-            -
            					if ( $id ) {
-            -
            						$fname = wppa_get_photo_item( $id, 'filename' );
-            -
            						$fname = wppa_strip_ext( $fname ) . '.xxx';
-            -
-            -
            						// Fix filename and ext in photo info
-            -
            						wppa_update_photo( array( 'id' => $id, 'filename' => $fname, 'ext' => 'xxx' ) );
-            -
            					}
-            -
-            -
            					// Add new entry
-            -
            					if ( ! $id ) {
-            -
            						$id = wppa_create_photo_entry( array( 'album' => $alb, 'filename' => $filename, 'ext' => 'xxx', 'name' => wppa_strip_ext( $filename ) ) );
-            -
            						wppa_flush_treecounts( $alb );
-            -
            					}
-            -
-            -
            					// Add video filetype
-            -
            					$newpath = wppa_strip_ext( wppa_get_photo_path( $id ) ).'.'.$ext;
-            -
            					copy( $file, $newpath );
-            -
            					if ( $delv ) unlink( $file );
-            -
            					if ( wppa( 'ajax' ) ) {
-            -
            						wppa( 'ajax_import_files_done', true );
-            -
            					}
-            -
-            -
            					// Make sure ext is set to xxx after adding video to an existing poster
-            -
            					wppa_update_photo( array( 'id' => $id, 'ext' => 'xxx' ) );
-            -
-            -
            					// Book keeping
-            -
            					$videocount++;
-            -
            				}
-            -
            				else {
-            -
            					wppa_error_message( sprintf( __( 'Error inserting video %s, unknown or non existent album.' , 'wp-photo-album-plus'), basename( $file ) ) );
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            	}
-            -
-            -
            	// Now the audio files
-            -
            	$audiocount = '0';
-            -
            	$alb = isset( $_POST['wppa-audio-album'] ) ? $_POST['wppa-audio-album'] : '0';
-            -
            	if ( wppa( 'ajax' ) && ! $alb ) {
-            -
            		wppa( 'ajax_import_files_error', __( 'Unknown album', 'wp-photo-album-plus' ) );
-            -
            	}
-            -
            	else foreach ( array_keys( $files ) as $idx ) {
-            -
            		$file = $files[$idx];
-            -
            		if ( isset( $_POST['file-'.$idx] ) || wppa( 'ajax' ) ) {
-            -
            			if ( wppa( 'ajax' ) ) wppa( 'ajax_import_files', wppa_sanitize_file_name( basename( $file ) ) );
-            -
            			$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            			if ( in_array( $ext, $wppa_supported_audio_extensions ) ) {
-            -
            				if ( is_numeric( $alb ) && $alb != '0' ) {
-            -
-            -
            					// Do we have this filename with ext xxx in this album?
-            -
            					$filename = wppa_strip_ext( basename( $file ) ).'.xxx';
-            -
            					$id = wppa_file_is_in_album( $filename, $alb );
-            -
-            -
            					// Or maybe the poster is already there
-            -
            					foreach ( $wppa_supported_photo_extensions as $pext ) {
-            -
            						if ( ! $id ) {
-            -
            							$id = wppa_file_is_in_album( str_replace( 'xxx', $pext, $filename ), $alb );
-            -
            						}
-            -
            					}
-            -
-            -
            					// This filename already exists: is the poster. Fix the filename in the photo info
-            -
            					if ( $id ) {
-            -
            						$fname = wppa_get_photo_item( $id, 'filename' );
-            -
            						$fname = wppa_strip_ext( $fname ) . '.xxx';
-            -
-            -
            						// Fix filename and ext in photo info
-            -
            						wppa_update_photo( array( 'id' => $id, 'filename' => $fname, 'ext' => 'xxx' ) );
-            -
            					}
-            -
-            -
            					// Add new entry
-            -
            					if ( ! $id ) {
-            -
            						$id = wppa_create_photo_entry( array( 'album' => $alb, 'filename' => $filename, 'ext' => 'xxx', 'name' => wppa_strip_ext( $filename ) ) );
-            -
            						wppa_flush_treecounts( $alb );
-            -
            					}
-            -
-            -
            					// Add audio filetype
-            -
            					$newpath = wppa_strip_ext( wppa_get_photo_path( $id ) ).'.'.$ext;
-            -
            					copy( $file, $newpath );
-            -
            					if ( $delu ) unlink( $file );
-            -
            					if ( wppa( 'ajax' ) ) {
-            -
            						wppa( 'ajax_import_files_done', true );
-            -
            					}
-            -
-            -
            					// Make sure ext is set to xxx after adding audio to an existing poster
-            -
            					wppa_update_photo( array( 'id' => $id, 'ext' => 'xxx' ) );
-            -
-            -
            					// Book keeping
-            -
            					$audiocount++;
-            -
            				}
-            -
            				else {
-            -
            					wppa_error_message( sprintf( __( 'Error inserting audio %s, unknown or non existent album.' , 'wp-photo-album-plus'), basename( $file ) ) );
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            	}
-            -
-            -
            	// The csv files. NOT with ajax
-            -
            	$csvcount = wppa_get_csvcount( $files );
-            -
            	if ( $csvcount ) {
-            -
            		$csvcount = '0';
-            -
            		if ( ! wppa( 'ajax' ) ) {
-            -
            			if ( is_array( $files ) ) {
-            -
-            -
            				// 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
-            -
            				$cust_labels = array();
-            -
            				for ( $i = '0'; $i < '10'; $i++ ) {
-            -
            					$cust_labels[$i] = wppa_opt( 'custom_caption_' . $i );
-            -
            				}
-            -
            /*
-            -
            				// Display the captions we have
-            -
            				echo __( 'Captions are:' ) . ' ';
-            -
            				for ( $i = 0; $i < '10'; $i++ ) {
-            -
            					echo '[' . $i . '] -> ';
-            -
            					if ( $cust_labels[$i] ) {
-            -
            						echo $cust_labels[$i] . ' ';
-            -
            					}
-            -
            					else {
-            -
            						echo __( '--- not used ---' ) . ' ';
-            -
            					}
-            -
            				}
-            -
            				echo '<br />';
-            -
            */
-            -
            				// Process the files
-            -
            				$photos_processed_csv = '0';
-            -
            				$photos_skipped_csv = '0';
-            -
            				foreach ( array_keys( $files ) as $idx ) {
-            -
            					$this_skipped = '0';
-            -
            					$file = $files[$idx];
-            -
            					if ( isset( $_POST['file-'.$idx] ) || isset( $_GET['continue'] ) ) {
-            -
            						$ext = strtolower( wppa_get_ext( $file ) );
-            -
            						if ( $ext == 'csv' ) {
-            -
            							echo '<b>' . __( 'Processing', 'wp-photo-album-plus') . ' ' . basename( $file ) . '</b><br />';
-            -
            							wppa_log( 'dbg', __( 'Processing', 'wp-photo-album-plus') . ' ' . basename( $file ) );
-            -
-            -
            							// Copy the file to a temp file
-            -
            							$tempfile = dirname( $file ) . '/temp.csv';
-            -
            							copy ( $file, $tempfile );
-            -
-            -
            							// Open file
-            -
            							$handle = fopen( $tempfile, "rt" );
-            -
            							if ( ! $handle ) {
-            -
            								wppa_error_message( __( 'Can not open file. Can not continue. (1)' , 'wp-photo-album-plus') );
-            -
            								return;
-            -
            							}
-            -
            							$write_handle = fopen( $file, "wt" );
-            -
            							if ( ! $write_handle ) {
-            -
            								wppa_error_message( __( 'Can not open file. Can not continue. (2)' , 'wp-photo-album-plus') );
-            -
            								return;
-            -
            							}
-            -
-            -
            							// Read header
-            -
            							$header = fgets( $handle, 4096 );
-            -
            							if ( ! $header ) {
-            -
            								wppa_error_message( __( 'Can not read header. Can not continue.' , 'wp-photo-album-plus') );
-            -
            								fclose( $handle );
-            -
            								return;
-            -
            							}
-            -
            							fputs( $write_handle, $header );
-            -
            							echo __( 'Read header:' , 'wp-photo-album-plus') . ' ' . $header . '<br />';
-            -
-            -
            							// Interprete header
-            -
            							$captions = wppa_explode_csv( $header );
-            -
            							if ( ! is_array( $captions ) || count( $captions ) < '2' ) {
-            -
            								wppa_error_message( __( 'Invalid header. Can not continue.' , 'wp-photo-album-plus') );
-            -
            								fclose( $handle );
-            -
            								return;
-            -
            							}
-            -
            							foreach ( array_keys( $captions ) as $key ) {
-            -
            								if ( $key == '0' ) {
-            -
            									if ( ! in_array( strtolower( trim( $captions['0'] ) ), array( 'name', 'photoname', 'filename' ) ) ) {
-            -
            										wppa_error_message( __( 'Invalid header. First item must be \'name\', \'photoname\' or \'filename\'' , 'wp-photo-album-plus') );
-            -
            										fclose( $handle );
-            -
            										return;
-            -
            									}
-            -
            								}
-            -
            								elseif ( ! in_array( $captions[$key], $cust_labels ) ) {
-            -
            									if ( ! in_array( '', $cust_labels ) ) {
-            -
            										wppa_error_message( __( 'All available custom data fields are in use. There is no space for' , 'wp-photo-album-plus') . ' ' . $captions[$key] );
-            -
            										fclose( $handle );
-            -
            										return;
-            -
            									}
-            -
-            -
            									// Add a new caption
-            -
            									$i = '0';
-            -
            									while ( $cust_labels[$i] ) $i++;
-            -
            									$cust_labels[$i] = $captions[$key];
-            -
            									wppa_update_option( 'wppa_custom_caption_' . $i, $cust_labels[$i] );
-            -
            									wppa_update_option( 'wppa_custom_visible_' . $i, 'yes' );
-            -
            									wppa_log( 'dbg', sprintf( __( 'New caption %s added.' , 'wp-photo-album-plus'), $cust_labels[$i] ) );
-            -
            								}
-            -
            							}
-            -
-            -
            							// Find the correlation between caption index and custom data index.
-            -
            							$pointers = array();
-            -
            							for ( $i = '1'; $i < count( $captions ); $i++ ) {
-            -
            								for ( $j = '0'; $j < '10'; $j++ ) {
-            -
            									if ( $captions[$i] == $cust_labels[$j] ) {
-            -
            										$pointers[$j] = $i;
-            -
            									}
-            -
            								}
-            -
            							}
-            -
-            -
            							// Now process the lines
-            -
            							while ( ! feof( $handle ) ) {
-            -
            								$dataline = fgets( $handle, 4096 );
-            -
            								if ( $dataline ) {
-            -
            									wppa_log( 'dbg', __( 'Read data:' , 'wp-photo-album-plus') . ' ' . trim( $dataline ) );
-            -
            									$data_arr = wppa_explode_csv( $dataline );
-            -
            									$search = $data_arr[0];
-            -
            									switch ( strtolower($captions[0]) ) {
-            -
            										case 'photoname':
-            -
            											$photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `name` = %s", $data_arr[0] ), ARRAY_A );
-            -
            											break;
-            -
            										case 'filename':
-            -
            											$photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `filename` = %s", $data_arr[0] ), ARRAY_A );
-            -
            											break;
-            -
            										case 'name':
-            -
            											$photos = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `".WPPA_PHOTOS."` WHERE `name` = %s OR `filename` = %s", $data_arr[0], $data_arr[0] ), ARRAY_A );
-            -
            											break;
-            -
            									}
-            -
            									if ( $photos ) {
-            -
            										foreach( $photos as $photo ) {
-            -
            											$cust_data = $photo['custom'] ? unserialize( $photo['custom'] ) : array( '', '', '', '', '', '', '', '', '', '' );
-            -
            											foreach( array_keys( $pointers ) as $p ) {
-            -
            												$cust_data[$p] = wppa_sanitize_custom_field( $data_arr[$pointers[$p]] );
-            -
            											}
-            -
            											wppa_update_photo( array( 'id' => $photo['id'], 'custom' => serialize( $cust_data ) ) );
-            -
            											$photos_processed_csv ++;
-            -
            										}
-            -
            										wppa_log( 'dbg', 'Processed: ' . $data_arr[0] );
-            -
            									}
-            -
-            -
            									// This line could not be processed
-            -
            									else {
-            -
            										wppa_log( 'dbg', 'Could not find: ' . $data_arr[0] );
-            -
-            -
            										// Write back to original file
-            -
            										fputs( $write_handle, $dataline );
-            -
            										$photos_skipped_csv++;
-            -
            										$this_skipped++;
-            -
            									}
-            -
            									echo '.';
-            -
            								}
-            -
-            -
            								// Time up?
-            -
            								if ( wppa_is_time_up() && wppa_switch( 'auto_continue' ) ) {
-            -
            									wppa( 'continue', 'continue' );
-            -
-            -
            									// Copy rest of file back to original
-            -
            									while ( ! feof( $handle ) ) {
-            -
            										$temp = fgets( $handle, 4096 );
-            -
            										fputs( $write_handle, $temp );
-            -
            									}
-            -
            								}
-            -
            							}
-            -
-            -
            							fclose( $handle );
-            -
            							fclose( $write_handle );
-            -
-            -
            							$csvcount++;
-            -
-            -
            							// Remove tempfile
-            -
            							unlink( $tempfile );
-            -
-            -
            							// Remove orig file
-            -
            							if ( ! $this_skipped && ! wppa_is_time_up() ) {
-            -
            								unlink( $file );
-            -
            							}
-            -
            						}
-            -
            					}
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            	}
-            -
-            -
            	wppa_ok_message( __( 'Done processing files.' , 'wp-photo-album-plus') );
-            -
-            -
            	if ( $pcount == '0' && $acount == '0' && $zcount == '0' && $dircount == '0' && $photocount == '0' && $videocount == '0' && $audiocount == '0' && $csvcount == '0' ) {
-            -
            		wppa_warning_message( __( 'No files to import.' , 'wp-photo-album-plus') );
-            -
            	}
-            -
            	else {
-            -
            		$msg = '';
-            -
            		if ( $zcount ) $msg .= $zcount.' '.__( 'Zipfiles extracted.' , 'wp-photo-album-plus').' ';
-            -
            		if ( $acount ) $msg .= $acount.' '.__( 'Albums created.' , 'wp-photo-album-plus').' ';
-            -
            		if ( $dircount ) $msg .= $dircount.' '.__( 'Directory to album imports.' , 'wp-photo-album-plus').' ';
-            -
            		if ( $photocount ) $msg .= ' '.sprintf( __( 'With total %s photos.','wppa' , 'wp-photo-album-plus'), $photocount ).' ';
-            -
            		if ( $pcount ) {
-            -
            			if ( isset( $_POST['wppa-update'] ) ) {
-            -
            				$msg .= $pcount.' '.__( 'Photos updated' , 'wp-photo-album-plus');
-            -
            				if ( $totpcount != $pcount ) {
-            -
            					$msg .= ' '.sprintf( __( 'to %s locations' , 'wp-photo-album-plus'), $totpcount );
-            -
            				}
-            -
            				$msg .= '.';
-            -
            			}
-            -
            			else $msg .= $pcount.' '.__( 'single photos imported.' , 'wp-photo-album-plus').' ';
-            -
            		}
-            -
            		if ( $videocount ) {
-            -
            			$msg .= $videocount.' '.__( 'Videos imported.' , 'wp-photo-album-plus');
-            -
            		}
-            -
            		if ( $audiocount ) {
-            -
            			$msg .= $audiocount.' '.__( 'Audios imported.' , 'wp-photo-album-plus');
-            -
            		}
-            -
            		if ( $csvcount ) {
-            -
            			$msg .= $csvcount . ' ' . __( 'CSVs imported,' , 'wp-photo-album-plus') . ' ' .
-            -
            					$photos_processed_csv .' '. __( 'photos processed.', 'wp-photo-album-plus') . ' ' .
-            -
            					$photos_skipped_csv . ' ' . __('photos skipped.', 'wp-photo-album-plus');
-            -
            		}
-            -
            		wppa_ok_message( $msg );
-            -
            		wppa_set_last_album( $album );
-            -
            	}
-            -
            }
-            -
-            -
            function wppa_get_zipcount( $files ) {
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            			if ( $ext == 'zip' ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_get_albumcount( $files ) {
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			$ext = strtolower( substr( strrchr( $file, "." ), 1 ) );
-            -
            			if ( $ext == 'amf' ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_get_photocount( $files ) {
-            -
            global $wppa_supported_photo_extensions;
-            -
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			$ext = strtolower( wppa_get_ext( $file ) );
-            -
            			if ( in_array( $ext, $wppa_supported_photo_extensions ) ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_get_video_count( $files ) {
-            -
            global $wppa_supported_video_extensions;
-            -
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			$ext = strtolower( wppa_get_ext( $file ) );
-            -
            			if ( in_array( $ext, $wppa_supported_video_extensions ) ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_get_audio_count( $files ) {
-            -
            global $wppa_supported_audio_extensions;
-            -
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			$ext = strtolower( wppa_get_ext( $file ) );
-            -
            			if ( in_array( $ext, $wppa_supported_audio_extensions ) ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
-            -
            // Find dir is new album candidates
-            -
            function wppa_get_dircount( $files ) {
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			if ( basename( $file ) == '.' ) {}
-            -
            			elseif ( basename( $file ) == '..' ) {}
-            -
            			elseif ( is_dir( $file ) ) $result++;
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            // Find .csv file count
-            -
            function wppa_get_csvcount( $files ) {
-            -
            	$result = 0;
-            -
            	if ( $files ) {
-            -
            		foreach ( $files as $file ) {
-            -
            			if ( is_file( $file ) ) {
-            -
            				if ( strtolower( wppa_get_ext( $file ) ) == 'csv' ) $result++;
-            -
            			}
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_get_meta_name( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'name', $opt );
-            -
            }
-            -
            function wppa_get_meta_album( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'albm', $opt );
-            -
            }
-            -
            function wppa_get_meta_desc( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'desc', $opt );
-            -
            }
-            -
            function wppa_get_meta_porder( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'pord', $opt );
-            -
            }
-            -
            function wppa_get_meta_linkurl( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'lnku', $opt );
-            -
            }
-            -
            function wppa_get_meta_linktitle( $file, $opt = '' ) {
-            -
            	return wppa_get_meta_data( $file, 'lnkt', $opt );
-            -
            }
-            -
-            -
            function wppa_get_meta_data( $file, $item, $opt ) {
-            -
            	$result = '';
-            -
            	$opt2 = '';
-            -
            	if ( $opt == '( ' ) $opt2 = ' )';
-            -
            	if ( $opt == '{' ) $opt2 = '}';
-            -
            	if ( $opt == '[' ) $opt2 = ']';
-            -
            	if ( is_file( $file ) ) {
-            -
            		$handle = fopen( $file, "r" );
-            -
            		if ( $handle ) {
-            -
            			while ( ( $buffer = fgets( $handle, 4096 ) ) !== false ) {
-            -
            				if ( substr( $buffer, 0, 5 ) == $item.'=' ) {
-            -
            					if ( $opt == '' ) $result = substr( $buffer, 5, strlen( $buffer )-6 );
-            -
            					else $result = $opt.__( substr( $buffer, 5, strlen( $buffer )-6 ) ).$opt2;		// Translate for display purposes only
-            -
            				}
-            -
            			}
-            -
            			if ( !feof( $handle ) ) {
-            -
            				_e( 'Error: unexpected fgets() fail in wppa_get_meta_data().' , 'wp-photo-album-plus');
-            -
            			}
-            -
            			fclose( $handle );
-            -
            		}
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
-            -
            function wppa_extract( $xpath, $delz ) {
-            -
            // There are two reasons that we do not allow the directory structure from the zipfile to be restored.
-            -
            // 1. we may have no create dir access rights.
-            -
            // 2. we can not reach the pictures as we only glob the users depot and not lower.
-            -
            // We extract all files to the users depot.
-            -
            // The illegal files will be deleted there by the wppa_sanitize_files routine,
-            -
            // so there is no chance a depot/subdir/destroy.php or the like will get a chance to be created.
-            -
            // dus...
-            -
-            -
            	$err = '0';
-            -
            	if ( ! class_exists( 'ZipArchive' ) ) {
-            -
            		$err = '3';
-            -
            		wppa_error_message( __( 'Class ZipArchive does not exist! Check your php configuration' , 'wp-photo-album-plus') );
-            -
            	}
-            -
            	else {
-            -
-            -
            		// Start security fix
-            -
            		$path = wppa_sanitize_file_name( $xpath );
-            -
            		if ( ! file_exists( $xpath ) ) {
-            -
            			wppa_error_message( 'Zipfile '.$path.' does not exist.' );
-            -
            //			unlink( $xpath );
-            -
            			$err = '4';
-            -
            			return $err;
-            -
            		}
-            -
            		// End security fix
-            -
-            -
            		$ext = strtolower( wppa_get_ext( $xpath ) );
-            -
            		if ( $ext == 'zip' ) {
-            -
            			$zip = new ZipArchive;
-            -
            			if ( $zip->open( $xpath ) === true ) {
-            -
-            -
            				$supported_file_ext = array( 'jpg', 'png', 'gif', 'JPG', 'PNG', 'GIF', 'amf', 'pmf' );
-            -
            				$done = '0';
-            -
            				$skip = '0';
-            -
            				for( $i = 0; $i < $zip->numFiles; $i++ ){
-            -
            					$stat = $zip->statIndex( $i );
-            -
            					$file_ext = @ end( explode( '.', $stat['name'] ) );
-            -
            					if ( in_array( $file_ext, $supported_file_ext ) ) {
-            -
            						$zip->extractTo( WPPA_DEPOT_PATH, $stat['name'] );
-            -
            						$done++;
-            -
            					}
-            -
            					else {
-            -
            						wppa_warning_message( sprintf( __( 'File %s is of an unsupported filetype and has been ignored during extraction.' , 'wp-photo-album-plus'), wppa_sanitize_file_name( $stat['name'] ) ) );
-            -
            						$skip++;
-            -
            					}
-            -
            				}
-            -
-            -
            				$zip->close();
-            -
            				wppa_ok_message( sprintf( __( 'Zipfile %s processed. %s files extracted, %s files skipped.' , 'wp-photo-album-plus'), basename( $path ), $done, $skip ) );
-            -
            				if ( $delz ) unlink( $xpath );
-            -
            			} else {
-            -
            				wppa_error_message( __( 'Failed to extract' , 'wp-photo-album-plus').' '.$path );
-            -
            				$err = '1';
-            -
            			}
-            -
            		}
-            -
            		else $err = '2';
-            -
            	}
-            -
            	return $err;
-            -
            }
-            -
-            -
            function wppa_import_dir_to_album( $file, $parent ) {
-            -
            global $photocount;
-            -
            global $wpdb;
-            -
            global $wppa_session;
-            -
-            -
            	// Session should survive the default hour
-            -
            	wppa_extend_session();
-            -
-            -
            	// see if album exists
-            -
            	if ( is_dir( $file ) ) {
-            -
-            -
            		// Check parent
-            -
            		if ( wppa_switch( 'import_parent_check' ) ) {
-            -
-            -
            			$alb = wppa_get_album_id( basename( $file ), $parent );
-            -
-            -
            			// If parent = 0 ( top-level album ) and album not found,
-            -
            			// try a 'separate' album ( i.e. parent = -1 ) with this name
-            -
            			if ( ! $alb && $parent == '0' ) {
-            -
            				$alb = wppa_get_album_id( basename( $file ), '-1' );
-            -
            			}
-            -
            		}
-            -
-            -
            		// All albums have unique names, do'nt worry about parent
-            -
            		else {
-            -
            			$alb = wppa_get_album_id( basename( $file ), false );
-            -
            		}
-            -
-            -
            		if ( ! $alb ) {	// Album must be created
-            -
            			$name	= basename( $file );
-            -
            			$uplim	= wppa_opt( 'upload_limit_count' ). '/' . wppa_opt( 'upload_limit_time' );
-            -
            			$alb = wppa_create_album_entry( array ( 'name' 		=> $name,
-            -
            													'a_parent' 	=> $parent
-            -
            													 ) );
-            -
            			if ( $alb === false ) {
-            -
            				wppa_error_message( __( 'Could not create album.' , 'wp-photo-album-plus').'<br/>Query = '.$query );
-            -
            				wp_die( 'Sorry, cannot continue' );
-            -
            			}
-            -
            			else {
-            -
            				wppa_set_last_album( $alb );
-            -
            				wppa_flush_treecounts( $alb );
-            -
            				wppa_index_add( 'album', $alb );
-            -
            				wppa_create_pl_htaccess();
-            -
            				wppa_ok_message( __( 'Album #' , 'wp-photo-album-plus') . ' ' . $alb . ' ( '.$name.' ) ' . __( 'Added.' , 'wp-photo-album-plus') );
-            -
            				if ( wppa_switch( 'newpag_create' ) && $parent <= '0' ) {
-            -
-            -
            					// Create post object
-            -
            					$my_post = array(
-            -
            					  'post_title'    => $name,
-            -
            					  'post_content'  => str_replace( 'w#album', $alb, wppa_opt( 'newpag_content' ) ),
-            -
            					  'post_status'   => wppa_opt( 'newpag_status' ),
-            -
            					  'post_type'	  => wppa_opt( 'newpag_type' )
-            -
            					 );
-            -
-            -
            					// Insert the post into the database
-            -
            					$pagid = wp_insert_post( $my_post );
-            -
            					if ( $pagid ) {
-            -
            						wppa_ok_message( sprintf( __( 'Page <a href="%s" target="_blank" >%s</a> created.' , 'wp-photo-album-plus'), home_url().'?page_id='.$pagid, $name ) );
-            -
            						$wpdb->query( $wpdb->prepare( "UPDATE `".WPPA_ALBUMS."` SET `cover_linkpage` = %s WHERE `id` = %s", $pagid, $alb ) );
-            -
            					}
-            -
            					else {
-            -
            						wppa_error_message( __( 'Could not create page.' , 'wp-photo-album-plus') );
-            -
            					}
-            -
            				}
-            -
            			}
-            -
            		}
-            -
-            -
            		// Now import the files
-            -
            		$photofiles = glob( $file.'/*' );
-            -
            		if ( $photofiles ) foreach ( $photofiles as $photofile ) {
-            -
            			if ( ! is_dir( $photofile ) ) {
-            -
-            -
            				if ( ! isset( $wppa_session[$photofile] ) || ! wppa_switch( 'keep_import_files' ) ) {
-            -
-            -
            					if ( wppa_albumphoto_exists( $alb, basename( $photofile ) ) ) {
-            -
            						if ( ! wppa_switch( 'keep_import_files' ) ) {
-            -
            							wppa_warning_message( 'Photo '.basename( $photofile ).' already exists in album '.$alb.'. Removed. (2)' );
-            -
            						}
-            -
            					}
-            -
            					else {
-            -
            						$bret = wppa_insert_photo( $photofile, $alb, basename( $photofile ) );
-            -
            						$photocount++;
-            -
            					}
-            -
            					if ( ! wppa_switch( 'keep_import_files' ) ) {
-            -
            						@ unlink( $photofile );
-            -
            					}
-            -
            					$wppa_session[$photofile] = true;
-            -
            				}
-            -
-            -
            				if ( wppa_is_time_up( $photocount ) ) return false;
-            -
            			}
-            -
            		}
-            -
-            -
            		// Now go deeper, process the subdirs
-            -
            		$subdirs = glob( $file.'/*' );
-            -
            		if ( $subdirs ) foreach ( $subdirs as $subdir ) {
-            -
            			if ( is_dir( $subdir ) ) {
-            -
            				if ( basename( $subdir ) != '.' && basename( $subdir ) != '..' ) {
-            -
            					$bret = wppa_import_dir_to_album( $subdir, $alb );
-            -
            					if ( ! $bret ) return false;	// Time out
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            		@ rmdir( $file );	// Try to remove dir, ignore error
-            -
            	}
-            -
            	else {
-            -
            		wppa_dbg_msg( 'Invalid file in wppa_import_dir_to_album(): '.$file );
-            -
            		return false;
-            -
            	}
-            -
            	return true;
-            -
            }
-            -
-            -
            function wppa_is_wppa_tree( $file ) {
-            -
-            -
            	$temp = explode( '/uploads/wppa/', $file );
-            -
            	if ( count( $temp ) === 2 ) {
-            -
            		$temp[1] = wppa_expand_id( wppa_strip_ext( $temp[1] ) ) . '.' . wppa_get_ext( $temp[1] );
-            -
            		$newf = implode( '/wppa/', $temp );
-            -
            		wppa( 'is_wppa_tree', ( $newf != $file ) );
-            -
            	}
-            -
            	else {
-            -
            		wppa( 'is_wppa_tree', false );
-            -
            	}
-            -
            	return wppa( 'is_wppa_tree' );
-            -
            }
-            -
-            -
            function wppa_compress_tree_path( $path ) {
-            -
-            -
            	$result = $path;
-            -
            	$temp = explode( '/wppa/', $path );
-            -
            	if ( count( $temp ) == '2' ) {
-            -
            		$temp[1] = str_replace( '/', '', $temp[1] );
-            -
            		$result = implode( '/wppa/', $temp );
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_expand_tree_path( $path ) {
-            -
-            -
            	$result = $path;
-            -
            	$temp = explode( '/wppa/', $path );
-            -
            	if ( count( $temp ) == '2' ) {
-            -
            		$temp[1] = wppa_expand_id( wppa_strip_ext( $temp[1] ) ) . '.' . wppa_get_ext( $temp[1] );
-            -
            		$result = implode( '/wppa/', $temp );
-            -
            	}
-            -
            	return $result;
-            -
            }
-            -
-            -
            function wppa_abs_walktree( $root, $source ) {
-            -
            static $void_dirs;
-            -
-            -
            	// Init void dirs
-            -
            	if ( ! $void_dirs ) {
-            -
            		$void_dirs = array( '.', '..',
-            -
            							'wp-admin',
-            -
            							'wp-includes',
-            -
            							'themes',
-            -
            							'upgrade',
-            -
            							'plugins',
-            -
            							'languages',
-            -
            							'wppa',
-            -
            							( wppa_switch( 'allow_import_source') ? '' : 'wppa-source' ),
-            -
            							);
-            -
            	}
-            -
-            -
            	// If currently in selected dir, set selected
-            -
            	$sel = $root == $source ? ' selected="selected"' : '';
-            -
-            -
            	// Set disabled if there are no files inside
-            -
            	$n_files = count( glob( $root . '/*' ) );
-            -
            	$n_dirs  = count( glob( $root . '/*', GLOB_ONLYDIR ) );
-            -
            	$dis     = $n_files == $n_dirs ? ' disabled="disabled"' : '';
-            -
-            -
            	// Check for (sub)depot
-            -
            	$my_depot = __( '--- My depot --- ' ,'wp-photo-album-plus' );
-            -
            	$display  = str_replace( WPPA_DEPOT_PATH, $my_depot, $root );
-            -
            	if ( strpos( $display, $my_depot ) !== false ) {
-            -
            		$dis = '';
-            -
            	}
-            -
-            -
            	// Check for ngg gallery dir
-            -
            	$ngg_opts = get_option( 'ngg_options', false );
-            -
            	if ( $ngg_opts ) {
-            -
            		$ngg_gal =  __( '--- Ngg Galleries --- ', 'wp-photo-album-plus' );
-            -
            		$display = str_replace( rtrim( $ngg_opts['gallerypath'], '/' ), $ngg_gal, $display );
-            -
            		$pos = strpos( $display, $ngg_gal );
-            -
            		if ( $pos ) {
-            -
            			$display = substr( $display, $pos );
-            -
            		}
-            -
            	}
-            -
-            -
            	// Remove ABSPATH from display string
-            -
            	$display = str_replace( ABSPATH, '', $display );
-            -
-            -
            	// Output the selecion if not in the wp dir
-            -
            	if ( $root.'/' != ABSPATH ) {
-            -
            		echo "\n" . '<option' .
-            -
            						' value="' . $root . '"' .
-            -
            						$sel .
-            -
            						$dis .
-            -
            						' data-nfiles="' . $n_files . '"' .
-            -
            						' data-ndirs="' . $n_dirs . '"' .
-            -
            						' >' .
-            -
            						$display .
-            -
            					'</option>';
-            -
            	}
-            -
-            -
            	// See if subdirs exist
-            -
            	$dirs = glob( $root . '/*', GLOB_ONLYDIR );
-            -
-            -
            	// Go deeper if not in a list of void disnames
-            -
            	if ( $dirs ) foreach( $dirs as $path ) {
-            -
            		$dir = basename( $path );
-            -
            		if ( ! in_array( $dir, $void_dirs ) ) {
-            -
            			$newroot = $root . '/' . $dir;
-            -
            			wppa_abs_walktree( $newroot, $source );
-            -
            		}
-            -
            	}
-            -
            }

             /* wppa-upload.php
             * Package: wp-photo-album-plus
+            *
+            +
            * Contains all the upload pages and functions
+            +
            * Version 6.5.02
+            *
             */
             function _wppa_page_upload() {
             global $target;
             global $wppa_revno;
+            +
            global $upload_album;
                 // sanitize system
             	$user = wppa_get_user();
             	wppa_sanitize_files();
+            +
            	// Sanitize album input
+            +
            	if ( isset( $_POST['wppa-album'] ) ) {
+            +
            		$upload_album = strval( intval( $_POST['wppa-album'] ) );
+            +
            	}
+            +
            	else {
+            +
            		$upload_album = null;
+            +
            	}
+            +
+            +
            	// Update watermark settings for the user if new values supplied
             	if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
+            +
+            +
            		// File
+            +
            		if ( isset( $_POST['wppa-watermark-file'] ) ) {
+            +
+            +
            			// Sanitize input
+            +
            			$watermark_file = $_POST['wppa-watermark-file'];
+            +
            			if ( stripos( $watermark_file, '.png' ) !== false ) {
+            +
            				$watermark_file = sanitize_file_name( $watermark_file );
+            +
            			}
+            +
            			else {
+            +
            				if ( ! in_array( $watermark_file, array( '--- none ---', '---name---', '---filename---', '---description---', '---predef---' ) ) ) {
+            +
            					$watermark_file = 'nil';
+            +
            				}
+            +
            			}
+            +
+            +
            			// Update setting
+            +
            			update_option( 'wppa_watermark_file_'.$user, $watermark_file );
+            +
            		}
+            +
+            +
            		// Position
+            +
            		if ( isset( $_POST['wppa-watermark-pos'] ) ) {
+            +
+            +
            			// Sanitize input
+            +
            			$watermark_pos = $_POST['wppa-watermark-pos'];
+            +
            			if ( ! in_array( $watermark_pos, array( 'toplft', 'topcen', 'toprht', 'cenlft', 'cencen', 'cenrht', 'botlft', 'botcen', 'botrht' ) ) ) {
+            +
            				$watermark_pos = 'nil';
+            +
            			}
+            +
+            +
            			// Update setting
+            +
            			update_option( 'wppa_watermark_pos_'.$user, $watermark_pos );
+            +
            		}
+            	}
             	// If from album admin set the last album
+            +
            	if ( isset( $_REQUEST['wppa-set-album'] ) ) {
+            +
            		wppa_set_last_album( strval( intval( $_REQUEST['wppa-set-album'] ) ) );
+            +
            	}
             	// Do the upload if requested
             	// From BOX A
             		if ( isset( $_POST['wppa-go-edit-multiple'] ) ) {
             			if ( current_user_can( 'wppa_admin' ) ) {
             				wppa_ok_message( __( 'Connecting to edit album...' , 'wp-photo-album-plus' ) ); ?>
+            +
            				<script type="text/javascript">document.location = '<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu&tab=edit&edit_id='.$upload_album, 'js' ) ) ?>';</script>
             			<?php }
             			else {
             				wppa_ok_message( __( 'Connecting to edit photos...' , 'wp-photo-album-plus' ) ); ?>
             		if ( isset( $_POST['wppa-go-edit-single'] ) ) {
             			if ( current_user_can( 'wppa_admin' ) ) {
             				wppa_ok_message( __( 'Connecting to edit album...' , 'wp-photo-album-plus' ) ); ?>
+            +
            				<script type="text/javascript">document.location = '<?php echo( wppa_dbg_url( get_admin_url().'admin.php?page=wppa_admin_menu&tab=edit&edit_id='.$upload_album, 'js' ) ) ?>';</script>
             			<?php }
             			else {
             				wppa_ok_message( __( 'Connecting to edit photos...' , 'wp-photo-album-plus' ) ); ?>
             	// sanitize system again
             	wppa_sanitize_files();
+            +
            	// Open the form
+            +
            	echo
+            +
            	'<div class="wrap">' .
+            +
            		'<h2>' . __( 'Upload Photos', 'wp-photo-album-plus' ) . '</h2>';
+            +
            		// Get some req'd data
             		$max_files = ini_get( 'max_file_uploads' );
             		$max_files_txt = $max_files;
             		if ( $max_files < '1' ) {
+            		}
             		$max_size = ini_get( 'upload_max_filesize' );
             		$max_time = ini_get( 'max_input_time' );
+            +
            		if ( $max_time < '1' ) $max_time = __( 'unknown', 'wp-photo-album-plus' );
+            +
+            +
            		// check if albums exist before allowing upload
+            +
            		if ( ! wppa_has_albums() ) {
+            +
            			$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 upload your photos.', 'wp-photo-album-plus' ) .
+            +
            			'</p>' . '</div>';
+            +
            			return;
+            		}
+            +
            		// Upload One only configured and not administrator or super user?
+            +
            		if ( wppa_switch( 'upload_one_only' ) && ! wppa_user_is( 'administrator' ) ) {
+            +
+            +
            			// One only
+            +
            			echo
+            +
            			'<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px;">' .
+            +
            				'<h3 style="margin-top:0px;">' . __( 'Upload a single photo' , 'wp-photo-album-plus' ) . '</h3>' .
+            +
            				'<form enctype="multipart/form-data" action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_upload_photos' ) . '" method="post">' .
+            +
            					wp_nonce_field( '$wppa_nonce', WPPA_NONCE ) .
+            +
            					'<input id="my_files" type="file" name="my_files[]" />' .
+            +
            					'<p>' .
+            +
            						'<label for="wppa-album">' .
+            +
            							__( 'Album:' , 'wp-photo-album-plus') .
+            +
            						'</label>' .
+            +
            						'<select name="wppa-album" id="wppa-album-s" >' .
+            +
            							wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ), 'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) ) .
+            +
            						'</select>' .
+            +
            					'</p>';
+            +
            					if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
+            +
            						echo
+            +
            						'<p>' .
+            +
            							__( 'Apply watermark file:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
+            +
            								wppa_watermark_file_select() .
+            +
            							'</select>' .
+            +
            							__( 'Position:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
+            +
            								wppa_watermark_pos_select() .
+            +
            							'</select>' .
+            +
            						'</p>';
+            +
            					}
+            +
            					echo
+            +
            					'<input' .
+            +
            						' type="submit" class="button-primary"' .
+            +
            						' name="wppa-upload-multiple"' .
+            +
            						' value="' . __( 'Upload Photo' , 'wp-photo-album-plus') . '"' .
+            +
            						' onclick="if ( document.getElementById( \'wppa-album-s\' ).value == 0 ) { alert( \'' . __( 'Please select an album' , 'wp-photo-album-plus' ) . '\' ); return false; }"' .
+            +
            						' />' .
+            +
            					'<input type="checkbox"' .
+            +
            						' id="wppa-go-edit-multiple"' .
+            +
            						' name="wppa-go-edit-multiple"' .
+            +
            						' style="display:none"' .
+            +
            						' checked="checked"' .
+            +
            						' />' .
+            +
            				'</form>' .
+            +
            			'</div>';
+            +
            		}
+            +
+            +
            		// Upload multiple allowed
             		else {
+            +
            			// The information box
+            +
            			echo
+            +
            			'<div' .
+            +
            				' style="' .
+            +
            					'border:1px solid #ccc;' .
+            +
            					'padding:10px;' .
+            +
            					'margin-bottom:10px;' .
+            +
            					'width:600px;' .
+            +
            					'background-color:#fffbcc;' .
+            +
            					'border-color:#e6db55;' .
+            +
            					'"' .
+            +
            				' >' .
+            +
            				sprintf( __( '<b>Notice:</b> your server allows you to upload <b>%s</b> files of maximum total <b>%s</b> bytes and allows <b>%s</b> seconds to complete.' , 'wp-photo-album-plus' ), $max_files_txt, $max_size, $max_time ) .
+            +
            				__( 'If your request exceeds these limitations, it will fail, probably without an errormessage.' , 'wp-photo-album-plus' ) .
+            +
            				__( 'Additionally your hosting provider may have set other limitations on uploading files.' , 'wp-photo-album-plus' ) .
+            +
            				'<br />' .
+            +
            				wppa_check_memory_limit() .
+            +
            			'</div>';
+            +
+            +
            			// Box A: Upload Multple photos
+            +
            			echo
+            +
            			'<div' .
+            +
            				' style="' .
+            +
            					'border:1px solid #ccc;' .
+            +
            					'padding:10px;' .
+            +
            					'margin-bottom:10px;' .
+            +
            					'width: 600px;' .
+            +
            					'"' .
+            +
            				' >' .
+            +
            				'<h3 style="margin-top:0px;">' .
+            +
            					__( 'Box A:' , 'wp-photo-album-plus' ) . ' ' . __( 'Multiple Photos in one selection' , 'wp-photo-album-plus' ) .
+            +
            				'</h3>' .
+            +
            				sprintf( __( 'You can select up to %s photos in one selection and upload them.' , 'wp-photo-album-plus' ), $max_files_txt ) .
+            +
            				'<br />' .
+            +
            				'<small style="color:blue" >' .
+            +
            					__( 'You need a modern browser that supports HTML-5 to select multiple files' , 'wp-photo-album-plus') .
+            +
            				'</small>' .
+            +
            				'<form' .
+            +
            					' enctype="multipart/form-data"' .
+            +
            					' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_upload_photos' ) . '"' .
+            +
            					' method="post" >' .
+            +
            					wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
+            +
            					'<input' .
+            +
            						' id="my_files"' .
+            +
            						' type="file"' .
+            +
            						' multiple="multiple"' .
+            +
            						' name="my_files[]"' .
+            +
            						' onchange="showit()"' .
+            +
            					' />' .
+            +
            					'<div id="files_list2" >' .
+            +
            						'<h3>' .
+            +
            							__( 'Selected Files:' , 'wp-photo-album-plus' ) .
+            +
            						'</h3>' .
+            +
            					'</div>' .
+            +
            					'<script type="text/javascript">' .
+            +
            						'function showit() {' .
+            +
            							'var maxsize = parseInt( \'' . $max_size . '\' ) * 1024 * 1024;' .
+            +
            							'var maxcount = parseInt( \'' . $max_files_txt . '\' );' .
+            +
            							'var totsize = 0;' .
+            +
            							'var files = document.getElementById( \'my_files\' ).files;' .
+            +
            							'var tekst = "<h3>' . __( 'Selected Files:' , 'wp-photo-album-plus' ) . '</h3>";' .
+            +
            							'tekst += "<table><thead><tr>";' .
+            +
            								'tekst += "<td>' . __( 'Name' , 'wp-photo-album-plus' ) . '</td>";' .
+            +
            								'tekst += "<td>' . __( 'Size' , 'wp-photo-album-plus' ) . '</td>";' .
+            +
            								'tekst += "<td>' . __( 'Type' , 'wp-photo-album-plus' ) . '</td>";' .
+            +
            								'tekst += "</tr></thead>";' .
+            +
            								'tekst += "<tbody>";' .
+            +
            									'tekst += "<tr><td><hr /></td><td><hr /></td><td><hr /></td></tr>";' .
+            +
            									'for ( var i=0;i<files.length;i++ ) {' .
+            +
            										'tekst += "<tr>";' .
+            +
            											'tekst += "<td>" + files[i].name + "</td>";' .
+            +
            											'tekst += "<td>" + files[i].size + "</td>";' .
+            +
            											'totsize += files[i].size;' .
+            +
            											'tekst += "<td>" + files[i].type + "</td>";' .
+            +
            										'tekst += "</tr>";' .
+            +
            									'}' .
+            +
            									'tekst += "<tr><td><hr /></td><td><hr /></td><td><hr /></td></tr>";' .
+            +
            								'var style1 = "";' .
+            +
            								'var style2 = "";' .
+            +
            								'var style3 = "";' .
+            +
            								'var warn1 = "";' .
+            +
            								'var warn2 = "";' .
+            +
            								'var warn3 = "";' .
+            +
            								'if ( maxcount > 0 && files.length > maxcount ) {' .
+            +
            									'style1 = "color:red";' .
+            +
            									'warn1 = "' . __( 'Too many!' , 'wp-photo-album-plus' ) . '";' .
+            +
            								'}' .
+            +
            								'if ( maxsize > 0 && totsize > maxsize ) {' .
+            +
            									'style2 = "color:red";' .
+            +
            									'warn2 = "' . __( 'Too big!' , 'wp-photo-album-plus') . '";' .
+            +
            								'}' .
+            +
            								'if ( warn1 || warn2 ) {' .
+            +
            									'style3 = "color:green";' .
+            +
            									'warn3 = "' . __( 'Try again!' , 'wp-photo-album-plus' ) . '";' .
+            +
            								'}' .
+            +
            								'tekst += "<tr><td style="+style1+" >' . __( 'Total' , 'wp-photo-album-plus' ) . ': "+files.length+" "+warn1+"</td><td style="+style2+" >"+totsize+" "+warn2+"</td><td style="+style3+" >"+warn3+"</td></tr>";' .
+            +
            								'tekst += "</tbody>";' .
+            +
            							'tekst += "</table>";' .
+            +
            							'jQuery( "#files_list2" ).html( tekst );' .
+            +
            						'}' .
+            +
            					'</script>' .
+            +
            					'<p>' .
+            +
            						'<label for="wppa-album">' . __( 'Album:' , 'wp-photo-album-plus' ) . '</label>' .
+            +
            						'<select name="wppa-album" id="wppa-album-s">' .
+            +
            							wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ), 'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) ) .
+            +
            						'</select>' .
+            +
            					'</p>';
+            +
+            +
            					// Watermark?
+            +
            					if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
+            +
            						echo
+            +
            						'<p>' .
+            +
            							__( 'Apply watermark file:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
+            +
            								wppa_watermark_file_select() .
+            +
            							'</select>' .
+            +
            							__( 'Position:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
+            +
            								wppa_watermark_pos_select() .
+            +
            							'</select>' .
+            +
            						'</p>';
+            +
            					}
+            +
+            +
            					// Submit section
+            +
            					echo
+            +
            					'<input' .
+            +
            						' type="submit"' .
+            +
            						' class="button-primary"' .
+            +
            						' name="wppa-upload-multiple"' .
+            +
            						' value="' . __( 'Upload Multiple Photos', 'wp-photo-album-plus' ) . '"' .
+            +
            						' onclick="if ( document.getElementById( \'wppa-album-s\' ).value == 0 ) { alert( \'' . __( 'Please select an album' , 'wp-photo-album-plus' ) . '\' ); return false; }"' .
+            +
            					' />' .
+            +
            					' ' .
+            +
            					'<input' .
+            +
            						' type="checkbox"' .
+            +
            						' id="wppa-go-edit-multiple"' .
+            +
            						' name="wppa-go-edit-multiple"' .
+            +
            						' onchange="wppaCookieCheckbox( this, \'wppa-go-edit-multiple\' )"' .
+            +
            					' />' .
+            +
            					'<script type="text/javascript" >' .
+            +
            						'if ( wppa_getCookie( \'wppa-go-edit-multiple\' ) == \'on\' ) document.getElementById( \'wppa-go-edit-multiple\' ).checked = \'checked\';' .
+            +
            					'</script>';
+            +
+            +
            					if ( current_user_can( 'wppa_admin' ) ) {
+            +
            						_e( 'After upload: Go to the <b>Edit Album</b> page.', 'wp-photo-album-plus');
+            					}
             					else {
+            +
            						_e( 'After upload: Go to the <b>Edit Photos</b> page.', 'wp-photo-album-plus');
+            +
            					}
+            +
            				echo
+            +
            				'</form>' .
+            +
            			'</div>';
+            +
            			// End BOX A
+            +
+            +
            			// Box B: Single photos
+            +
            			echo
+            +
            			'<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px; width: 600px;" >' .
+            +
            				'<h3 style="margin-top:0px;" >' .
+            +
            					__( 'Box B:' , 'wp-photo-album-plus') . ' ' . __( 'Single Photos in multiple selections' , 'wp-photo-album-plus') .
+            +
            				'</h3>' .
+            +
            				sprintf( __( 'You can select up to %s photos one by one and upload them at once.' , 'wp-photo-album-plus'), $max_files_txt ) .
+            +
            				'<form' .
+            +
            					' enctype="multipart/form-data"' .
+            +
            					' action="' . wppa_dbg_url( get_admin_url().'admin.php?page=wppa_upload_photos' ) . '"' .
+            +
            					' method="post" ' .
+            +
            					' >' .
+            +
            					wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
+            +
            					'<input' .
+            +
            						' id="my_file_element"' .
+            +
            						' type="file"' .
+            +
            						' name="file_1"' .
+            +
            					'/>' .
+            +
            					'<div id="files_list">' .
+            +
            						'<h3>' . __( 'Selected Files:' , 'wp-photo-album-plus') . '</h3>' .
+            +
            					'</div>' .
+            +
            					'<p>' .
+            +
            						'<label for="wppa-album">' . __( 'Album:' , 'wp-photo-album-plus') . '</label>' .
+            +
            						'<select name="wppa-album" id="wppa-album-m">' .
+            +
            							wppa_album_select_a( array( 'path' => wppa_switch( 'hier_albsel' ), 'addpleaseselect' => true, 'checkowner' => true, 'checkupload' => true ) ) .
+            +
            						'</select>' .
+            +
            					'</p>';
+            +
+            +
            					// Watermark?
+            +
            					if ( wppa_switch( 'watermark_on' ) && ( wppa_switch( 'watermark_user' ) || current_user_can( 'wppa_settings' ) ) ) {
+            +
            						echo
+            +
            						'<p>' .
+            +
            							__( 'Apply watermark file:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-file" id="wppa-watermark-file" >' .
+            +
            								wppa_watermark_file_select() .
+            +
            							'</select>' .
+            +
            							__( 'Position:' , 'wp-photo-album-plus' ) .
+            +
            							'<select name="wppa-watermark-pos" id="wppa-watermark-pos" >' .
+            +
            								wppa_watermark_pos_select() .
+            +
            							'</select>' .
+            +
            						'</p>';
+            +
            					}
+            +
+            +
            					// Submit section
+            +
            					echo
+            +
            					'<input' .
+            +
            						' type="submit"' .
+            +
            						' class="button-primary"' .
+            +
            						' name="wppa-upload"' .
+            +
            						' value="' . __( 'Upload Single Photos' , 'wp-photo-album-plus') . '"' .
+            +
            						' onclick="if ( document.getElementById( \'wppa-album-m\' ).value == 0 ) { alert( \'' . __( 'Please select an album' , 'wp-photo-album-plus' ) . '\' ); return false; }"' .
+            +
            					' />' .
+            +
            					' ' .
+            +
            					'<input' .
+            +
            						' type="checkbox"' .
+            +
            						' id="wppa-go-edit-single"' .
+            +
            						' name="wppa-go-edit-single"' .
+            +
            						' onchange="wppaCookieCheckbox( this, \'wppa-go-edit-single\' )" />' .
+            +
            					'<script type="text/javascript" >' .
+            +
            						'if ( wppa_getCookie( \'wppa-go-edit-single\' ) == \'on\' ) document.getElementById( \'wppa-go-edit-single\' ).checked = \'checked\';' .
+            +
            					'</script>';
+            +
+            +
            					if ( current_user_can( 'wppa_admin' ) ) {
+            +
            						_e( 'After upload: Go to the <b>Edit Album</b> page.' , 'wp-photo-album-plus');
+            					}
+            +
            					else {
+            +
            						_e( 'After upload: Go to the <b>Edit Photos</b> page.' , 'wp-photo-album-plus');
+            +
            					}
+            +
            				echo
+            +
            				'</form>' .
+            +
            				'<script type="text/javascript">' .
+            +
            				'<!-- Create an instance of the multiSelector class, pass it the output target and the max number of files -->' .
+            +
            					'var multi_selector = new MultiSelector( document.getElementById( \'files_list\' ), ' . $max_files . ');' .
+            +
            				'<!-- Pass in the file element -->' .
+            +
            					'multi_selector.addElement( document.getElementById( \'my_file_element\' ) );' .
+            +
            				'</script>' .
+            +
            			'</div>';
+            +
            			// End Box B
+            +
+            +
            			// Box C: Single zips, useless if user can not imort, or when php <50207: no unzip
+            +
            			if ( current_user_can( 'wppa_import' ) ) {
+            +
            				if ( PHP_VERSION_ID >= 50207 ) {
+            +
            					echo
+            +
            					'<div style="border:1px solid #ccc; padding:10px; width: 600px;" >' .
+            +
            						'<h3 style="margin-top:0px;" >' .
+            +
            							__( 'Box C:' , 'wp-photo-album-plus') . ' ' . __( 'Zipped Photos in one selection' , 'wp-photo-album-plus') .
+            +
            						'</h3>' .
+            +
            						sprintf( __( 'You can upload one zipfile. It will be placed in your personal wppa-depot: <b>.../%s</b><br/>Once uploaded, use <b>Import Photos</b> to unzip the file and place the photos in any album.' , 'wp-photo-album-plus'), WPPA_DEPOT ) .
+            +
            						'<form' .
+            +
            							' enctype="multipart/form-data"' .
+            +
            							' action="' . wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_upload_photos' ) . '"' .
+            +
            							' method="post"' .
+            +
            							' >' .
+            +
            							wp_nonce_field( '$wppa_nonce', WPPA_NONCE, true, false ) .
+            +
            							'<input' .
+            +
            								' id="my_zipfile_element"' .
+            +
            								' type="file"' .
+            +
            								' name="file_zip"' .
+            +
            							' />' .
+            +
            							'<br/><br/>' .
+            +
            							'<input' .
+            +
            								' type="submit"' .
+            +
            								' class="button-primary"' .
+            +
            								' name="wppa-upload-zip"' .
+            +
            								' value="' . __( 'Upload Zipped Photos' , 'wp-photo-album-plus') . '"' .
+            +
            							' />' .
+            +
            							' ' .
+            +
            							'<input' .
+            +
            								' type="checkbox"' .
+            +
            								' id="wppa-go-import"' .
+            +
            								' name="wppa-go-import"' .
+            +
            								' onchange="wppaCookieCheckbox( this, \'wppa-go-import\' )"' .
+            +
            							' />' .
+            +
            							'<script type="text/javascript" >' .
+            +
            								'if ( wppa_getCookie( \'wppa-go-import\' ) == \'on\' ) document.getElementById( \'wppa-go-import\' ).checked = \'checked\';' .
+            +
            							'</script>' .
+            +
            							__( 'After upload: Go to the <b>Import Photos</b> page.' , 'wp-photo-album-plus') .
+            +
            						'</form>' .
+            +
            					'</div>';
+            				}
+            +
            				else {
+            +
            					echo
+            +
            					'<div style="border:1px solid #ccc; padding:10px; width: 600px;">' .
+            +
            						'<small>' .
+            +
            							__( 'Ask your administrator to upgrade php to version 5.2.7 or later. This will enable you to upload zipped photos.' , 'wp-photo-album-plus') .
+            +
            						'</small>' .
+            +
            					'</div>';
+            				}
+            			}
+            		}
+            +
            	echo
+            +
            	'</div>';
+            }
             // Upload multiple photos
             function wppa_upload_multiple() {
+            +
            global $wpdb;
+            +
            global $warning_given;
+            +
            global $upload_album;
             	$warning_given = false;
             	$uploaded_a_file = false;
             		if ( is_array( $file['error'] ) ) {
             			for ( $i = '0'; $i < count( $file['error'] ); $i++ ) {
             				if ( wppa_is_time_up() ) {
+            +
            					wppa_warning_message( sprintf( __( 'Time out. %s photos uploaded in album nr %s.' , 'wp-photo-album-plus'), $count, $upload_album ) );
+            +
            					wppa_set_last_album( $upload_album );
             					return;
+            				}
             				if ( ! $file['error'][$i] ) {
+            +
            					$id = wppa_insert_photo( $file['tmp_name'][$i], $upload_album, $file['name'][$i] );
             					if ( $id ) {
             						$uploaded_a_file = true;
             						$count++;
+            +
            						wppa_backend_upload_mail( $id, $upload_album, $file['name'][$i] );
+            					}
             					else {
             						wppa_error_message( __( 'Error inserting photo' , 'wp-photo-album-plus') . ' ' . wppa_sanitize_file_name( basename( $file['name'][$i] ) ) . '.' );
+            	}
             	if ( $uploaded_a_file ) {
+            +
            		wppa_update_message( $count.' '.__( 'Photos Uploaded in album nr' , 'wp-photo-album-plus') . ' ' . $upload_album );
+            +
            		wppa_set_last_album( $upload_album );
+                }
+            }
             // Upload single photos
             function wppa_upload_photos() {
+            +
            global $wpdb;
+            +
            global $warning_given;
+            +
            global $upload_album;
+            +
             	$warning_given = false;
             	$uploaded_a_file = false;
             	$count = '0';
             	foreach ( $_FILES as $file ) {
             		if ( $file['tmp_name'] != '' ) {
+            +
            			$id = wppa_insert_photo( $file['tmp_name'], $upload_album, $file['name'] );
             			if ( $id ) {
             				$uploaded_a_file = true;
             				$count++;
+            +
            				wppa_backend_upload_mail( $id, $upload_album, $file['name'] );
+            			}
             			else {
             				wppa_error_message( __( 'Error inserting photo' , 'wp-photo-album-plus') . ' ' . wppa_sanitize_file_name( basename( $file['name'] ) ) . '.' );
+            	}
             	if ( $uploaded_a_file ) {
+            +
            		wppa_update_message( $count.' '.__( 'Photos Uploaded in album nr' , 'wp-photo-album-plus') . ' ' . $upload_album );
+            +
            		wppa_set_last_album( $upload_album );
+                }
+            }
             	return $error;
+            }

wppa-users.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains user and capabilities related routines
6	- * Version 6.4.17
7	*
8	*/
9
	@@ -280,9 +280,6 @@ function wppa_may_user_fe_edit( $id ) {
280	// See if the current user may delete a given photo
281	function wppa_may_user_fe_delete( $id ) {
282
283	- // If not allowed to edit, also deny deletion
284	- // if ( ! wppa_may_user_fe_edit( $id ) ) return false;
285	-
286	// Superuser?
287	if ( wppa_is_user_superuser() ) return true;
288


3	* Package: wp-photo-album-plus
4	*
5	* Contains user and capabilities related routines
6	+ * Version 6.5.02
7	*
8	*/
9

280	// See if the current user may delete a given photo
281	function wppa_may_user_fe_delete( $id ) {
282



283	// Superuser?
284	if ( wppa_is_user_superuser() ) return true;
285

wppa-utils.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	- * Version 6.5.00
7	*
8	*/
9
	@@ -2566,7 +2566,7 @@ function wppa_force_numeric_else( $value, $default ) {
2566	function wppa_sanitize_file_name( $file, $check_length = true ) {
2567	$temp = explode( '/', $file );
2568	$cnt = count( $temp );
2569	- $temp[$cnt - 1] = sanitize_file_name( $temp[$cnt - 1] );
2570	$maxlen = wppa_opt( 'max_filename_length' );
2571	if ( $maxlen && $check_length ) {
2572	if ( strpos( $temp[$cnt - 1], '.' ) !== false ) {


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

2566	function wppa_sanitize_file_name( $file, $check_length = true ) {
2567	$temp = explode( '/', $file );
2568	$cnt = count( $temp );
2569	+ $temp[$cnt - 1] = strip_tags( stripslashes( $temp[$cnt - 1] ) );//sanitize_file_name( $temp[$cnt - 1] );
2570	$maxlen = wppa_opt( 'max_filename_length' );
2571	if ( $maxlen && $check_length ) {
2572	if ( strpos( $temp[$cnt - 1], '.' ) !== false ) {

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: 6.5.01
6	* Author: J.N. Breetvelt a.k.a. OpaJaap
7	* Author URI: http://wppa.opajaap.nl/
8	* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
	@@ -22,8 +22,8 @@ global $wpdb;
22	global $wp_version;
23
24	/* WPPA GLOBALS */
25	- global $wppa_revno; $wppa_revno = '~~6500~~'; // WPPA db version
26	- global $wppa_api_version; $wppa_api_version = '6-5-01-~~002~~'; // WPPA software version
27
28	/* start timers */
29	global $wppa_starttime; $wppa_starttime = microtime(true);
	@@ -91,7 +91,7 @@ if ( defined( 'WP_CONTENT_DIR' ) ) {
91	define( 'WPPA_CONTENT_PATH', wppa_flips( WP_CONTENT_DIR ) );
92	}
93
94	- // In the normal case i use content_url() with the site_url() part replaced by WPPA_ABSPATH,
95	// i.e. ABSPATH with the slashes in the right direction (in case of windows server)
96	else {
97	define( 'WPPA_CONTENT_PATH',


2	/*
3	* Plugin Name: WP Photo Album Plus
4	* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5	+ * Version: 6.5.02
6	* Author: J.N. Breetvelt a.k.a. OpaJaap
7	* Author URI: http://wppa.opajaap.nl/
8	* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/

22	global $wp_version;
23
24	/* WPPA GLOBALS */
25	+ global $wppa_revno; $wppa_revno = '6502'; // WPPA db version
26	+ global $wppa_api_version; $wppa_api_version = '6-5-02-006'; // WPPA software version
27
28	/* start timers */
29	global $wppa_starttime; $wppa_starttime = microtime(true);

91	define( 'WPPA_CONTENT_PATH', wppa_flips( WP_CONTENT_DIR ) );
92	}
93
94	+ // In the normal case i use content_url() with the site_url() part replaced by WPPA_ABSPATH,
95	// i.e. ABSPATH with the slashes in the right direction (in case of windows server)
96	else {
97	define( 'WPPA_CONTENT_PATH',