Mass conversion of all files to the newly agreed coding standard: PSR 1/2

Converting Piwik core source files, PHP, JS, TPL, CSS

More info: http://piwik.org/participate/coding-standards/

3 files changed, 392 insertions, 381 deletions

diff --git a/plugins/PrivacyManager/templates/databaseSize.tpl b/plugins/PrivacyManager/templates/databaseSize.tpl
index 2093a01e82..fba6612d71 100755
--- a/plugins/PrivacyManager/templates/databaseSize.tpl
+++ b/plugins/PrivacyManager/templates/databaseSize.tpl
@@ -1,7 +1,7 @@
 <p>{'PrivacyManager_CurrentDBSize'|translate}: {$dbStats.currentSize}</p>
 {if isset($dbStats.sizeAfterPurge)}
-<p>{'PrivacyManager_EstimatedDBSizeAfterPurge'|translate}: <b>{$dbStats.sizeAfterPurge}</b></p>
+    <p>{'PrivacyManager_EstimatedDBSizeAfterPurge'|translate}: <b>{$dbStats.sizeAfterPurge}</b></p>
 {/if}
 {if isset($dbStats.spaceSaved)}
-<p>{'PrivacyManager_EstimatedSpaceSaved'|translate}: {$dbStats.spaceSaved}</p>
+    <p>{'PrivacyManager_EstimatedSpaceSaved'|translate}: {$dbStats.spaceSaved}</p>
 {/if}
