* Encode plugin display name directly after saving

* Remove outdated donation options

Author: André Bräkling

classes/WP_Piwik/Admin/Settings.php

@@ -532,9 +532,6 @@ private function showDonation() {
 	<p>
 		<?php _e('If you like WP-Matomo, you can support its development by a donation:', 'wp-piwik'); ?>
 	</p>
-	<div>
-		<script id='fb0ahsp'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//button.flattr.com/view/?fid=mkdp7z&url=https%3A%2F%2Fwww.braekling.de%2Fwp-piwik-wpmu-piwik-wordpress';f.title='Flattr';f.height=62;f.width=55;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fb0ahsp');</script>
-	</div>
 	<div>
 		Paypal
 		<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
@@ -551,9 +548,6 @@ private function showDonation() {
 	<div>
 		<a href="http://www.amazon.de/gp/registry/wishlist/111VUJT4HP1RA?reveal=unpurchased&amp;filter=all&amp;sort=priority&amp;layout=standard&amp;x=12&amp;y=14"><?php _e('My Amazon.de wishlist', 'wp-piwik'); ?></a>
 	</div>
-	<div>
-		<?php _e('Please don\'t forget to vote the compatibility at the','wp-piwik'); ?> <a target="_BLANK" href="http://wordpress.org/extend/plugins/wp-piwik/">WordPress.org Plugin Directory</a>.
-	</div>
 </div><?php
 	}
 

classes/WP_Piwik/Settings.php

@@ -148,10 +148,8 @@ public function save() {
 			return;
 		}
 		self::$wpPiwik->log ( 'Save settings' );
+        $this->globalSettings['plugin_display_name'] = htmlspecialchars($this->globalSettings['plugin_display_name'], ENT_QUOTES, 'utf-8');
 		foreach ( $this->globalSettings as $key => $value ) {
-            if ($key == "plugin_display_name") {
-                $value = htmlentities($value, ENT_QUOTES, 'utf-8');
-            }
 			if ( $this->checkNetworkActivation() )
 				update_site_option ( 'wp-piwik_global-' . $key, $value );
 			else