Refs #53, UI & security tweaks along w/ one bug fix ('delete_logs_max_rows_per_query' was not set in getPurgeSettingsFromRequest).

git-svn-id: http://dev.piwik.org/svn/trunk@6175 59fd770c-687e-43c8-a1e3-f5a4ff64c105

2 files changed, 23 insertions, 5 deletions

diff --git a/plugins/PrivacyManager/templates/privacySettings.js b/plugins/PrivacyManager/templates/privacySettings.js
index 9c029cc7a0..ba87845803 100644
--- a/plugins/PrivacyManager/templates/privacySettings.js
+++ b/plugins/PrivacyManager/templates/privacySettings.js
@@ -10,6 +10,14 @@ $(document).ready(function() {
 		$('#' + id).toggle(value == 1);
 	}
 	
+	function toggleOtherDeleteSections() {
+		var isEitherDeleteSectionEnabled =
+			($('input[name=deleteEnable]:checked').val() == 1) ||
+			($('input[name=deleteReportsEnable]:checked').val() == 1);
+		toggleBlock('deleteDataEstimateSect', isEitherDeleteSectionEnabled);
+		toggleBlock('deleteSchedulingSettings', isEitherDeleteSectionEnabled);
+	}
+	
 	// reloads purged database size estimate
 	var currentRequest;
 	function reloadDbStats() {
@@ -17,6 +25,11 @@ $(document).ready(function() {
 			currentRequest.abort();
 		}
 		
+		// if the section isn't visible, abort
+		if (!$('#deleteDataEstimate').is(':visible')) {
+			return;
+		}
+		
 		$('#deleteDataEstimate').html('');
 		$('#deleteDataEstimateSect .loadingPiwik').show();
 		
@@ -42,10 +55,12 @@ $(document).ready(function() {
 
 	$('input[name=deleteEnable]').click(function() {
 		toggleBlock("deleteLogSettings", $(this).val());
+		toggleOtherDeleteSections();
 	}).change(reloadDbStats);
 	
 	$('input[name=deleteReportsEnable]').click(function() {
 		toggleBlock("deleteReportsSettings", $(this).val());
+		toggleOtherDeleteSections();
 	}).change(reloadDbStats);
 	
 	// initial toggling calls
@@ -53,6 +68,7 @@ $(document).ready(function() {
 		toggleBlock("deleteLogSettings", $("input[name=deleteEnable]:checked").val());
 		toggleBlock("anonymizeIPenabled", $("input[name=anonymizeIPEnable]:checked").val());
 		toggleBlock("deleteReportsSettings", $("input[name=deleteReportsEnable]:checked").val());
+		toggleOtherDeleteSections();
 	});
 	
 	// make sure the DB size estimate is reloaded every time a delete logs/reports setting is changed
diff --git a/plugins/PrivacyManager/templates/privacySettings.tpl b/plugins/PrivacyManager/templates/privacySettings.tpl
index b3037bb628..b888b6b526 100644
--- a/plugins/PrivacyManager/templates/privacySettings.tpl
+++ b/plugins/PrivacyManager/templates/privacySettings.tpl
@@ -10,7 +10,7 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 
 <a name="anonymizeIPAnchor"></a>
 <h2>{'PrivacyManager_UseAnonymizeIp'|translate}</h2>
-<form method="post" action="{url action=index form=formMaskLength}" id="formMaskLength" name="formMaskLength">
+<form method="post" action="{url action=saveSettings form=formMaskLength token_auth=$token_auth}" id="formMaskLength" name="formMaskLength">
 	<div id='anonymizeIpSettings'>
 		<table class="adminTable" style='width:800px;'>
 			<tr>
@@ -73,7 +73,7 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 <a name="deleteLogsAnchor"></a>
 <h2>{'PrivacyManager_DeleteDataSettings'|translate}</h2>
 <p>{'PrivacyManager_DeleteDataDescription'|translate}</p>
-<form method="post" action="{url action=index form=formDeleteSettings}" id="formDeleteSettings" name="formMaskLength">
+<form method="post" action="{url action=saveSettings form=formDeleteSettings token_auth=$token_auth}" id="formDeleteSettings" name="formMaskLength">
 	<table class="adminTable" style='width:800px;'>
 		<tr id='deleteLogSettingEnabled'>
 			<td width="250">{'PrivacyManager_UseDeleteLog'|translate}<br/>
@@ -117,8 +117,10 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 			<td width="500">
 				<label><input type="radio" name="deleteReportsEnable" value="1" {if $deleteData.config.delete_reports_enable eq '1'}checked="true"{/if}/> {'General_Yes'|translate}</label>
 				<label><input type="radio" name="deleteReportsEnable" value="0" {if $deleteData.config.delete_reports_enable eq '0'}checked="true"{/if} style="margin-left:20px;"/> {'General_No'|translate}</label>
+				<span class="form-description">{'General_Recommended'|translate} {'General_No'|translate}</span>
 				<span class="ajaxSuccess">
-					{'PrivacyManager_DeleteReportsInfo'|translate}
+					{'PrivacyManager_DeleteReportsInfo'|translate}<br/><br/>
+					{'PrivacyManager_DeleteReportsInfo2'|translate}
 				</span>
 			</td>
 			<td width="200">
@@ -168,8 +170,6 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 					<option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '30'} selected="selected" {/if}
 																								 value="30">{'CoreHome_PeriodMonth'|translate}</option>
 				</select><br/><br/>
-				<em><a id="purgeDataNowLink" href="#">{'PrivacyManager_PurgeNow'|translate}</a></em>
-				<span class='loadingPiwik' style='display:none'><img src='/themes/default/images/loading-blue.gif' /> {'PrivacyManager_PurgingData'|translate}</span>
 			</td>
 			<td width="200">
 				{capture assign=purgeStats}
@@ -178,6 +178,8 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 						<br/><br/>{/if}
 					<strong>{'PrivacyManager_NextDelete'|translate}:</strong>
 					{$deleteData.nextRunPretty}
+					<br/><br/><em><a id="purgeDataNowLink" href="#">{'PrivacyManager_PurgeNow'|translate}</a></em>
+					<span class='loadingPiwik' style='display:none'><img src='/themes/default/images/loading-blue.gif' /> {'PrivacyManager_PurgingData'|translate}</span>
 				{/capture}
 				{$purgeStats|inlineHelp}
 			</td>