diff --git a/plugins/PrivacyManager/templates/privacySettings.js b/plugins/PrivacyManager/templates/privacySettings.js
index 509ef85941..75de9b8caa 100644
--- a/plugins/PrivacyManager/templates/privacySettings.js
+++ b/plugins/PrivacyManager/templates/privacySettings.js
@@ -5,49 +5,49 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-$(document).ready(function() {
-	function toggleBlock(id, value) {
-		$('#' + id).toggle(value == 1);
-	}
-	
-	function isEitherDeleteSectionEnabled() {
-		return ($('input[name=deleteEnable]:checked').val() == 1)
-			|| ($('input[name=deleteReportsEnable]:checked').val() == 1);
-	}
-	
-	function toggleOtherDeleteSections() {
-		var showSection = isEitherDeleteSectionEnabled();
-		toggleBlock('deleteDataEstimateSect', showSection);
-		toggleBlock('deleteSchedulingSettings', showSection);
-	}
-	
-	// reloads purged database size estimate
-	var currentRequest;
-	function reloadDbStats(forceEstimate) {
-		if (currentRequest) {
-			currentRequest.abort();
-		}
-		
-		// if the section isn't visible or the manual estimate link is showing, abort
-		// (unless on first load or forcing)
-		var isFirstLoad = $('#deleteDataEstimate').html() == '';
-		if (!isFirstLoad
-			&& forceEstimate !== true
-			&& (!isEitherDeleteSectionEnabled() || $('#getPurgeEstimateLink').length > 0))
-		{
-			return;
-		}
-		
-		$('#deleteDataEstimate').hide();
-
-		var data = $('#formDeleteSettings').serializeArray();
+$(document).ready(function () {
+    function toggleBlock(id, value) {
+        $('#' + id).toggle(value == 1);
+    }
+
+    function isEitherDeleteSectionEnabled() {
+        return ($('input[name=deleteEnable]:checked').val() == 1)
+            || ($('input[name=deleteReportsEnable]:checked').val() == 1);
+    }
+
+    function toggleOtherDeleteSections() {
+        var showSection = isEitherDeleteSectionEnabled();
+        toggleBlock('deleteDataEstimateSect', showSection);
+        toggleBlock('deleteSchedulingSettings', showSection);
+    }
+
+    // reloads purged database size estimate
+    var currentRequest;
+
+    function reloadDbStats(forceEstimate) {
+        if (currentRequest) {
+            currentRequest.abort();
+        }
+
+        // if the section isn't visible or the manual estimate link is showing, abort
+        // (unless on first load or forcing)
+        var isFirstLoad = $('#deleteDataEstimate').html() == '';
+        if (!isFirstLoad
+            && forceEstimate !== true
+            && (!isEitherDeleteSectionEnabled() || $('#getPurgeEstimateLink').length > 0)) {
+            return;
+        }
+
+        $('#deleteDataEstimate').hide();
+
+        var data = $('#formDeleteSettings').serializeArray();
         var formData = {};
-        for(var i=0; i<data.length; i++) {
+        for (var i = 0; i < data.length; i++) {
             formData[data[i].name] = data[i].value;
         }
-		if (forceEstimate === true) {
+        if (forceEstimate === true) {
             formData['forceEstimate'] = 1;
-		}
+        }
 
         currentRequest = new ajaxHelper();
         currentRequest.setLoadingElement('#deleteDataEstimateSect .loadingPiwik');
@@ -67,107 +67,103 @@ $(document).ready(function() {
         );
         currentRequest.setFormat('html');
         currentRequest.send(false);
-	}
-	
-	// make sure certain sections only display if their corresponding features are enabled
-	$('input[name=anonymizeIPEnable]').click(function() {
-		toggleBlock("anonymizeIPenabled", $(this).val());
-	});
-
-	$('input[name=deleteEnable]').click(function() {
-		toggleBlock("deleteLogSettings", $(this).val());
-		toggleOtherDeleteSections();
-	}).change(reloadDbStats);
-	
-	$('input[name=deleteReportsEnable]').click(function() {
-		toggleBlock("deleteReportsSettings", $(this).val());
-		toggleBlock("deleteOldReportsMoreInfo", $(this).val());
-		toggleOtherDeleteSections();
-	}).change(reloadDbStats);
-	
-	// initial toggling calls
-	$(function() {
-		toggleBlock("deleteLogSettings", $("input[name=deleteEnable]:checked").val());
-		toggleBlock("anonymizeIPenabled", $("input[name=anonymizeIPEnable]:checked").val());
-		toggleBlock("deleteReportsSettings", $("input[name=deleteReportsEnable]:checked").val());
-		toggleBlock("deleteOldReportsMoreInfo", $("input[name=deleteReportsEnable]:checked").val());
-		toggleOtherDeleteSections();
-	});
-	
-	// make sure the DB size estimate is reloaded every time a delete logs/reports setting is changed
-	$('#formDeleteSettings input[type=text]').each(function() {
-		$(this).change(reloadDbStats);
-	});
-	$('#formDeleteSettings input[type=checkbox]').each(function() {
-		$(this).click(reloadDbStats);
-	});
-	
-	// make sure when the delete log/report settings are submitted, a confirmation popup is
-	// displayed first
-	$('#deleteLogSettingsSubmit').click(function(e) {
-		var deletingLogs = $("input[name=deleteEnable]:checked").val() == 1,
-			deletingReports = $("input[name=deleteReportsEnable]:checked").val() == 1,
-			confirm_id;
-		
-		// hide all confirmation texts, then show the correct one based on what
-		// type of deletion is enabled.
-		$('#confirmDeleteSettings>h2').each(function() {
-			$(this).hide();
-		});
-		
-		if (deletingLogs)
-		{
-			confirm_id = deletingReports ? "deleteBothConfirm" : "deleteLogsConfirm";
-		}
-		else if (deletingReports)
-		{
-			confirm_id = "deleteReportsConfirm";
-		}
-		
-		if (confirm_id)
-		{
-			$("#" + confirm_id).show();
-			e.preventDefault();
-			
-			piwikHelper.modalConfirm('#confirmDeleteSettings', {
-				yes: function() {
-					$('#formDeleteSettings').submit();
-				}
-			});
-		}
-		else
-		{
-			$('#formDeleteSettings').submit();
-		}
-	});
-	
-	// execute purge now link click
-	$('#purgeDataNowLink').click(function(e) {
-		e.preventDefault();
-		
-		var link = this;
-		
-		// if any option has been modified, abort purging and instruct user to save first
-		var modified = false;
-		$('#formDeleteSettings input').each(function() {
-			if (this.type === 'checkbox' || this.type === 'radio') {
-			  modified |= this.defaultChecked !== this.checked;
-			} else {
-			  modified |= this.defaultValue !== this.value;
-			}
-		});
-		
-		if (modified) {
-			piwikHelper.modalConfirm('#saveSettingsBeforePurge', {yes: function() {}});
-			return;
-		}
-		
-		// ask user if they really want to delete their old data
-		piwikHelper.modalConfirm('#confirmPurgeNow', {
-			yes: function() {
-				$(link).hide();
-
-				// execute a data purge
+    }
+
+    // make sure certain sections only display if their corresponding features are enabled
+    $('input[name=anonymizeIPEnable]').click(function () {
+        toggleBlock("anonymizeIPenabled", $(this).val());
+    });
+
+    $('input[name=deleteEnable]').click(function () {
+        toggleBlock("deleteLogSettings", $(this).val());
+        toggleOtherDeleteSections();
+    }).change(reloadDbStats);
+
+    $('input[name=deleteReportsEnable]').click(function () {
+        toggleBlock("deleteReportsSettings", $(this).val());
+        toggleBlock("deleteOldReportsMoreInfo", $(this).val());
+        toggleOtherDeleteSections();
+    }).change(reloadDbStats);
+
+    // initial toggling calls
+    $(function () {
+        toggleBlock("deleteLogSettings", $("input[name=deleteEnable]:checked").val());
+        toggleBlock("anonymizeIPenabled", $("input[name=anonymizeIPEnable]:checked").val());
+        toggleBlock("deleteReportsSettings", $("input[name=deleteReportsEnable]:checked").val());
+        toggleBlock("deleteOldReportsMoreInfo", $("input[name=deleteReportsEnable]:checked").val());
+        toggleOtherDeleteSections();
+    });
+
+    // make sure the DB size estimate is reloaded every time a delete logs/reports setting is changed
+    $('#formDeleteSettings input[type=text]').each(function () {
+        $(this).change(reloadDbStats);
+    });
+    $('#formDeleteSettings input[type=checkbox]').each(function () {
+        $(this).click(reloadDbStats);
+    });
+
+    // make sure when the delete log/report settings are submitted, a confirmation popup is
+    // displayed first
+    $('#deleteLogSettingsSubmit').click(function (e) {
+        var deletingLogs = $("input[name=deleteEnable]:checked").val() == 1,
+            deletingReports = $("input[name=deleteReportsEnable]:checked").val() == 1,
+            confirm_id;
+
+        // hide all confirmation texts, then show the correct one based on what
+        // type of deletion is enabled.
+        $('#confirmDeleteSettings>h2').each(function () {
+            $(this).hide();
+        });
+
+        if (deletingLogs) {
+            confirm_id = deletingReports ? "deleteBothConfirm" : "deleteLogsConfirm";
+        }
+        else if (deletingReports) {
+            confirm_id = "deleteReportsConfirm";
+        }
+
+        if (confirm_id) {
+            $("#" + confirm_id).show();
+            e.preventDefault();
+
+            piwikHelper.modalConfirm('#confirmDeleteSettings', {
+                yes: function () {
+                    $('#formDeleteSettings').submit();
+                }
+            });
+        }
+        else {
+            $('#formDeleteSettings').submit();
+        }
+    });
+
+    // execute purge now link click
+    $('#purgeDataNowLink').click(function (e) {
+        e.preventDefault();
+
+        var link = this;
+
+        // if any option has been modified, abort purging and instruct user to save first
+        var modified = false;
+        $('#formDeleteSettings input').each(function () {
+            if (this.type === 'checkbox' || this.type === 'radio') {
+                modified |= this.defaultChecked !== this.checked;
+            } else {
+                modified |= this.defaultValue !== this.value;
+            }
+        });
+
+        if (modified) {
+            piwikHelper.modalConfirm('#saveSettingsBeforePurge', {yes: function () {}});
+            return;
+        }
+
+        // ask user if they really want to delete their old data
+        piwikHelper.modalConfirm('#confirmPurgeNow', {
+            yes: function () {
+                $(link).hide();
+
+                // execute a data purge
                 var ajaxRequest = new ajaxHelper();
                 ajaxRequest.setLoadingElement('#deleteSchedulingSettings .loadingPiwik');
                 ajaxRequest.addParams({
@@ -192,16 +188,16 @@ $(document).ready(function() {
                 );
                 ajaxRequest.setFormat('html');
                 ajaxRequest.send(false);
-			}
-		});
-	});
-	
-	// get estimate link click
-	$('#getPurgeEstimateLink').click(function(e) {
-		e.preventDefault();
-		reloadDbStats(true);
-	});
-	
-	// load initial db size estimate
-	reloadDbStats();
+            }
+        });
+    });
+
+    // get estimate link click
+    $('#getPurgeEstimateLink').click(function (e) {
+        e.preventDefault();
+        reloadDbStats(true);
+    });
+
+    // load initial db size estimate
+    reloadDbStats();
 });
diff --git a/plugins/PrivacyManager/templates/privacySettings.tpl b/plugins/PrivacyManager/templates/privacySettings.tpl
index 1550ffd472..f1478cb997 100644
--- a/plugins/PrivacyManager/templates/privacySettings.tpl
+++ b/plugins/PrivacyManager/templates/privacySettings.tpl
@@ -1,251 +1,266 @@
 {include file="CoreAdminHome/templates/header.tpl"}
 
 {if $isSuperUser}
+    <h2>{'PrivacyManager_TeaserHeadline'|translate}</h2>
+    <p>{'PrivacyManager_Teaser'|translate:'<a href="#anonymizeIPAnchor">':"</a>":'<a href="#deleteLogsAnchor">':"</a>":'<a href="#optOutAnchor">':"</a>"}
+        See also our official guide <b><a href='http://piwik.org/privacy/' target='_blank'>Web Analytics Privacy</a></b></p>
+    <a name="anonymizeIPAnchor"></a>
+    <h2>{'PrivacyManager_UseAnonymizeIp'|translate}</h2>
+    <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>
+                    <td width="250">{'PrivacyManager_UseAnonymizeIp'|translate}<br/>
+                        <span class="form-description">{'PrivacyManager_AnonymizeIpDescription'|translate}</span>
+                    </td>
+                    <td width='500'>
+                        <label><input type="radio" name="anonymizeIPEnable" value="1" {if $anonymizeIP.enabled eq '1'}
+                            checked {/if}/> {'General_Yes'|translate}</label>
+                        <label><input type="radio" name="anonymizeIPEnable" value="0"
+                                      style="margin-left:20px;" {if $anonymizeIP.enabled eq '0'} checked {/if}/>  {'General_No'|translate}
+                        </label>
+                        <input type="hidden" name="token_auth" value="{$token_auth}"/>
+                        <input type="hidden" name="pluginName" value="{$anonymizeIP.name}"/>
+                    </td>
+                    <td width="200">
+                        {'AnonymizeIP_PluginDescription'|translate|inlineHelp}
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div id="anonymizeIPenabled">
+            <table class="adminTable" style='width:800px;'>
+                <tr>
+                    <td width="250">{'PrivacyManager_AnonymizeIpMaskLengtDescription'|translate}</td>
+                    <td width="500">
+                        <label><input type="radio" name="maskLength" value="1" {if $anonymizeIP.maskLength eq '1'}
+                            checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"1":"192.168.100.xxx"}
+                        </label><br/>
+                        <label><input type="radio" name="maskLength" value="2" {if $anonymizeIP.maskLength eq '2'}
+                            checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"2":"192.168.xxx.xxx"} <span
+                                    class="form-description">{'General_Recommended'|translate}</span></label><br/>
+                        <label><input type="radio" name="maskLength" value="3" {if $anonymizeIP.maskLength eq '3'}
+                            checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"3":"192.xxx.xxx.xxx"}</label>
+                    </td>
+                    <td width="200">
+                        {'PrivacyManager_GeolocationAnonymizeIpNote'|translate|inlineHelp}
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <input type="submit" value="{'General_Save'|translate}" id="privacySettingsSubmit" class="submit"/>
+    </form>
+    <div class="ui-confirm" id="confirmDeleteSettings">
+        <h2 id="deleteLogsConfirm">{'PrivacyManager_DeleteLogsConfirm'|translate}</h2>
 
-<h2>{'PrivacyManager_TeaserHeadline'|translate}</h2>
-<p>{'PrivacyManager_Teaser'|translate:'<a href="#anonymizeIPAnchor">':"</a>":'<a href="#deleteLogsAnchor">':"</a>":'<a href="#optOutAnchor">':"</a>"}
-See also our official guide <b><a href='http://piwik.org/privacy/' target='_blank'>Web Analytics Privacy</a></b></p>
+        <h2 id="deleteReportsConfirm">{'PrivacyManager_DeleteReportsConfirm'|translate}</h2>
 
-<a name="anonymizeIPAnchor"></a>
-<h2>{'PrivacyManager_UseAnonymizeIp'|translate}</h2>
-<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>
-				<td width="250">{'PrivacyManager_UseAnonymizeIp'|translate}<br/>
-					<span class="form-description">{'PrivacyManager_AnonymizeIpDescription'|translate}</span>
-				</td>
-				<td width='500'>
-					<label><input type="radio" name="anonymizeIPEnable" value="1" {if $anonymizeIP.enabled eq '1'}
-								  checked {/if}/> {'General_Yes'|translate}</label>
-					<label><input type="radio" name="anonymizeIPEnable" value="0"
-								  style="margin-left:20px;" {if $anonymizeIP.enabled eq '0'} checked {/if}/>  {'General_No'|translate}
-					</label>
-					<input type="hidden" name="token_auth" value="{$token_auth}"/>
-					<input type="hidden" name="pluginName" value="{$anonymizeIP.name}"/>
-				</td>
-				<td width="200">
-					{'AnonymizeIP_PluginDescription'|translate|inlineHelp}
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div id="anonymizeIPenabled">
-		<table class="adminTable" style='width:800px;'>
-			<tr>
-				<td width="250">{'PrivacyManager_AnonymizeIpMaskLengtDescription'|translate}</td>
-				<td width="500">
-					<label><input type="radio" name="maskLength" value="1" {if $anonymizeIP.maskLength eq '1'}
-								  checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"1":"192.168.100.xxx"}
-					</label><br/>
-					<label><input type="radio" name="maskLength" value="2" {if $anonymizeIP.maskLength eq '2'}
-								  checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"2":"192.168.xxx.xxx"} <span class="form-description">{'General_Recommended'|translate}</span></label><br/>
-					<label><input type="radio" name="maskLength" value="3" {if $anonymizeIP.maskLength eq '3'}
-								  checked {/if}/> {'PrivacyManager_AnonymizeIpMaskLength'|translate:"3":"192.xxx.xxx.xxx"}</label>
-				</td>
-				<td width="200">
-					{'PrivacyManager_GeolocationAnonymizeIpNote'|translate|inlineHelp}
-				</td>
-			</tr>
-		</table>
-	</div>
-	<input type="submit" value="{'General_Save'|translate}" id="privacySettingsSubmit" class="submit"/>
-</form>
+        <h2 id="deleteBothConfirm">{'PrivacyManager_DeleteBothConfirm'|translate}</h2>
+        <input role="yes" type="button" value="{'General_Yes'|translate}"/>
+        <input role="no" type="button" value="{'General_No'|translate}"/>
+    </div>
+    <div class="ui-confirm" id="saveSettingsBeforePurge">
+        <h2>{'PrivacyManager_SaveSettingsBeforePurge'|translate}</h2>
+        <input role="yes" type="button" value="{'General_Ok'|translate}"/>
+    </div>
+    <div class="ui-confirm" id="confirmPurgeNow">
+        <h2>{'PrivacyManager_PurgeNowConfirm'|translate}</h2>
+        <input role="yes" type="button" value="{'General_Yes'|translate}"/>
+        <input role="no" type="button" value="{'General_No'|translate}"/>
+    </div>
+    <a name="deleteLogsAnchor"></a>
+    <h2>{'PrivacyManager_DeleteDataSettings'|translate}</h2>
+    <p>{'PrivacyManager_DeleteDataDescription'|translate} {'PrivacyManager_DeleteDataDescription2'|translate}</p>
+    <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/>
 
-<div class="ui-confirm" id="confirmDeleteSettings">
-    <h2 id="deleteLogsConfirm">{'PrivacyManager_DeleteLogsConfirm'|translate}</h2>
-    <h2 id="deleteReportsConfirm">{'PrivacyManager_DeleteReportsConfirm'|translate}</h2>
-    <h2 id="deleteBothConfirm">{'PrivacyManager_DeleteBothConfirm'|translate}</h2>
-    <input role="yes" type="button" value="{'General_Yes'|translate}" />
-    <input role="no" type="button" value="{'General_No'|translate}" />
-</div>
-
-<div class="ui-confirm" id="saveSettingsBeforePurge">
-	<h2>{'PrivacyManager_SaveSettingsBeforePurge'|translate}</h2>
-	<input role="yes" type="button" value="{'General_Ok'|translate}"/>
-</div>
-
-<div class="ui-confirm" id="confirmPurgeNow">
-	<h2>{'PrivacyManager_PurgeNowConfirm'|translate}</h2>
-	<input role="yes" type="button" value="{'General_Yes'|translate}" />
-	<input role="no" type="button" value="{'General_No'|translate}" />
-</div>
-
-<a name="deleteLogsAnchor"></a>
-<h2>{'PrivacyManager_DeleteDataSettings'|translate}</h2>
-<p>{'PrivacyManager_DeleteDataDescription'|translate} {'PrivacyManager_DeleteDataDescription2'|translate}</p>
-<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/>
-
-			</td>
-			<td width='500'>
-				<label><input type="radio" name="deleteEnable" value="1" {if $deleteData.config.delete_logs_enable eq '1'}
-							  checked {/if}/> {'General_Yes'|translate}</label>
-				<label><input type="radio" name="deleteEnable" value="0"
-							  style="margin-left:20px;" {if $deleteData.config.delete_logs_enable eq '0'}
-							  checked {/if}/>  {'General_No'|translate}
-				</label>
+                </td>
+                <td width='500'>
+                    <label><input type="radio" name="deleteEnable" value="1" {if $deleteData.config.delete_logs_enable eq '1'}
+                        checked {/if}/> {'General_Yes'|translate}</label>
+                    <label><input type="radio" name="deleteEnable" value="0"
+                                  style="margin-left:20px;" {if $deleteData.config.delete_logs_enable eq '0'}
+                        checked {/if}/>  {'General_No'|translate}
+                    </label>
 				<span class="ajaxSuccess">
 					{'PrivacyManager_DeleteLogDescription2'|translate}
-					<a href="http://piwik.org/faq/general/#faq_125" target="_blank">
-						{'General_ClickHere'|translate}
-					</a>
+                    <a href="http://piwik.org/faq/general/#faq_125" target="_blank">
+                        {'General_ClickHere'|translate}
+                    </a>
 				</span>
-			</td>
-			<td width="200">
-			{capture assign=deleteLogInfo}
-				{'PrivacyManager_DeleteLogInfo'|translate:$deleteData.deleteTables}
-				{if !$canDeleteLogActions}
-				<br/><br/>{'PrivacyManager_CannotLockSoDeleteLogActions'|translate:$dbUser}
-				{/if}
-			{/capture}
-				{$deleteLogInfo|inlineHelp}
-			</td>
-		</tr>
-		<tr id="deleteLogSettings">
-			<td width="250">&nbsp;</td>
-			<td width="500">
-				<label>{'PrivacyManager_DeleteLogsOlderThan'|translate}
-					<input type="text" id="deleteOlderThan" value="{$deleteData.config.delete_logs_older_than}" style="width:30px;"
-						   name="deleteOlderThan"/>
-					{'CoreHome_PeriodDays'|translate}</label><br/>
-				<span class="form-description">{'PrivacyManager_LeastDaysInput'|translate:"1"}</span>
-			</td>
-			<td width="200">
+                </td>
+                <td width="200">
+                    {capture assign=deleteLogInfo}
+                        {'PrivacyManager_DeleteLogInfo'|translate:$deleteData.deleteTables}
+                        {if !$canDeleteLogActions}
+                            <br/>
+                            <br/>
+                            {'PrivacyManager_CannotLockSoDeleteLogActions'|translate:$dbUser}
+                        {/if}
+                    {/capture}
+                    {$deleteLogInfo|inlineHelp}
+                </td>
+            </tr>
+            <tr id="deleteLogSettings">
+                <td width="250">&nbsp;</td>
+                <td width="500">
+                    <label>{'PrivacyManager_DeleteLogsOlderThan'|translate}
+                        <input type="text" id="deleteOlderThan" value="{$deleteData.config.delete_logs_older_than}" style="width:30px;"
+                               name="deleteOlderThan"/>
+                        {'CoreHome_PeriodDays'|translate}</label><br/>
+                    <span class="form-description">{'PrivacyManager_LeastDaysInput'|translate:"1"}</span>
+                </td>
+                <td width="200">
 
-			</td>
-		</tr>
-		<tr id='deleteReportsSettingEnabled'>
-			<td width="250">{'PrivacyManager_UseDeleteReports'|translate}
-			</td>
-			<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>
+                </td>
+            </tr>
+            <tr id='deleteReportsSettingEnabled'>
+                <td width="250">{'PrivacyManager_UseDeleteReports'|translate}
+                </td>
+                <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="ajaxSuccess">
 					{capture assign=deleteOldLogs}{'PrivacyManager_UseDeleteLog'|translate}{/capture}
-					{'PrivacyManager_DeleteReportsInfo'|translate:'<em>':'</em>'}
-					<span id='deleteOldReportsMoreInfo'><br/><br/>
-					{'PrivacyManager_DeleteReportsInfo2'|translate:$deleteOldLogs}<br/><br/>
-					{'PrivacyManager_DeleteReportsInfo3'|translate:$deleteOldLogs}</span>
+                    {'PrivacyManager_DeleteReportsInfo'|translate:'<em>':'</em>'}
+                    <span id='deleteOldReportsMoreInfo'><br/><br/>
+                        {'PrivacyManager_DeleteReportsInfo2'|translate:$deleteOldLogs}<br/><br/>
+                        {'PrivacyManager_DeleteReportsInfo3'|translate:$deleteOldLogs}</span>
 				</span>
-			</td>
-			<td width="200">
-				{'PrivacyManager_DeleteReportsDetailedInfo'|translate:'archive_numeric_*':'archive_blob_*'|inlineHelp}
-			</td>
-		</tr>
-		<tr id='deleteReportsSettings'>
-			<td width="250">&nbsp;</td>
-			<td width="500">
-				<label>{'PrivacyManager_DeleteReportsOlderThan'|translate}
-					<input type="text" id="deleteReportsOlderThan" value="{$deleteData.config.delete_reports_older_than}" style="width:30px;"
-						   name="deleteReportsOlderThan"/>
-					{'CoreHome_PeriodMonths'|translate}
-				</label><br/>
-				<span class="form-description">{'PrivacyManager_LeastMonthsInput'|translate:"3"}</span><br/><br/>
-				<label><input type="checkbox" name="deleteReportsKeepBasic" value="1" {if $deleteData.config.delete_reports_keep_basic_metrics}checked="true"{/if}>{'PrivacyManager_KeepBasicMetrics'|translate}<span class="form-description">{'General_Recommended'|translate}</span></input>
-				</label><br/><br/>
-				{'PrivacyManager_KeepDataFor'|translate}<br/>
-				<label><input type="checkbox" name="deleteReportsKeepDay" value="1" {if $deleteData.config.delete_reports_keep_day_reports}checked="true"{/if}>{'General_DailyReports'|translate}</input></label><br/>
-				<label><input type="checkbox" name="deleteReportsKeepWeek" value="1" {if $deleteData.config.delete_reports_keep_week_reports}checked="true"{/if}>{'General_WeeklyReports'|translate}</input></label><br/>
-				<label><input type="checkbox" name="deleteReportsKeepMonth" value="1" {if $deleteData.config.delete_reports_keep_month_reports}checked="true"{/if}>{'General_MonthlyReports'|translate}<span class="form-description">{'General_Recommended'|translate}</span></input></label><br/>
-				<label><input type="checkbox" name="deleteReportsKeepYear" value="1" {if $deleteData.config.delete_reports_keep_year_reports}checked="true"{/if}>{'General_YearlyReports'|translate}<span class="form-description">{'General_Recommended'|translate}</span></input></label><br/>
-				<label><input type="checkbox" name="deleteReportsKeepRange" value="1" {if $deleteData.config.delete_reports_keep_range_reports}checked="true"{/if}>{'General_RangeReports'|translate}</input></label><br/><br/>
-				<label><input type="checkbox" name="deleteReportsKeepSegments" value="1" {if $deleteData.config.delete_reports_keep_segment_reports}checked="true"{/if}>{'PrivacyManager_KeepReportSegments'|translate}</input></label><br/>
-			</td>
-			<td width="200">
-			
-			</td>
-		</tr>
-		<tr id="deleteDataEstimateSect" {if $deleteData.config.delete_reports_enable eq '0' and $deleteData.config.delete_logs_enable eq '0'}style="display:none;"{/if}>
-			<td width="250">{'PrivacyManager_ReportsDataSavedEstimate'|translate}<br/></td>
-			<td width="500">
-				<div id="deleteDataEstimate"></div>
-				<span class='loadingPiwik' style='display:none'><img src='./themes/default/images/loading-blue.gif' /> {'General_LoadingData'|translate}</span>
-			</td>
-			<td width="200">
-			{if $deleteData.config.enable_auto_database_size_estimate eq '0'}
-			{capture assign=manualEstimate}
-				<em><a id="getPurgeEstimateLink" class="ui-inline-help" href="#">{'PrivacyManager_GetPurgeEstimate'|translate}</a></em>
-			{/capture}
-			{$manualEstimate|inlineHelp}
-			{/if}
-			</td>
-		</tr>
-		<tr id="deleteSchedulingSettings">
-			<td width="250">{'PrivacyManager_DeleteSchedulingSettings'|translate}<br/></td>
-			<td width="500">
-				<label>{'PrivacyManager_DeleteDataInterval'|translate}
-				<select id="deleteLowestInterval" name="deleteLowestInterval">
-					<option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '1'} selected="selected" {/if}
-																								value="1"> {'CoreHome_PeriodDay'|translate}</option>
-					<option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '7'} selected="selected" {/if}
-																								value="7">{'CoreHome_PeriodWeek'|translate}</option>
-					<option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '30'} selected="selected" {/if}
-																								 value="30">{'CoreHome_PeriodMonth'|translate}</option>
-				</select></label><br/><br/>
-			</td>
-			<td width="200">
-				{capture assign=purgeStats}
-					{if $deleteData.lastRun}<strong>{'PrivacyManager_LastDelete'|translate}:</strong>
-						{$deleteData.lastRunPretty}
-						<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>
-					<span id="db-purged-message" style="display: none;"><em>{'PrivacyManager_DBPurged'|translate}</em></span>
-				{/capture}
-				{$purgeStats|inlineHelp}
-			</td>
-		</tr>
-	</table>
-	<input type="button" value="{'General_Save'|translate}" id="deleteLogSettingsSubmit" class="submit"/>
-</form>
+                </td>
+                <td width="200">
+                    {'PrivacyManager_DeleteReportsDetailedInfo'|translate:'archive_numeric_*':'archive_blob_*'|inlineHelp}
+                </td>
+            </tr>
+            <tr id='deleteReportsSettings'>
+                <td width="250">&nbsp;</td>
+                <td width="500">
+                    <label>{'PrivacyManager_DeleteReportsOlderThan'|translate}
+                        <input type="text" id="deleteReportsOlderThan" value="{$deleteData.config.delete_reports_older_than}" style="width:30px;"
+                               name="deleteReportsOlderThan"/>
+                        {'CoreHome_PeriodMonths'|translate}
+                    </label><br/>
+                    <span class="form-description">{'PrivacyManager_LeastMonthsInput'|translate:"3"}</span><br/><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepBasic" value="1"
+                                  {if $deleteData.config.delete_reports_keep_basic_metrics}checked="true"{/if}>{'PrivacyManager_KeepBasicMetrics'|translate}
+                        <span class="form-description">{'General_Recommended'|translate}</span></input>
+                    </label><br/><br/>
+                    {'PrivacyManager_KeepDataFor'|translate}<br/>
+                    <label><input type="checkbox" name="deleteReportsKeepDay" value="1"
+                                  {if $deleteData.config.delete_reports_keep_day_reports}checked="true"{/if}>{'General_DailyReports'|translate}</input></label><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepWeek" value="1"
+                                  {if $deleteData.config.delete_reports_keep_week_reports}checked="true"{/if}>{'General_WeeklyReports'|translate}</input></label><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepMonth" value="1"
+                                  {if $deleteData.config.delete_reports_keep_month_reports}checked="true"{/if}>{'General_MonthlyReports'|translate}<span
+                                class="form-description">{'General_Recommended'|translate}</span></input></label><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepYear" value="1"
+                                  {if $deleteData.config.delete_reports_keep_year_reports}checked="true"{/if}>{'General_YearlyReports'|translate}<span
+                                class="form-description">{'General_Recommended'|translate}</span></input></label><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepRange" value="1"
+                                  {if $deleteData.config.delete_reports_keep_range_reports}checked="true"{/if}>{'General_RangeReports'|translate}</input></label><br/><br/>
+                    <label><input type="checkbox" name="deleteReportsKeepSegments" value="1"
+                                  {if $deleteData.config.delete_reports_keep_segment_reports}checked="true"{/if}>{'PrivacyManager_KeepReportSegments'|translate}</input></label><br/>
+                </td>
+                <td width="200">
 
