* Bugfix: Opt-out shortcode will also work in "pro" and "php" mode

* Bugfix: http/pro - after configuration the settings page had to be reloaded once to start working


git-svn-id: https://plugins.svn.wordpress.org/wp-piwik/trunk@1161497 b8457f37-d9ea-0310-8a92-e5e31aec5664

classes/WP_Piwik.php

@@ -557,16 +557,17 @@ public function addPiwikAnnotation($postID) {
 	 * @return boolean settings update applied
 	 */
 	private function applySettings() {
-		$_POST ['wp-piwik']['last_settings_update'] = time();
-		$_POST ['wp-piwik']['revision'] = self::$revisionId;
 		self::$settings->applyChanges ( $_POST ['wp-piwik'] );
+		echo 'Settings gespeichert';
 		if (self::$settings->getGlobalOption ( 'auto_site_config' ) && self::isConfigured ()) {
 			if ($this->isPHPMode () && ! defined ( 'PIWIK_INCLUDE_PATH' ))
 				self::definePiwikConstants ();
-			$siteId = $this->requestPiwikSiteId ();
+			$siteId = $this->getPiwikSiteId ();
 			$trackingCode = $this->updateTrackingCode ( $siteId );
-			self::$settings->getOption ( 'site_id', $siteId );
+			self::$settings->setOption ( 'site_id', $siteId );
 		}
+		self::$settings->setGlobalOption ( 'revision', self::$revisionId );
+		self::$settings->setGlobalOption ( 'last_settings_update', time () );
 		return true;
 	}
 
@@ -919,6 +920,8 @@ private static function showErrorMessage($message) {
 	 * @return mixed request result
 	 */
 	public function request($id, $debug = false) {
+		if ( self::$settings->getGlobalOption ( 'piwik_mode' ) == 'disabled' )
+			return 'n/a';
 		if (! isset ( self::$request ))
 			self::$request = (self::$settings->getGlobalOption ( 'piwik_mode' ) == 'http' || self::$settings->getGlobalOption ( 'piwik_mode' ) == 'pro' ? new WP_Piwik\Request\Rest ( $this, self::$settings ) : new WP_Piwik\Request\Php ( $this, self::$settings ));
 		if ($debug)
@@ -992,7 +995,7 @@ private function requestPiwikSiteId($blogId = null) {
 			$this->log ( 'Tried to identify current site, result: ' . serialize ( $result ) );
 			if (empty ( $result ) || ! isset ( $result [0] ))
 				$result = $this->addPiwikSite ( $blogId );
-			else
+			elseif ( $result != 'n/a' )
 				$result = $result [0] ['idsite'];
 		} else
 			$result = null;

classes/WP_Piwik/Request.php

@@ -19,6 +19,8 @@ public static function register($method, $parameter) {
 				$id = 'method='.$method.self::parameterToString($parameter);
 			if ( 
 				in_array( $method, array( 'API.getPiwikVersion', 'SitesManager.getJavascriptTag', 'SitesManager.getSitesWithAtLeastViewAccess', 'SitesManager.getSitesIdFromSiteUrl', 'SitesManager.addSite', 'SitesManager.updateSite', 'SitesManager.getSitesWithAtLeastViewAccess' ) ) ||
+				!isset( $parameter['date'] ) ||
+				!isset( $parameter['period'] ) ||
 				substr($parameter['date'], 0, 4) == 'last' ||
 				$parameter['date'] == 'today' ||
 				( $parameter['period'] == 'day' && $parameter['date'] == date('Ymd') ) ||

classes/WP_Piwik/Widget/OptOut.php

@@ -11,7 +11,18 @@ protected function configure($prefix = '', $params = array()) {
 		}
 
 		public function show() {
-			$this->out ( '<iframe frameborder="no" width="'.(isset($this->parameter['width'])?$this->parameter['width']:'').'" height="'.(isset($this->parameter['height'])?$this->parameter['height']:'').'" src="'.self::$settings->getGlobalOption('piwik_url').'index.php?module=CoreAdminHome&action=optOut&language='.(isset($this->parameter['language'])?$this->parameter['language']:'en').'"></iframe>' );
+			$protocol = (isset ( $_SERVER ['HTTPS'] ) && $_SERVER ['HTTPS'] != 'off') ? 'https' : 'http';
+			switch (self::$settings->getGlobalOption ( 'piwik_mode' )) {
+				case 'php' :
+					$PIWIK_URL = $protocol . ':' . self::$settings->getGlobalOption ( 'proxy_url' );
+					break;
+				case 'pro' :
+					$PIWIK_URL = 'https://' . self::$settings->getGlobalOption ( 'piwik_user' ) . '.piwik.pro/';
+					break;
+				default :
+					$PIWIK_URL = self::$settings->getGlobalOption ( 'piwik_url' );
+			}
+			$this->out ( '<iframe frameborder="no" width="'.(isset($this->parameter['width'])?$this->parameter['width']:'').'" height="'.(isset($this->parameter['height'])?$this->parameter['height']:'').'" src="'.$PIWIK_URL.'index.php?module=CoreAdminHome&action=optOut&language='.(isset($this->parameter['language'])?$this->parameter['language']:'en').'"></iframe>' );
 		}
 
 	}