Refs #1736 Only showing the widget "Top Keywords for Page" when segmentation...

Refs #1736 Only showing the widget "Top Keywords for Page" when segmentation is enabled (ie. if anonymous user, check setting)


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

core/Archive.php

@@ -158,7 +158,7 @@ abstract class Piwik_Archive
 		}
 		
 		$segment = Piwik_Common::unsanitizeInputValue($segment);
-		if(!Zend_Registry::get('config')->General->anonymous_user_enable_use_segments_API
+		if( !Piwik_Archive::isSegmentationEnabled()
 			&& !empty($segment))
 		{
 			throw new Exception("The Super User has disabled the use of 'segments' for the anonymous user. 
@@ -339,4 +339,17 @@ abstract class Piwik_Archive
 		return $this->site->getId();
 	}
 	
+	/**
+	 * Returns true if Segmentation is allowed for this user
+	 * 
+	 * @return bool
+	 */
+	static public function isSegmentationEnabled()
+	{
+		return !Piwik::isUserIsAnonymous()
+				|| Zend_Registry::get('config')->General->anonymous_user_enable_use_segments_API
+				;
+	}
+	
+	
 }

plugins/Referers/Controller.php

@@ -315,8 +315,8 @@ class Piwik_Referers_Controller extends Piwik_Controller
 
 	function getKeywordsForPage()
 	{
-		// load as IFRAME or direct include
-		//i18n+widget
+		Piwik::checkUserHasViewAccess($this->idSite);
+		
 		$requestUrl = '&date=previous1'
 						.'&period=week'
 						.'&idSite='.$this->idSite
@@ -343,7 +343,8 @@ class Piwik_Referers_Controller extends Piwik_Controller
 		$api = Piwik_Url::getCurrentUrlWithoutFileName() 
 						.'?module=API&method=Referers.getKeywordsForPageUrl'
 						.'&format=php'
-						.'&filter_limit=10';
+						.'&filter_limit=10'
+						.'&token_auth='.Piwik::getCurrentUserTokenAuth();
 						
 		$api .= $requestUrl;
 		$code = '
@@ -355,7 +356,7 @@ function DisplayTopKeywords($url = "")
 	$url = empty($url) ? "http://". $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"] : $url;
 	$api = "'.$api.'&url=" . urlencode($url);
 	$keywords = @unserialize(file_get_contents($api));
-	if($keywords === false) { 
+	if($keywords === false || isset($keywords["result"])) { 
 		echo "Error while fetching the <a href=\'$api\'>Top Keywords from Piwik</a>"; return; 
 	}
 

plugins/Referers/Referers.php

@@ -138,7 +138,10 @@ class Piwik_Referers extends Piwik_Plugin
 		Piwik_AddWidget( 'Referers_Referers', 'Referers_WidgetExternalWebsites', 'Referers', 'getWebsites');
 		Piwik_AddWidget( 'Referers_Referers', 'Referers_WidgetSearchEngines', 'Referers', 'getSearchEngines');
 		Piwik_AddWidget( 'Referers_Referers', 'Referers_WidgetOverview', 'Referers', 'getRefererType');
-		Piwik_AddWidget( 'Referers_Referers', 'Top Keywords for Page URL', 'Referers', 'getKeywordsForPage');
+		if(Piwik_Archive::isSegmentationEnabled())
+		{
+    		Piwik_AddWidget( 'Referers_Referers', 'Top Keywords for Page URL', 'Referers', 'getKeywordsForPage');
+		}
 	}
 	
 	/**