-
-
-<a name="DNT"></a>
-<h2>{'PrivacyManager_DoNotTrack_SupportDNTPreference'|translate}</h2>
-
-<table class="adminTable" style='width:800px;'>
-	<tr>
-		<td width="650">
-			<p>{if $dntSupport}
-			{assign var=action value=deactivate}
-			<b>{'PrivacyManager_DoNotTrack_Enabled'|translate}</b> <br/>{'PrivacyManager_DoNotTrack_EnabledMoreInfo'|translate}
-			{else}
-			{assign var=action value=activate}
-			{'PrivacyManager_DoNotTrack_Disabled'|translate} {'PrivacyManager_DoNotTrack_DisabledMoreInfo'|translate}
-			{/if}</p>
+                </td>
+            </tr>
+            <tr id="deleteDataEstimateSect"
+                {if $deleteData.config.delete_reports_enable eq '0' and $deleteData.config.delete_logs_enable eq '0'}style="display:none;"{/if}>
+                <td width="250">{'PrivacyManager_ReportsDataSavedEstimate'|translate}<br/></td>
+                <td width="500">
+                    <div id="deleteDataEstimate"></div>
+                    <span class='loadingPiwik' style='display:none'><img
+                                src='./themes/default/images/loading-blue.gif'/> {'General_LoadingData'|translate}</span>
+                </td>
+                <td width="200">
+                    {if $deleteData.config.enable_auto_database_size_estimate eq '0'}
+                        {capture assign=manualEstimate}
+                            <em><a id="getPurgeEstimateLink" class="ui-inline-help" href="#">{'PrivacyManager_GetPurgeEstimate'|translate}</a></em>
+                        {/capture}
+                        {$manualEstimate|inlineHelp}
+                    {/if}
+                </td>
+            </tr>
+            <tr id="deleteSchedulingSettings">
+                <td width="250">{'PrivacyManager_DeleteSchedulingSettings'|translate}<br/></td>
+                <td width="500">
+                    <label>{'PrivacyManager_DeleteDataInterval'|translate}
+                        <select id="deleteLowestInterval" name="deleteLowestInterval">
+                            <option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '1'} selected="selected" {/if}
+                                    value="1"> {'CoreHome_PeriodDay'|translate}</option>
+                            <option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '7'} selected="selected" {/if}
+                                    value="7">{'CoreHome_PeriodWeek'|translate}</option>
+                            <option {if $deleteData.config.delete_logs_schedule_lowest_interval eq '30'} selected="selected" {/if}
+                                    value="30">{'CoreHome_PeriodMonth'|translate}</option>
+                        </select></label><br/><br/>
+                </td>
+                <td width="200">
+                    {capture assign=purgeStats}
+                        {if $deleteData.lastRun}<strong>{'PrivacyManager_LastDelete'|translate}:</strong>
+                            {$deleteData.lastRunPretty}
+                            <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>
+                        <span id="db-purged-message" style="display: none;"><em>{'PrivacyManager_DBPurged'|translate}</em></span>
+                    {/capture}
+                    {$purgeStats|inlineHelp}
+                </td>
+            </tr>
+        </table>
+        <input type="button" value="{'General_Save'|translate}" id="deleteLogSettingsSubmit" class="submit"/>
+    </form>
+    <a name="DNT"></a>
+    <h2>{'PrivacyManager_DoNotTrack_SupportDNTPreference'|translate}</h2>
+    <table class="adminTable" style='width:800px;'>
+        <tr>
+            <td width="650">
+                <p>{if $dntSupport}
+                        {assign var=action value=deactivate}
+                        <b>{'PrivacyManager_DoNotTrack_Enabled'|translate}</b>
+                        <br/>
+                        {'PrivacyManager_DoNotTrack_EnabledMoreInfo'|translate}
+                    {else}
+                        {assign var=action value=activate}
+                        {'PrivacyManager_DoNotTrack_Disabled'|translate} {'PrivacyManager_DoNotTrack_DisabledMoreInfo'|translate}
+                    {/if}</p>
 			<span style='margin-left:20px'>
