0.2.370.2.37

9 files changed, 20 insertions, 9 deletions

diff --git a/LICENSE b/LICENSE
index 1a3fb2efaf..6d5606bb24 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,2 @@
 # GNU/GPL v3 or later
 see misc/license.txt
- 
\ No newline at end of file
diff --git a/core/Auth.php b/core/Auth.php
index dc23bc6128..eda890e303 100644
--- a/core/Auth.php
+++ b/core/Auth.php
@@ -13,6 +13,11 @@ require_once "Zend/Auth/Result.php";
 
 interface Piwik_Auth {
 	/**
+	 * @return string
+	 */
+	public function getName();
+
+	/**
 	 * @return Piwik_Auth_Result
 	 */
 	public function authenticate();
diff --git a/core/Controller.php b/core/Controller.php
index 1c22c7b0e3..6b800ca212 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -314,7 +314,7 @@ abstract class Piwik_Controller
 				&& $currentLogin != 'anonymous')
 			{
 				$errorMessage = sprintf(Piwik_Translate('CoreHome_NoPrivileges'),$currentLogin);
-				$errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='?module=Login&amp;action=logout'>&rsaquo; ". Piwik_Translate('General_Logout'). "</a></b><br />";
+				$errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='?module=". Zend_Registry::get('auth')->getName() ."&amp;action=logout'>&rsaquo; ". Piwik_Translate('General_Logout'). "</a></b><br />";
 				Piwik_ExitWithMessage($errorMessage, false, true);
 			}
 			else
diff --git a/core/Updates/0.2.37.php b/core/Updates/0.2.37.php
index 87f7d94370..f7f40c1a37 100644
--- a/core/Updates/0.2.37.php
+++ b/core/Updates/0.2.37.php
@@ -1,4 +1,5 @@
 <?php
 
 Piwik_Query( "DELETE FROM ".  Piwik::prefixTable('user_dashboard') . " 
-				WHERE layout LIKE '%.getEvolutionGraph%'" );
+				WHERE layout LIKE '%.getLastVisitsGraph%' 
+					OR layout LIKE '%.getLastVisitsReturningGraph%'" );
diff --git a/core/View.php b/core/View.php
index 5f79e7037c..6b7c47a541 100644
--- a/core/View.php
+++ b/core/View.php
@@ -93,7 +93,8 @@ class Piwik_View implements Piwik_iView
 			$this->userIsSuperUser = Piwik::isUserIsSuperUser();
 			$this->piwik_version = Piwik_Version::VERSION;
 			$this->latest_version_available = Piwik_UpdateCheck::isNewestVersionAvailable();
-			
+
+			$this->loginModule = Zend_Registry::get('auth')->getName();
 		} catch(Exception $e) {
 			// can fail, for example at installation (no plugin loaded yet)		
 		}
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js
index a19e99424c..a36943ac07 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/templates/datatable.js
@@ -605,11 +605,11 @@ dataTable.prototype =
 				
 				if( urlToLink.match("javascript:") )
 				{
-					$(this).html( '<a href="#" onClick="' + urlToLink.replace("javascript:","") + '">' + imgToPrepend + $(this).html() + '</a>');				
+					$(this).prepend(imgToPrepend).wrap('<a href="#" onclick="' + urlToLink.replace("javascript:","") + '"></a>');
 				}
 				else
 				{
-					$(this).html( '<a target="_blank" href="' + urlToLink + '">' + imgToPrepend + $(this).html() + '</a>');
+					$(this).prepend(imgToPrepend).wrap('<a target="_blank" href="' + urlToLink + '"></a>');
 				}
 			});
 		}
diff --git a/plugins/CoreHome/templates/top_bar.tpl b/plugins/CoreHome/templates/top_bar.tpl
index 3bad78778e..1bbf9cbc91 100644
--- a/plugins/CoreHome/templates/top_bar.tpl
+++ b/plugins/CoreHome/templates/top_bar.tpl
@@ -13,7 +13,7 @@
 {'General_HelloUser'|translate:"<strong>$userLogin</strong>"}
 {if isset($userHasSomeAdminAccess) && $userHasSomeAdminAccess}| <a href='?module=CoreAdminHome'>{'General_Settings'|translate}</a>{/if} 
  {if $showSitesSelection && $showWebsiteSelectorInUserInterface}| {include file=CoreHome/templates/sites_selection.tpl}{/if}
-| {if $userLogin == 'anonymous'}<a href='?module=Login'>{'Login_LogIn'|translate}</a>{else}<a href='?module=Login&amp;action=logout'>{'Login_Logout'|translate}</a>{/if}
+| {if $userLogin == 'anonymous'}<a href='?module={$loginModule}'>{'Login_LogIn'|translate}</a>{else}<a href='?module={$loginModule}&amp;action=logout'>{'Login_Logout'|translate}</a>{/if}
 </small>
 
 </nobr>
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index 61e1c67a50..a10f4d8280 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -8,6 +8,11 @@ class Piwik_Login_Auth implements Piwik_Auth
 	protected $login = null;
 	protected $token_auth = null;
 	
+	public function getName()
+	{
+		return 'Login';
+	}
+
 	public function authenticate()
 	{
 		$rootLogin = Zend_Registry::get('config')->superuser->login;
diff --git a/plugins/Widgetize/templates/widgetize.js b/plugins/Widgetize/templates/widgetize.js
index 3f30806ff1..e6d79daa97 100644
--- a/plugins/Widgetize/templates/widgetize.js
+++ b/plugins/Widgetize/templates/widgetize.js
@@ -4,12 +4,12 @@ function widgetize()
 	
 	this.getInputFormWithHtml = function(inputId, htmlEmbed)
 	{
-		return '<input class="formEmbedCode" id="'+inputId+'" value=\''+ htmlEmbed +'\' onclick="javascript:document.getElementById(\''+inputId+'\').focus();document.getElementById(\''+inputId+'\').select();" readonly="true" type="text">';
+		return '<input class="formEmbedCode" id="'+inputId+'" value="'+ htmlEmbed.replace(/"/g, '&quot;') +'" onclick="javascript:document.getElementById(\''+inputId+'\').focus();document.getElementById(\''+inputId+'\').select();" readonly="true" type="text">';
 	}
 	
 	this.getEmbedUrl = function( parameters, exportFormat )
 	{
-		copyParameters = new Object;
+		copyParameters = new Object();
 		for(var variableName in parameters) {
 			copyParameters[variableName] = parameters[variableName];
 		}