Refs #2708 Small changes

git-svn-id: http://dev.piwik.org/svn/trunk@6563 59fd770c-687e-43c8-a1e3-f5a4ff64c105
matomo-org · Jul 26, 2012 · 740316a · 740316a
1 parent 7790d76
commit 740316a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php
@@ -156,8 +156,8 @@ public function addPhoneNumber($phoneNumber)
 	 * send a SMS
 	 *
 	 * @param string $phoneNumber
-	 *
 	 * @return bool true
+	 * @ignore
 	 */
 	public function sendSMS($content, $phoneNumber, $from)
 	{
@@ -306,6 +306,7 @@ public function validatePhoneNumber($phoneNumber, $verificationCode)
 	 * get phone number list
 	 *
 	 * @return array $phoneNumber => $isValidated
+	 * @ignore
 	 */
 	public function getPhoneNumbers()
 	{
@@ -326,6 +327,7 @@ public function getPhoneNumbers()
 	 * get activated phone number list
 	 *
 	 * @return array $phoneNumber
+	 * @ignore
 	 */
 	public function getActivatedPhoneNumbers()
 	{

diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
@@ -38,13 +38,10 @@ static public function factory($providerName)
 			Piwik_Loader::loadClass($className);
 			return new $className;
 		} catch(Exception $e) {
-
-			@header('Content-Type: text/html; charset=utf-8');
-
 			throw new Exception(
 				Piwik_TranslateException(
 					'MobileMessaging_Exception_UnknownProvider',
-					array($name, implode(', ', array_keys(self::$availableSMSProviders)))
+					array($name, implode(', ', self::$availableSMSProviders))
 				)
 			);
 		}

diff --git a/plugins/MobileMessaging/SMSProvider/Mediaburst.php b/plugins/MobileMessaging/SMSProvider/Mediaburst.php
@@ -17,7 +17,7 @@
  */
 class Piwik_MobileMessaging_SMSProvider_Mediaburst extends Piwik_MobileMessaging_SMSProvider
 {
-	const SOCKET_TIMEOUT = 10;
+	const SOCKET_TIMEOUT = 15;
 
 	const BASE_API_URL = 'https://api.mediaburst.co.uk/http';
 	const CHECK_CREDIT_RESOURCE = '/credit.aspx';

diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
@@ -437,8 +437,7 @@ public function generateReport($idReport, $date, $language = false, $outputType
 		$reportRenderer->setRenderImageInline($outputType == self::OUTPUT_DOWNLOAD ? true : false);
 
 		// render report
-		$site = Piwik_SitesManager_API::getInstance()->getSiteFromId($idSite);
-		$websiteName = $site['name'];
+		$websiteName = Piwik_Site::getNameFor($idSite);
 		$description = str_replace(array("\r", "\n"), ' ', $report['description']);
 
 		$reportRenderer->renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata);
@@ -557,7 +556,6 @@ public function sendReport($idReport, $period = false, $date = false)
 		if(!isset($GLOBALS['PIWIK_TRACKER_DEBUG']) || !$GLOBALS['PIWIK_TRACKER_DEBUG'])
 		{
 			@chmod($outputFilename, 0600);
-			@unlink($outputFilename);
 		}
 	}