-			<a href='{url module=CorePluginsAdmin token_auth=$token_auth action=$action pluginName=DoNotTrack}#DNT'>&rsaquo; 
-			{if $dntSupport}{'PrivacyManager_DoNotTrack_Disable'|translate} {'General_NotRecommended'|translate}
-			{else}{'PrivacyManager_DoNotTrack_Enable'|translate} {'General_Recommended'|translate}{/if} 
-			<br />
-			</a></span>
-		</td>
-		<td width="200">
-			{'PrivacyManager_DoNotTrack_Description'|translate|inlineHelp}
-		</td>
-	</tr>
-</table>
-
+			<a href='{url module=CorePluginsAdmin token_auth=$token_auth action=$action pluginName=DoNotTrack}#DNT'>&rsaquo;
+                {if $dntSupport}{'PrivacyManager_DoNotTrack_Disable'|translate} {'General_NotRecommended'|translate}
+                {else}{'PrivacyManager_DoNotTrack_Enable'|translate} {'General_Recommended'|translate}{/if}
+                <br/>
+            </a></span>
+            </td>
+            <td width="200">
+                {'PrivacyManager_DoNotTrack_Description'|translate|inlineHelp}
+            </td>
+        </tr>
+    </table>
 {/if}
 
 <a name="optOutAnchor"></a>
 <h2>{'CoreAdminHome_OptOutForYourVisitors'|translate}</h2>
 <p>{'CoreAdminHome_OptOutExplanation'|translate}
-{capture name=optOutUrl}{$piwikUrl}index.php?module=CoreAdminHome&action=optOut&language={$language}{/capture}
-{assign var=optOutUrl value=$smarty.capture.optOutUrl}
-{capture name=iframeOptOut}
-<iframe frameborder="no" width="600px" height="200px" src="{$smarty.capture.optOutUrl}"></iframe>{/capture}
-<code>{$smarty.capture.iframeOptOut|escape:'html'}</code>
-<br/>
-{'CoreAdminHome_OptOutExplanationBis'|translate:"<a href='$optOutUrl' target='_blank'>":"</a>"}
+    {capture name=optOutUrl}{$piwikUrl}index.php?module=CoreAdminHome&action=optOut&language={$language}{/capture}
+    {assign var=optOutUrl value=$smarty.capture.optOutUrl}
+    {capture name=iframeOptOut}
+    <iframe frameborder="no" width="600px" height="200px" src="{$smarty.capture.optOutUrl}"></iframe>{/capture}
+    <code>{$smarty.capture.iframeOptOut|escape:'html'}</code>
+    <br/>
+    {'CoreAdminHome_OptOutExplanationBis'|translate:"<a href='$optOutUrl' target='_blank'>":"</a>"}
 </p>
 
 <div style='height:100px'></div>